diff --git a/nbactions.xml b/nbactions.xml new file mode 100644 index 000000000..c9efd3efc --- /dev/null +++ b/nbactions.xml @@ -0,0 +1,20 @@ + + + + debug.test.single + + * + + + test-compile + surefire:test + + + ${packageClassName} + once + -Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} + true + false + + + diff --git a/pom.xml b/pom.xml index b6d15cb60..a8b143bd3 100644 --- a/pom.xml +++ b/pom.xml @@ -44,15 +44,24 @@ UTF-8 ${project.build.sourceEncoding} + + 1.6 1.6 1.6 1.6 true lines,vars,source + + + false + + + false + @@ -85,6 +94,7 @@ + @@ -93,6 +103,7 @@ 3.0.0 provided + javax.servlet javax.servlet-api @@ -100,8 +111,6 @@ provided - - junit @@ -167,13 +176,44 @@ 2.1.0.Alpha2 test - + ${project.artifactId} + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.18.1 + + ${ut.maven.test.skip} + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.18.1 + + + + integration-test + verify + + + + + ${it.maven.test.skip} + + + + + + org.apache.maven.plugins @@ -233,6 +273,7 @@ + Mojarra 2.2.11 @@ -247,6 +288,7 @@ + MavenCentral @@ -336,7 +378,7 @@ --> htmlUnit 8.2.0.Final - + true @@ -345,10 +387,10 @@ org.wildfly wildfly-arquillian-container-managed 8.2.0.Final - test + test - + javax javaee-api 7.0 @@ -415,15 +457,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 2.18.1 - - - - integration-test - verify - - - false @@ -436,7 +469,6 @@ false - diff --git a/src/main/java/net/bootsfaces/component/inputText/InputText.java b/src/main/java/net/bootsfaces/component/inputText/InputText.java index a5d0f22c8..29e2b8aba 100644 --- a/src/main/java/net/bootsfaces/component/inputText/InputText.java +++ b/src/main/java/net/bootsfaces/component/inputText/InputText.java @@ -60,6 +60,7 @@ protected enum PropertyKeys { PropertyKeys() { } + @Override public String toString() { return ((this.toString != null) ? this.toString : super.toString()); } diff --git a/src/test/java/net/bootsfaces/IntegrationTestsBase.java b/src/test/java/net/bootsfaces/it/IntegrationTestsBase.java similarity index 98% rename from src/test/java/net/bootsfaces/IntegrationTestsBase.java rename to src/test/java/net/bootsfaces/it/IntegrationTestsBase.java index 1e04a7259..86157967c 100644 --- a/src/test/java/net/bootsfaces/IntegrationTestsBase.java +++ b/src/test/java/net/bootsfaces/it/IntegrationTestsBase.java @@ -1,4 +1,4 @@ -package net.bootsfaces; +package net.bootsfaces.it; import java.io.File; import java.net.URL; diff --git a/src/test/java/net/bootsfaces/component/InputTextITCase.java b/src/test/java/net/bootsfaces/it/component/InputTextITCase.java similarity index 96% rename from src/test/java/net/bootsfaces/component/InputTextITCase.java rename to src/test/java/net/bootsfaces/it/component/InputTextITCase.java index ae8640a07..c7155cd44 100644 --- a/src/test/java/net/bootsfaces/component/InputTextITCase.java +++ b/src/test/java/net/bootsfaces/it/component/InputTextITCase.java @@ -1,8 +1,10 @@ -package net.bootsfaces.component; +package net.bootsfaces.it.component; import java.io.IOException; +import net.bootsfaces.component.InputTextSessionBean; import net.bootsfaces.component.validators.RequiredInputTextValidator; -import net.bootsfaces.IntegrationTestsBase; +import net.bootsfaces.it.IntegrationTestsBase; +import net.bootsfaces.it.IntegrationTestsBase; import org.jboss.arquillian.container.test.api.Deployment; import static org.jboss.arquillian.graphene.Graphene.guardAjax; import org.jboss.arquillian.graphene.GrapheneElement; @@ -163,9 +165,4 @@ public void testImmediate() { //there is is message input required text for txt 5 assertTrue(!facesMessage.getText().contains(txt_4.getAttribute("id")) && facesMessage.getText().contains(txt_5.getAttribute("id"))); } - - - - - } diff --git a/src/test/java/net/bootsfaces/component/SelectBooleanCheckBoxITCase.java b/src/test/java/net/bootsfaces/it/component/SelectBooleanCheckBoxITCase.java similarity index 95% rename from src/test/java/net/bootsfaces/component/SelectBooleanCheckBoxITCase.java rename to src/test/java/net/bootsfaces/it/component/SelectBooleanCheckBoxITCase.java index a69b0be5b..c8fd60324 100644 --- a/src/test/java/net/bootsfaces/component/SelectBooleanCheckBoxITCase.java +++ b/src/test/java/net/bootsfaces/it/component/SelectBooleanCheckBoxITCase.java @@ -1,8 +1,9 @@ -package net.bootsfaces.component; +package net.bootsfaces.it.component; import net.bootsfaces.component.validators.RequiredCheckBoxValidator; import java.io.IOException; -import net.bootsfaces.IntegrationTestsBase; +import net.bootsfaces.component.SelectBooleanCheckBoxSessionBean; +import net.bootsfaces.it.IntegrationTestsBase; import org.jboss.arquillian.container.test.api.Deployment; import static org.jboss.arquillian.graphene.Graphene.guardAjax; import org.jboss.arquillian.graphene.GrapheneElement; diff --git a/src/test/java/net/bootsfaces/layout/ColumnITCase.java b/src/test/java/net/bootsfaces/it/layout/ColumnITCase.java similarity index 95% rename from src/test/java/net/bootsfaces/layout/ColumnITCase.java rename to src/test/java/net/bootsfaces/it/layout/ColumnITCase.java index e39c9505e..b0d737380 100644 --- a/src/test/java/net/bootsfaces/layout/ColumnITCase.java +++ b/src/test/java/net/bootsfaces/it/layout/ColumnITCase.java @@ -1,7 +1,8 @@ -package net.bootsfaces.layout; +package net.bootsfaces.it.layout; import java.io.IOException; -import net.bootsfaces.IntegrationTestsBase; +import net.bootsfaces.it.IntegrationTestsBase; +import net.bootsfaces.it.IntegrationTestsBase; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.graphene.GrapheneElement; import org.jboss.arquillian.junit.Arquillian; diff --git a/src/test/java/net/bootsfaces/junit/common/FacesContextMocker.java b/src/test/java/net/bootsfaces/ut/common/FacesContextMocker.java similarity index 95% rename from src/test/java/net/bootsfaces/junit/common/FacesContextMocker.java rename to src/test/java/net/bootsfaces/ut/common/FacesContextMocker.java index 2df7c979f..3e27486ea 100644 --- a/src/test/java/net/bootsfaces/junit/common/FacesContextMocker.java +++ b/src/test/java/net/bootsfaces/ut/common/FacesContextMocker.java @@ -1,4 +1,4 @@ -package net.bootsfaces.junit.common; +package net.bootsfaces.ut.common; import javax.faces.context.FacesContext; import org.mockito.Mockito; diff --git a/src/test/java/net/bootsfaces/junit/common/JsfMock.java b/src/test/java/net/bootsfaces/ut/common/JsfMock.java similarity index 97% rename from src/test/java/net/bootsfaces/junit/common/JsfMock.java rename to src/test/java/net/bootsfaces/ut/common/JsfMock.java index 6e40665d3..30bede61f 100644 --- a/src/test/java/net/bootsfaces/junit/common/JsfMock.java +++ b/src/test/java/net/bootsfaces/ut/common/JsfMock.java @@ -1,4 +1,4 @@ -package net.bootsfaces.junit.common; +package net.bootsfaces.ut.common; import java.io.IOException; import java.io.PrintWriter; @@ -26,7 +26,7 @@ import org.junit.runners.model.Statement; import org.mockito.Mockito; -import net.bootsfaces.junit.common.FacesContextMocker; +import net.bootsfaces.ut.common.FacesContextMocker; public class JsfMock implements TestRule { diff --git a/src/test/java/net/bootsfaces/junit/common/MyResponseWriter.java b/src/test/java/net/bootsfaces/ut/common/MyResponseWriter.java similarity index 98% rename from src/test/java/net/bootsfaces/junit/common/MyResponseWriter.java rename to src/test/java/net/bootsfaces/ut/common/MyResponseWriter.java index 6007e6fed..da558ad04 100644 --- a/src/test/java/net/bootsfaces/junit/common/MyResponseWriter.java +++ b/src/test/java/net/bootsfaces/ut/common/MyResponseWriter.java @@ -1,4 +1,4 @@ -package net.bootsfaces.junit.common; +package net.bootsfaces.ut.common; import java.io.IOException; import java.io.Writer; diff --git a/src/test/java/net/bootsfaces/junit/icon/IconAwesomeTest.java b/src/test/java/net/bootsfaces/ut/icon/IconAwesomeTest.java similarity index 93% rename from src/test/java/net/bootsfaces/junit/icon/IconAwesomeTest.java rename to src/test/java/net/bootsfaces/ut/icon/IconAwesomeTest.java index d71adf877..9ecf131c0 100644 --- a/src/test/java/net/bootsfaces/junit/icon/IconAwesomeTest.java +++ b/src/test/java/net/bootsfaces/ut/icon/IconAwesomeTest.java @@ -3,11 +3,11 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package net.bootsfaces.junit.icon; +package net.bootsfaces.ut.icon; import java.io.IOException; import net.bootsfaces.component.IconAwesome; -import net.bootsfaces.junit.common.JsfMock; +import net.bootsfaces.ut.common.JsfMock; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/net/bootsfaces/junit/icon/IconTest.java b/src/test/java/net/bootsfaces/ut/icon/IconTest.java similarity index 93% rename from src/test/java/net/bootsfaces/junit/icon/IconTest.java rename to src/test/java/net/bootsfaces/ut/icon/IconTest.java index be752bde2..2e0725210 100644 --- a/src/test/java/net/bootsfaces/junit/icon/IconTest.java +++ b/src/test/java/net/bootsfaces/ut/icon/IconTest.java @@ -3,11 +3,11 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package net.bootsfaces.junit.icon; +package net.bootsfaces.ut.icon; import java.io.IOException; import net.bootsfaces.component.Icon; -import net.bootsfaces.junit.common.JsfMock; +import net.bootsfaces.ut.common.JsfMock; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/net/bootsfaces/junit/inputText/InputTextTest.java b/src/test/java/net/bootsfaces/ut/inputText/InputTextTest.java similarity index 88% rename from src/test/java/net/bootsfaces/junit/inputText/InputTextTest.java rename to src/test/java/net/bootsfaces/ut/inputText/InputTextTest.java index ea547476b..c0355c37d 100644 --- a/src/test/java/net/bootsfaces/junit/inputText/InputTextTest.java +++ b/src/test/java/net/bootsfaces/ut/inputText/InputTextTest.java @@ -1,4 +1,4 @@ -package net.bootsfaces.junit.inputText; +package net.bootsfaces.ut.inputText; import java.io.IOException; import java.lang.reflect.Field; @@ -9,8 +9,8 @@ import net.bootsfaces.component.inputText.InputText; import net.bootsfaces.component.inputText.InputTextRenderer; -import net.bootsfaces.junit.common.JsfMock; -import net.bootsfaces.junit.common.MyResponseWriter; +import net.bootsfaces.ut.common.JsfMock; +import net.bootsfaces.ut.common.MyResponseWriter; public class InputTextTest { diff --git a/src/test/java/net/bootsfaces/junit/selectBooleanCheckbox/SelectBooleanCheckboxTest.java b/src/test/java/net/bootsfaces/ut/selectBooleanCheckbox/SelectBooleanCheckboxTest.java similarity index 87% rename from src/test/java/net/bootsfaces/junit/selectBooleanCheckbox/SelectBooleanCheckboxTest.java rename to src/test/java/net/bootsfaces/ut/selectBooleanCheckbox/SelectBooleanCheckboxTest.java index cc3e81e31..dbfbe2eb6 100644 --- a/src/test/java/net/bootsfaces/junit/selectBooleanCheckbox/SelectBooleanCheckboxTest.java +++ b/src/test/java/net/bootsfaces/ut/selectBooleanCheckbox/SelectBooleanCheckboxTest.java @@ -1,4 +1,4 @@ -package net.bootsfaces.junit.selectBooleanCheckbox; +package net.bootsfaces.ut.selectBooleanCheckbox; import java.io.IOException; import java.lang.reflect.Field; @@ -13,8 +13,8 @@ import net.bootsfaces.component.SelectBooleanCheckbox; import net.bootsfaces.component.inputText.InputTextRenderer; -import net.bootsfaces.junit.common.JsfMock; -import net.bootsfaces.junit.common.MyResponseWriter; +import net.bootsfaces.ut.common.JsfMock; +import net.bootsfaces.ut.common.MyResponseWriter; public class SelectBooleanCheckboxTest {