Author: asoldano Date: 2015-01-08 06:22:30 -0500 (Thu, 08 Jan 2015) New Revision: 19346 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/DeploymentArchive.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 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/XOPWrappedTestCase.java Log: Fix deployment name clash (we can't have two or more tests relying on the same deployment as that breaks parallel test execution) Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/DeploymentArchive.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/DeploymentArchive.java 2015-01-08 10:53:26 UTC (rev 19345) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/DeploymentArchive.java 2015-01-08 11:22:30 UTC (rev 19346) @@ -29,8 +29,8 @@ public final class DeploymentArchive { - public static WebArchive createDeployment() { - WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-xop-doclit.war"); + public static WebArchive createDeployment(String nameSuffix) { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-xop-doclit-" + nameSuffix + ".war"); archive .addManifest() .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.DHRequest.class) Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.java 2015-01-08 10:53:26 UTC (rev 19345) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.java 2015-01-08 11:22:30 UTC (rev 19346) @@ -60,7 +60,7 @@ @Deployment(testable = false) public static WebArchive createDeployment() { - return DeploymentArchive.createDeployment(); + return DeploymentArchive.createDeployment("feature"); } private MTOMEndpoint getPort(boolean mtomEnabled) throws Exception { Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2015-01-08 10:53:26 UTC (rev 19345) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2015-01-08 11:22:30 UTC (rev 19346) @@ -57,7 +57,7 @@ @Deployment(testable = false) public static WebArchive createDeployment() { - return DeploymentArchive.createDeployment(); + return DeploymentArchive.createDeployment("bare"); } protected void setUp() throws Exception 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-08 10:53:26 UTC (rev 19345) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2015-01-08 11:22:30 UTC (rev 19346) @@ -62,14 +62,14 @@ @Deployment(testable = false) public static WebArchive createDeployment() { - return DeploymentArchive.createDeployment(); + return DeploymentArchive.createDeployment("handler"); } @Override protected void setUp() throws Exception { QName serviceName = new QName("http://doclit.xop.samples.jaxws.ws.test.jboss.org/";, "MTOMService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/bare" + "?wsdl"); + URL wsdlURL = new URL(baseURL + "bare?wsdl"); Service service = Service.create(wsdlURL, serviceName); port = service.getPort(MTOMEndpoint.class); binding = (SOAPBinding)((BindingProvider)port).getBinding(); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2015-01-08 10:53:26 UTC (rev 19345) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2015-01-08 11:22:30 UTC (rev 19346) @@ -58,7 +58,7 @@ @Deployment(testable = false) public static WebArchive createDeployment() { - return DeploymentArchive.createDeployment(); + return DeploymentArchive.createDeployment("wrapped"); } protected void setUp() throws Exception