[jbossws-commits] JBossWS SVN: r19384 - in stack/cxf/branches/arquillian/modules/testsuite: cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpauth and 4 other directories.

Author: jim.ma Date: 2015-01-19 01:54:04 -0500 (Mon, 19 Jan 2015) New Revision: 19384 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3813/JBWS3813AnnotationTestCase.java stack/cxf/branches/arquillian/modules/testsuite/pom.xml stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java Log: Move maven-surefire-plugin's tests exclusion to junit @Igore;Update the deprecated systemProperties with systemPropertyVariables Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase.java 2015-01-19 03:39:10 UTC (rev 19383) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase.java 2015-01-19 06:54:04 UTC (rev 19384) @@ -42,6 +42,7 @@ import org.jboss.wsf.stack.cxf.client.UseThreadBusFeature; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -49,6 +50,7 @@ * @author ema(a)redhat.com * @author alessio.soldano(a)jboss.com */ +@Ignore(value="[JBWS-3620] Authentication failures w/ Undertow") @RunWith(Arquillian.class) public class HelloDigestTestCase extends JBossWSTest { Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3813/JBWS3813AnnotationTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3813/JBWS3813AnnotationTestCase.java 2015-01-19 03:39:10 UTC (rev 19383) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3813/JBWS3813AnnotationTestCase.java 2015-01-19 06:54:04 UTC (rev 19384) @@ -31,6 +31,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -39,6 +40,7 @@ * * @author rsearls(a)redhat.com */ +@Ignore(value="[JBWS-3813] Add exception name to faultstring/detail/stackTrace") @RunWith(Arquillian.class) public class JBWS3813AnnotationTestCase extends JBossWSTest { Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-19 03:39:10 UTC (rev 19383) +++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-19 06:54:04 UTC (rev 19384) @@ -275,6 +275,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> <skip>true</skip> <failIfNoTests>false</failIfNoTests> <runOrder>alphabetical</runOrder> @@ -294,104 +295,32 @@ <include>**/*Test.java</include> <include>**/*TestCase.java</include> </includes> - <systemProperties> - <property> - <name>jboss.bind.address</name> - <value>${jboss.bind.address}</value> - </property> - <property> - <name>java.protocol.handler.pkgs</name> - <value>org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol</value> - </property> - <property> - <name>javax.net.ssl.trustStore</name> - <value>${project.build.directory}/test-classes/test.truststore</value> - </property> - <property> - <name>javax.net.ssl.trustStorePassword</name> - <value>changeit</value> - </property> - <property> - <name>javax.net.ssl.trustStoreType</name> - <value>jks</value> - </property> - <property> - <name>javax.net.ssl.keyStore</name> - <value>${project.build.directory}/test-classes/client.keystore</value> - </property> - <property> - <name>javax.net.ssl.keyStorePassword</name> - <value>changeit</value> - </property> - <property> - <name>javax.net.ssl.keyStoreType</name> - <value>jks</value> - </property> - <property> - <name>org.jboss.security.ignoreHttpsHost</name> - <value>true</value> - </property> - <property> - <name>jboss.home</name> - <value>${jboss.home}</value> - </property> - <property> - <name>jbossws.integration.target</name> - <value>${jbossws.integration.target}</value> - </property> - <property> - <name>test.disable.deployment</name> - <value>false</value> - </property> - <property> - <name>log4j.output.dir</name> - <value>${log4j.output.dir}</value> - </property> - <property> - <name>appclient.output.dir</name> - <value>${appclient.output.dir}</value> - </property> - <property> - <name>org.jboss.ws.testsuite.securityDomain.users.propfile</name> - <value>${project.build.directory}/test-classes/jbossws-users.properties</value> - </property> - <property> - <name>org.jboss.ws.testsuite.securityDomain.roles.propfile</name> - <value>${project.build.directory}/test-classes/jbossws-roles.properties</value> - </property> - <property> - <name>org.jboss.ws.testsuite.server.keystore</name> - <value>${project.build.directory}/test-classes/test.keystore</value> - </property> - <property> - <name>org.jboss.ws.testsuite.server.truststore</name> - <value>${project.build.directory}/test-classes/test.truststore</value> - </property> - <property> - <name>test.archive.directory</name> - <value>${test.archive.directory}</value> - </property> - <property> - <name>test.classes.directory</name> - <value>${test.classes.directory}</value> - </property> - <property> - <name>test.resources.directory</name> - <value>${test.resources.directory}</value> - </property> - <property> - <name>test.username</name> - <value>${test.username}</value> - </property> - <property> - <name>test.password</name> - <value>${test.password}</value> - </property> - <property> - <name>wsdl.publish.location</name> - <value>${wsdl.publish.location}</value> - </property> - </systemProperties> + <systemPropertyVariables> + <jboss.bind.address>${jboss.bind.address}</jboss.bind.address> + <java.protocol.handler.pkgs>org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol</java.protocol.handler.pkgs> + <javax.net.ssl.trustStore>${project.build.directory}/test-classes/test.truststore</javax.net.ssl.trustStore> + <javax.net.ssl.trustStorePassword>changeit</javax.net.ssl.trustStorePassword> + <javax.net.ssl.trustStoreType>jks</javax.net.ssl.trustStoreType> + <javax.net.ssl.keyStore>${project.build.directory}/test-classes/client.keystore</javax.net.ssl.keyStore> + <javax.net.ssl.keyStorePassword>changeit</javax.net.ssl.keyStorePassword> + <javax.net.ssl.keyStoreType>jks</javax.net.ssl.keyStoreType> + <org.jboss.security.ignoreHttpsHost>true</org.jboss.security.ignoreHttpsHost> + <jboss.home>${jboss.home}</jboss.home> + <jbossws.integration.target>${jbossws.integration.target}</jbossws.integration.target> + <test.disable.deployment>false</test.disable.deployment> + <log4j.output.dir>${log4j.output.dir}</log4j.output.dir> + <appclient.output.dir>${appclient.output.dir}</appclient.output.dir> + <org.jboss.ws.testsuite.securityDomain.users.propfile>${project.build.directory}/test-classes/jbossws-users.properties</org.jboss.ws.testsuite.securityDomain.users.propfile> + <org.jboss.ws.testsuite.securityDomain.roles.propfile>${project.build.directory}/test-classes/jbossws-roles.properties</org.jboss.ws.testsuite.securityDomain.roles.propfile> + <org.jboss.ws.testsuite.server.keystore>${project.build.directory}/test-classes/test.keystore</org.jboss.ws.testsuite.server.keystore> + <org.jboss.ws.testsuite.server.truststore>${project.build.directory}/test-classes/test.truststore</org.jboss.ws.testsuite.server.truststore> + <test.archive.directory>${test.archive.directory}</test.archive.directory> + <test.classes.directory>${test.classes.directory}</test.classes.directory> + <test.resources.directory>${test.resources.directory}</test.resources.directory> + <test.username>test.username</test.username> + <test.password>${test.password}</test.password> + <wsdl.publish.location>${wsdl.publish.location}</wsdl.publish.location> + </systemPropertyVariables> </configuration> </execution> @@ -408,96 +337,30 @@ <include>**/*TestCaseForked.java</include> <include>**/*TestForked.java</include> </includes> - <systemProperties> - <property> - <name>jboss.bind.address</name> - <value>${jboss.bind.address}</value> - </property> - <property> - <name>java.protocol.handler.pkgs</name> - <value>org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol</value> - </property> - <property> - <name>javax.net.ssl.trustStore</name> - <value>${project.build.directory}/test-classes/test.truststore</value> - </property> - <property> - <name>javax.net.ssl.trustStorePassword</name> - <value>changeit</value> - </property> - <property> - <name>javax.net.ssl.trustStoreType</name> - <value>jks</value> - </property> - <property> - <name>javax.net.ssl.keyStore</name> - <value>${project.build.directory}/test-classes/client.keystore</value> - </property> - <property> - <name>javax.net.ssl.keyStorePassword</name> - <value>changeit</value> - </property> - <property> - <name>javax.net.ssl.keyStoreType</name> - <value>jks</value> - </property> - <property> - <name>org.jboss.security.ignoreHttpsHost</name> - <value>true</value> - </property> - <property> - <name>jboss.home</name> - <value>${jboss.home}</value> - </property> - <property> - <name>jbossws.integration.target</name> - <value>${jbossws.integration.target}</value> - </property> - <property> - <name>test.disable.deployment</name> - <value>false</value> - </property> - <property> - <name>log4j.output.dir</name> - <value>${log4j.output.dir}</value> - </property> - <property> - <name>appclient.output.dir</name> - <value>${appclient.output.dir}</value> - </property> - <property> - <name>org.jboss.ws.testsuite.securityDomain.users.propfile</name> - <value>${project.build.directory}/test-classes/jbossws-users.properties</value> - </property> - <property> - <name>org.jboss.ws.testsuite.securityDomain.roles.propfile</name> - <value>${project.build.directory}/test-classes/jbossws-roles.properties</value> - </property> - <property> - <name>org.jboss.ws.testsuite.server.keystore</name> - <value>${project.build.directory}/test-classes/test.keystore</value> - </property> - <property> - <name>org.jboss.ws.testsuite.server.truststore</name> - <value>${project.build.directory}/test-classes/test.truststore</value> - </property> - <property> - <name>test.archive.directory</name> - <value>${test.archive.directory}</value> - </property> - <property> - <name>test.classes.directory</name> - <value>${test.classes.directory}</value> - </property> - <property> - <name>test.resources.directory</name> - <value>${test.resources.directory}</value> - </property> - <property> - <name>wsdl.publish.location</name> - <value>${wsdl.publish.location}</value> - </property> - </systemProperties> + <systemPropertyVariables> + <jboss.bind.address>${jboss.bind.address}</jboss.bind.address> + <java.protocol.handler.pkgs>org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol</java.protocol.handler.pkgs> + <javax.net.ssl.trustStore>${project.build.directory}/test-classes/test.truststore</javax.net.ssl.trustStore> + <javax.net.ssl.trustStorePassword>changeit</javax.net.ssl.trustStorePassword> + <javax.net.ssl.trustStoreType>jks</javax.net.ssl.trustStoreType> + <javax.net.ssl.keyStore>${project.build.directory}/test-classes/client.keystore</javax.net.ssl.keyStore> + <javax.net.ssl.keyStorePassword>changeit</javax.net.ssl.keyStorePassword> + <javax.net.ssl.keyStoreType>jks</javax.net.ssl.keyStoreType> + <org.jboss.security.ignoreHttpsHost>true</org.jboss.security.ignoreHttpsHost> + <jboss.home>${jboss.home}</jboss.home> + <jbossws.integration.target>${jbossws.integration.target}</jbossws.integration.target> + <test.disable.deployment>false</test.disable.deployment> + <log4j.output.dir>${log4j.output.dir}</log4j.output.dir> + <appclient.output.di>${appclient.output.dir}</appclient.output.di> + <org.jboss.ws.testsuite.securityDomain.users.propfile>${project.build.directory}/test-classes/jbossws-users.properties</org.jboss.ws.testsuite.securityDomain.users.propfile> + <org.jboss.ws.testsuite.securityDomain.roles.propfile>${project.build.directory}/test-classes/jbossws-roles.properties</org.jboss.ws.testsuite.securityDomain.roles.propfile> + <org.jboss.ws.testsuite.server.keystore>${project.build.directory}/test-classes/test.keystore</org.jboss.ws.testsuite.server.keystore> + <org.jboss.ws.testsuite.server.truststore>${project.build.directory}/test-classes/test.truststore</org.jboss.ws.testsuite.server.truststore> + <test.archive.directory>${test.archive.directory}</test.archive.directory> + <test.classes.directory>${test.classes.directory}</test.classes.directory> + <test.resources.directory>${test.resources.directory}</test.resources.directory> + <wsdl.publish.location>${wsdl.publish.location}</wsdl.publish.location> + </systemPropertyVariables> </configuration> </execution> @@ -773,31 +636,6 @@ </compilerArguments> </configuration> </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> - <excludes combine.children="append"> - <!--# [JBWS-2561] XOP request not properly inlined--> - <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> - - <!--# [JBWS-2480] Soap attachments are dropped on server response--> - <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> - - <!-- # Tests migrated from JBossWS-Native specific testsuite which are meant to pass with JBossWS-CXF too, but are still to be fixed --> - <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> - - <!-- # [JBWS-3620] Authentication failures w/ Undertow --> - <exclude>org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase*</exclude> - - <!-- # [JBWS-3813] Add exception name to faultstring/detail/stackTrace --> - <exclude>org/jboss/test/ws/jaxws/cxf/jbws3813/*TestCase*</exclude> - - <!-- Manually setup KDC before run this test--> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> - </excludes> - </configuration> - </plugin> </plugins> </build> </profile> @@ -860,31 +698,6 @@ </compilerArguments> </configuration> </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> - <excludes combine.children="append"> - <!--# [JBWS-2561] XOP request not properly inlined--> - <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> - - <!--# [JBWS-2480] Soap attachments are dropped on server response--> - <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> - - <!-- # Tests migrated from JBossWS-Native specific testsuite which are meant to pass with JBossWS-CXF too, but are still to be fixed --> - <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> - - <!-- # [JBWS-3620] Authentication failures w/ Undertow --> - <exclude>org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase*</exclude> - - <!-- # [JBWS-3813] Add exception name to faultstring/detail/stackTrace --> - <exclude>org/jboss/test/ws/jaxws/cxf/jbws3813/*TestCase*</exclude> - - <!-- Manually setup KDC before run this test--> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> - </excludes> - </configuration> - </plugin> </plugins> </build> </profile> @@ -947,31 +760,6 @@ </compilerArguments> </configuration> </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> - <excludes combine.children="append"> - <!--# [JBWS-2561] XOP request not properly inlined--> - <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> - - <!--# [JBWS-2480] Soap attachments are dropped on server response--> - <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> - - <!-- # Tests migrated from JBossWS-Native specific testsuite which are meant to pass with JBossWS-CXF too, but are still to be fixed --> - <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> - - <!-- # [JBWS-3620] Authentication failures w/ Undertow --> - <exclude>org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase*</exclude> - - <!-- # [JBWS-3813] Add exception name to faultstring/detail/stackTrace --> - <exclude>org/jboss/test/ws/jaxws/cxf/jbws3813/*TestCase*</exclude> - - <!-- Manually setup KDC before run this test--> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> - </excludes> - </configuration> - </plugin> </plugins> </build> </profile> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2015-01-19 03:39:10 UTC (rev 19383) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2015-01-19 06:54:04 UTC (rev 19384) @@ -36,6 +36,7 @@ import javax.xml.ws.handler.Handler; import javax.xml.ws.handler.soap.SOAPMessageContext; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.jboss.arquillian.container.test.api.Deployment; @@ -45,7 +46,6 @@ import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; - import org.jboss.ws.api.handler.GenericSOAPHandler; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; @@ -55,6 +55,7 @@ /** * [JBWS-1283] Attachment dropped on outbound messages if they have been added through a handler */ +@Ignore(value="[JBWS-2480] Soap attachments are dropped on server response") @RunWith(Arquillian.class) public class JBWS1283TestCase extends JBossWSTest { Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java 2015-01-19 03:39:10 UTC (rev 19383) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java 2015-01-19 06:54:04 UTC (rev 19384) @@ -40,6 +40,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -48,6 +49,7 @@ * * @author <a href=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> */ +@Ignore(value="Tests migrated from JBossWS-Native specific testsuite which are meant to pass with JBossWS-CXF too, but are still to be fixed") @RunWith(Arquillian.class) public class JBWS2978TestCase extends JBossWSTest { Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2015-01-19 03:39:10 UTC (rev 19383) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2015-01-19 06:54:04 UTC (rev 19384) @@ -38,6 +38,7 @@ import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -54,6 +55,7 @@ * @author Heiko Braun <heiko.braun(a)jboss.com&gt; * @since 05.12.2006 */ +@Ignore(value="[JBWS-2561] XOP request not properly inlined") @RunWith(Arquillian.class) public class XOPHandlerTestCase extends XOPBase {