Author: jim.ma Date: 2015-01-09 04:47:20 -0500 (Fri, 09 Jan 2015) New Revision: 19355 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java Log: Fix ClientConfigurationTestCase Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2015-01-09 09:27:58 UTC (rev 19354) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2015-01-09 09:47:20 UTC (rev 19355) @@ -23,29 +23,23 @@ import java.io.File; import java.net.URL; -import java.util.LinkedList; -import java.util.List; +import java.net.URLClassLoader; -import org.junit.Test; -import org.junit.runner.RunWith; import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; 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.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.jboss.arquillian.container.test.api.OperateOnDeployment; -import org.jboss.shrinkwrap.api.exporter.ZipExporter; - -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; -import org.jboss.wsf.test.JBossWSTestSetup; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import org.junit.runner.RunWith; /** @@ -59,19 +53,29 @@ { @ArquillianResource private URL baseURL; + + private ClassLoader originalClassLoader = null; - @Deployment(name = "jaxws-clientConfig-client", order = 1, testable = false) - public static JavaArchive createDeployment1() { - JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-clientConfig-client.jar"); - archive - .addManifest() - .addAsResource("org/jboss/test/ws/jaxws/clientConfig/jaxws-client-config.xml", "jaxws-client-config.xml") - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/clientConfig/META-INF/jaxws-client-config.xml"), "jaxws-client-config.xml"); - return archive; + + @Before + public void setupClientClassPath() throws Exception { + originalClassLoader = Thread.currentThread().getContextClassLoader(); + + URLClassLoader cl = new URLClassLoader(new URL[] { createClientJar() }, + originalClassLoader); + Thread.currentThread().setContextClassLoader(cl); + + } + + + @After + public void restoreClassPath() { + Thread.currentThread().setContextClassLoader(originalClassLoader); } - - @Deployment(name = "jaxws-clientConfig-inContainer-client", order = 2, testable = false) - public static WebArchive createDeployment2() { + + + @Deployment(name = "jaxws-clientConfig-inContainer-client", order = 1, testable = false) + public static WebArchive createDeployment() { WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-clientConfig-inContainer-client.war"); archive .setManifest(new StringAsset("Manifest-Version: 1.0\n" @@ -92,8 +96,8 @@ return archive; } - @Deployment(name = "jaxws-clientConfig", order = 3, testable = false) - public static WebArchive createDeployment3() { + @Deployment(name = "jaxws-clientConfig", order = 2, testable = false) + public static WebArchive createDeployment2() { WebArchive archive = ShrinkWrap.create(WebArchive.class,"jaxws-clientConfig.war"); archive .addManifest() @@ -104,7 +108,7 @@ @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-client") + @OperateOnDeployment("jaxws-clientConfig") public void testClientConfigurer() { if (isIntegrationCXF()) { assertTrue(getHelper().testClientConfigurer()); @@ -113,7 +117,7 @@ @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-inContainer-client") + @OperateOnDeployment(value = "jaxws-clientConfig-inContainer-client") public void testClientConfigurerInContainer() throws Exception { if (isIntegrationCXF()) { assertEquals("1", runTestInContainer("testClientConfigurer")); @@ -127,56 +131,56 @@ */ @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-inContainer-client") + @OperateOnDeployment("jaxws-clientConfig") public void testCustomClientConfigurationFromFile() throws Exception { assertTrue(getHelper().testCustomClientConfigurationFromFile()); } @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-client") + @OperateOnDeployment("jaxws-clientConfig") public void testCustomClientConfigurationOnDispatchFromFile() throws Exception { assertTrue(getHelper().testCustomClientConfigurationOnDispatchFromFile()); } @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-inContainer-client") + @OperateOnDeployment(value = "jaxws-clientConfig-inContainer-client") public void testCustomClientConfigurationFromFileInContainer() throws Exception { assertEquals("1", runTestInContainer("testCustomClientConfigurationFromFile")); } @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-inContainer-client") + @OperateOnDeployment(value = "jaxws-clientConfig-inContainer-client") public void testCustomClientConfigurationOnDispatchFromFileInContainer() throws Exception { assertEquals("1", runTestInContainer("testCustomClientConfigurationOnDispatchFromFile")); } @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-client") + @OperateOnDeployment("jaxws-clientConfig") public void testCustomClientConfigurationFromFileUsingFeature() throws Exception { assertTrue(getHelper().testCustomClientConfigurationFromFileUsingFeature()); } @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-inContainer-client") + @OperateOnDeployment("jaxws-clientConfig") public void testCustomClientConfigurationFromFileUsingFeatureOnDispatch() throws Exception { assertTrue(getHelper().testCustomClientConfigurationFromFileUsingFeatureOnDispatch()); } @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-inContainer-client") + @OperateOnDeployment(value = "jaxws-clientConfig-inContainer-client") public void testCustomClientConfigurationFromFileUsingFeatureInContainer() throws Exception { assertEquals("1", runTestInContainer("testCustomClientConfigurationFromFileUsingFeature")); } @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-inContainer-client") + @OperateOnDeployment(value = "jaxws-clientConfig-inContainer-client") public void testCustomClientConfigurationFromFileUsingFeatureOnDispatchInContainer() throws Exception { assertEquals("1", runTestInContainer("testCustomClientConfigurationFromFileUsingFeatureOnDispatch")); } @@ -188,7 +192,7 @@ */ @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-client") + @OperateOnDeployment("jaxws-clientConfig") public void testConfigurationChange() throws Exception { assertTrue(getHelper().testConfigurationChange()); } @@ -196,7 +200,7 @@ @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-client") + @OperateOnDeployment("jaxws-clientConfig") public void testConfigurationChangeOnDispatch() throws Exception { assertTrue(getHelper().testConfigurationChangeOnDispatch()); } @@ -215,12 +219,21 @@ assertEquals("1", runTestInContainer("testConfigurationChangeOnDispatch")); } - // ------------------------- + private URL createClientJar() throws Exception { + String clientJarName = "jaxws-clientConfig-client.jar"; + JavaArchive archive = ShrinkWrap.create(JavaArchive.class, clientJarName); + archive + .addManifest() + .addAsResource("org/jboss/test/ws/jaxws/clientConfig/jaxws-client-config.xml", "jaxws-client-config.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/clientConfig/META-INF/jaxws-client-config.xml"), "jaxws-client-config.xml"); + JBossWSTestHelper.writeToFile(archive); + return JBossWSTest.getArchiveURL(clientJarName); + } + private Helper getHelper() { Helper helper = new Helper(); - //helper.setTargetEndpoint(baseURL + "/EndpointImpl"); - helper.setTargetEndpoint("http://" + getServerHost() + ":8080/jaxws-clientConfig/EndpointImpl"); + helper.setTargetEndpoint(baseURL + "/EndpointImpl"); return helper; }