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

Author: asoldano Date: 2015-01-07 15:04:12 -0500 (Wed, 07 Jan 2015) New Revision: 19331 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java Log: Fixing some failures Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java 2015-01-07 15:44:18 UTC (rev 19330) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java 2015-01-07 20:04:12 UTC (rev 19331) @@ -33,9 +33,8 @@ import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.exporter.ZipExporter; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; import org.junit.Test; @@ -65,7 +64,7 @@ .addManifest() .addClass(org.jboss.test.ws.jaxws.jbws1556.EJB3Bean.class) .addClass(org.jboss.test.ws.jaxws.jbws1556.UserType.class); - writeToDisk(archive1); + JBossWSTestHelper.writeToFile(archive1); EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws1556.ear"); archive @@ -75,12 +74,6 @@ return archive; } - public static void writeToDisk(JavaArchive archive) - { - File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName()); - archive.as(ZipExporter.class).exportTo(file, true); - } - protected void cleanUp() { port = null; } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java 2015-01-07 15:44:18 UTC (rev 19330) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java 2015-01-07 20:04:12 UTC (rev 19331) @@ -62,7 +62,7 @@ @ArquillianResource Deployer deployer; - @Deployment(name = WAR_DEPLOYMENT, testable = false, managed = false) + @Deployment(name = WAR_DEPLOYMENT, order = 1, testable = false, managed = false) public static WebArchive createDeployment1() { WebArchive archive = ShrinkWrap.create(WebArchive.class, WAR_DEPLOYMENT + ".war"); archive @@ -74,7 +74,7 @@ return archive; } - @Deployment(name="jaxws-jbws1581-ejb3", order=1, testable = false) + @Deployment(name="jaxws-jbws1581-ejb3", order=2, testable = false) public static JavaArchive createDeployment2() { JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws1581-ejb3.jar"); archive @@ -88,7 +88,7 @@ return archive; } - @Deployment(name = EAR_DEPLOYMENT, testable = false, managed = false) + @Deployment(name = EAR_DEPLOYMENT, order = 3, testable = false, managed = false) public static EnterpriseArchive createDeployment3() { EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, EAR_DEPLOYMENT + ".ear"); archive Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java 2015-01-07 15:44:18 UTC (rev 19330) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java 2015-01-07 20:04:12 UTC (rev 19331) @@ -33,7 +33,6 @@ import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -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.jbws1822.webservice.EJB3RemoteIface; @@ -55,13 +54,13 @@ @ArquillianResource Deployer deployer; - public static void createDeployment3() { + static { JavaArchive archive1 = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws1822-shared.jar"); - archive1 - .addManifest() - .addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanIface.class) - .addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanImpl.class); - writeToDisk(archive1); + archive1 + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanIface.class) + .addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanImpl.class); + JBossWSTestHelper.writeToFile(archive1); } @Deployment(name = "jaxws-jbws1822-two-ejb-modules", testable = false, managed = false) @@ -71,13 +70,13 @@ .addManifest() .addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3Bean.class) .addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3RemoteIface.class); - writeToDisk(archive3); + JBossWSTestHelper.writeToFile(archive3); EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws1822-two-ejb-modules.ear"); archive .addManifest() - .addAsModule(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-one-ejb3-inside.jar")) - .addAsModule(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-shared.jar")); + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-one-ejb3-inside.jar")) + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-shared.jar")); return archive; } @@ -90,21 +89,15 @@ .addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanImpl.class) .addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3Bean.class) .addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3RemoteIface.class); - writeToDisk(archive2); + JBossWSTestHelper.writeToFile(archive2); EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws1822-one-ejb-module.ear"); archive .addManifest() - .addAsModule(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-two-ejb3-inside.jar")); + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-two-ejb3-inside.jar")); return archive; } - public static void writeToDisk(JavaArchive archive) - { - File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName()); - archive.as(ZipExporter.class).exportTo(file, true); - } - private EJB3RemoteIface getProxy() throws Exception { QName serviceName = new QName("http://jbossws.org/JBWS1822";, "EndpointService");