Author: asoldano Date: 2015-01-08 05:05:41 -0500 (Thu, 08 Jan 2015) New Revision: 19344 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java Log: Properly fixing JBWS2074TestCase (also works in parallel test mode) Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2015-01-08 08:17:36 UTC (rev 19343) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2015-01-08 10:05:41 UTC (rev 19344) @@ -22,9 +22,6 @@ package org.jboss.test.ws.jaxws.jbws2074.usecase1.client; import java.io.File; -import java.lang.Exception; -import java.lang.String; -import java.lang.StringBuffer; import java.net.URL; import javax.xml.namespace.QName; @@ -37,7 +34,6 @@ import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.exporter.ZipExporter; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.ws.jaxws.jbws2074.usecase1.service.POJOIface; @@ -54,34 +50,38 @@ @RunWith(Arquillian.class) public final class JBWS2074TestCase extends JBossWSTest { + private static final String WAR_DEPLOYMENT = "jaxws-jbws2074-usecase1"; + @ArquillianResource Deployer deployer; + + private static WebArchive getWarArchive() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, WAR_DEPLOYMENT + ".war"); + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.JavaResourcesHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.ManualResourcesHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase1.service.POJOIface.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase1.service.POJOImpl.class) + .addAsResource("org/jboss/test/ws/jaxws/jbws2074/usecase1/service/jaxws-service-handlers.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase1/WEB-INF/web.xml")); + return archive; + } - private static final String WAR_DEPLOYMENT = "jaxws-jbws2074-usecase1"; @Deployment(name = WAR_DEPLOYMENT, testable = false, managed = false, order = 1) public static WebArchive createClientDeployment1() { - WebArchive archive = ShrinkWrap.create(WebArchive.class, WAR_DEPLOYMENT + ".war"); - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.logging\n")) - .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler.class) - .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.JavaResourcesHandler.class) - .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.ManualResourcesHandler.class) - .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase1.service.POJOIface.class) - .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase1.service.POJOImpl.class) - .addAsResource("org/jboss/test/ws/jaxws/jbws2074/usecase1/service/jaxws-service-handlers.xml") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase1/WEB-INF/web.xml")); - JBossWSTestHelper.writeToFile(archive); - return archive; + return getWarArchive(); } @Deployment(name = "jaxws-jbws2074-ear-usecase1", testable = false, managed = false, order = 2) public static EnterpriseArchive createClientDeployment() { EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws2074-usecase1.ear"); - archive - .addManifest() - .addAsModule(new File(JBossWSTestHelper.getTestArchiveDir(), WAR_DEPLOYMENT + ".war")) - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase1-ear/META-INF/application.xml"), "application.xml"); + archive + .addManifest() + .addAsModule(getWarArchive()) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase1-ear/META-INF/application.xml"), "application.xml"); return archive; } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java 2015-01-08 08:17:36 UTC (rev 19343) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java 2015-01-08 10:05:41 UTC (rev 19344) @@ -51,12 +51,13 @@ @RunWith(Arquillian.class) public final class JBWS2074TestCase extends JBossWSTest { + private static final String JAR_DEPLOYMENT = "jaxws-jbws2074-usecase2"; + private static final String EAR_DEPLOYMENT = "jaxws-jbws2074-ear-usecase2"; + @ArquillianResource Deployer deployer; - - private static final String JAR_DEPLOYMENT = "jaxws-jbws2074-usecase2"; - @Deployment(name = JAR_DEPLOYMENT, testable = false, managed = false, order = 1) - public static JavaArchive createClientDeployment1() { + + private static JavaArchive getJarArchive() { JavaArchive archive = ShrinkWrap.create(JavaArchive.class, JAR_DEPLOYMENT + ".jar"); archive .setManifest(new StringAsset("Manifest-Version: 1.0\n" @@ -64,18 +65,21 @@ .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Iface.class) .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Impl.class) .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase2/META-INF/ejb-jar.xml"), "ejb-jar.xml"); - JBossWSTestHelper.writeToFile(archive); return archive; } - private static final String EAR_DEPLOYMENT = "jaxws-jbws2074-ear-usecase2"; + @Deployment(name = JAR_DEPLOYMENT, testable = false, managed = false, order = 1) + public static JavaArchive createClientDeployment1() { + return getJarArchive(); + } + @Deployment(name = EAR_DEPLOYMENT, testable = false, managed = false, order = 2) public static EnterpriseArchive createClientDeployment() { EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws2074-usecase2.ear"); - archive - .addManifest() - .addAsModule(new File(JBossWSTestHelper.getTestArchiveDir(), JAR_DEPLOYMENT + ".jar")) - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase2-ear/META-INF/application.xml"), "application.xml"); + archive + .addManifest() + .addAsModule(getJarArchive()) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase2-ear/META-INF/application.xml"), "application.xml"); return archive; } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java 2015-01-08 08:17:36 UTC (rev 19343) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java 2015-01-08 10:05:41 UTC (rev 19344) @@ -34,7 +34,6 @@ import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.exporter.ZipExporter; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOIface; @@ -51,12 +50,13 @@ @RunWith(Arquillian.class) public final class JBWS2074TestCase extends JBossWSTest { + private static final String WAR_DEPLOYMENT = "jaxws-jbws2074-usecase3"; + private static final String EAR_DEPLOYMENT = "jaxws-jbws2074-ear-usecase3"; + @ArquillianResource Deployer deployer; - private static final String WAR_DEPLOYMENT = "jaxws-jbws2074-usecase3"; - @Deployment(name = WAR_DEPLOYMENT, testable = false, managed = false, order = 1) - public static WebArchive createClientDeployment1() { + private static WebArchive getWarArchive() { WebArchive archive = ShrinkWrap.create(WebArchive.class, WAR_DEPLOYMENT + ".war"); archive .setManifest(new StringAsset("Manifest-Version: 1.0\n" @@ -64,17 +64,20 @@ .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOIface.class) .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOImpl.class) .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase3/WEB-INF/web.xml")); - JBossWSTestHelper.writeToFile(archive); return archive; } - private static final String EAR_DEPLOYMENT = "jaxws-jbws2074-ear-usecase3"; + @Deployment(name = WAR_DEPLOYMENT, testable = false, managed = false, order = 1) + public static WebArchive createClientDeployment1() { + return getWarArchive(); + } + @Deployment(name = EAR_DEPLOYMENT, testable = false, managed = false, order = 2) public static EnterpriseArchive createClientDeployment() { EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, EAR_DEPLOYMENT + ".ear"); archive .addManifest() - .addAsModule(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws2074-usecase3.war")) + .addAsModule(getWarArchive()) .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase3-ear/META-INF/application.xml"), "application.xml"); return archive; } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java 2015-01-08 08:17:36 UTC (rev 19343) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java 2015-01-08 10:05:41 UTC (rev 19344) @@ -34,7 +34,6 @@ import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.exporter.ZipExporter; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.test.ws.jaxws.jbws2074.usecase4.service.EJB3Iface; @@ -51,12 +50,13 @@ @RunWith(Arquillian.class) public final class JBWS2074TestCase extends JBossWSTest { + private static final String JAR_DEPLOYMENT = "jaxws-jbws2074-usecase4"; + private static final String EAR_DEPLOYMENT = "jaxws-jbws2074-ear-usecase4"; + @ArquillianResource Deployer deployer; - private static final String JAR_DEPLOYMENT = "jaxws-jbws2074-usecase4"; - @Deployment(name = JAR_DEPLOYMENT, testable = false, managed = false, order = 1) - public static JavaArchive createClientDeployment1() { + private static JavaArchive getJarArchive() { JavaArchive archive = ShrinkWrap.create(JavaArchive.class, JAR_DEPLOYMENT + ".jar"); archive .setManifest(new StringAsset("Manifest-Version: 1.0\n" @@ -68,17 +68,20 @@ .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase4.service.EJB3Impl.class) .addAsResource("org/jboss/test/ws/jaxws/jbws2074/usecase4/service/jaxws-service-handlers.xml") .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase4/META-INF/ejb-jar.xml"), "ejb-jar.xml"); - JBossWSTestHelper.writeToFile(archive); return archive; } - private static final String EAR_DEPLOYMENT = "jaxws-jbws2074-ear-usecase4"; + @Deployment(name = JAR_DEPLOYMENT, testable = false, managed = false, order = 1) + public static JavaArchive createClientDeployment1() { + return getJarArchive(); + } + @Deployment(name = EAR_DEPLOYMENT, testable = false, managed = false, order = 2) public static EnterpriseArchive createClientDeployment() { EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws2074-usecase4.ear"); archive .addManifest() - .addAsModule(new File(JBossWSTestHelper.getTestArchiveDir(), JAR_DEPLOYMENT + ".jar")) + .addAsModule(getJarArchive()) .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase4-ear/META-INF/application.xml"), "application.xml"); return archive; }