Author: jim.ma Date: 2015-01-18 22:39:10 -0500 (Sun, 18 Jan 2015) New Revision: 19383 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefTestCase.java Log: Fix appclient test;Refactor JBWS1843TestCase Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java 2015-01-16 17:21:13 UTC (rev 19382) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java 2015-01-19 03:39:10 UTC (rev 19383) @@ -39,6 +39,7 @@ import org.jboss.test.ws.jaxws.jbws1843.generated.Service; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -73,8 +74,8 @@ return archive; } - @Override - protected void setUp() throws Exception + @Before + public void setUp() throws Exception { super.setUp(); @@ -89,7 +90,6 @@ @RunAsClient public void testCountryCodes() throws Exception { - setUp(); Response response = proxy.getCountryCodes(); List<CountryCodeType> countryCodes = response.getCountry(); assertEquals(countryCodes.get(0), CountryCodeType.CZ); @@ -100,7 +100,6 @@ @RunAsClient public void testCurrencyCodes() throws Exception { - setUp(); org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response response = proxy.getCurrencyCodes(); List<CurrencyCodeType> currencyCodes = response.getCurrency(); assertEquals(currencyCodes.get(0), CurrencyCodeType.CZK); @@ -111,7 +110,6 @@ @RunAsClient public void test() throws Exception { - setUp(); assertEquals(CurrencyCodeType.CZK, proxy.getCurrency(CountryCodeType.CZ)); assertEquals(CurrencyCodeType.EUR, proxy.getCurrency(CountryCodeType.DE)); } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefTestCase.java 2015-01-16 17:21:13 UTC (rev 19382) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefTestCase.java 2015-01-19 03:39:10 UTC (rev 19383) @@ -97,10 +97,8 @@ .addAsManifestResource( new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl"); - JBossWSTestHelper.writeToFile(archive1); - EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, APPCLIENT_DEPLOYMENT + ".ear"); - archive.addManifest().addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-samples-serviceref-appclient.jar")); + archive.addAsModule(archive1); JBossWSTestHelper.writeToFile(archive); fullAppclientDepName = archive.getName() + "#" + archive1.getName(); return archive; @@ -179,10 +177,6 @@ @OperateOnDeployment("jaxws-samples-serviceref") public void testApplicationClient() throws Exception { - if (true) { - System.out.println("FIXME: Arquillian and appclient failures"); - return; - } try { final OutputStream appclientOS = new ByteArrayOutputStream(); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefTestCase.java 2015-01-16 17:21:13 UTC (rev 19382) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefTestCase.java 2015-01-19 03:39:10 UTC (rev 19383) @@ -92,11 +92,8 @@ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/jboss-client.xml"), "jboss-client.xml") .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl") .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl"), "wsdl/MultipleEndpoint.wsdl"); - JBossWSTestHelper.writeToFile(jarArchive); EnterpriseArchive earArchive = ShrinkWrap.create(EnterpriseArchive.class, DEP_APPCLIENT_EAR + ".ear"); - earArchive - .addManifest() - .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-samples-webserviceref-appclient.jar")); + earArchive.addAsModule(jarArchive); JBossWSTestHelper.writeToFile(earArchive); fullAppclientDepName = earArchive.getName() + "#" + jarArchive.getName(); return earArchive; @@ -173,10 +170,6 @@ @OperateOnDeployment(DEP_WAR) public void testApplicationClient() throws Throwable { - if (true) { - System.out.println("FIXME: Arquillian and appclient tests"); - return; - } try { final String appclientArg = "Hello World!";