[jbossws-commits] JBossWS SVN: r19324 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig.

Author: rsearls Date: 2015-01-05 10:13:41 -0500 (Mon, 05 Jan 2015) New Revision: 19324 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java Log: arquillian migration clientConfig test 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-05 08:31:32 UTC (rev 19323) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2015-01-05 15:13:41 UTC (rev 19324) @@ -26,7 +26,18 @@ import java.util.LinkedList; import java.util.List; -import junit.framework.Test; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.jboss.arquillian.container.test.api.Deployment; +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.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; @@ -46,58 +57,63 @@ @RunWith(Arquillian.class) public class ClientConfigurationTestCase extends JBossWSTest { - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.JarDeployment("jaxws-clientConfig-client.jar") { { + @ArquillianResource + private URL baseURL; + + @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; + } + + @Deployment(name = "jaxws-clientConfig-inContainer-client", order = 2, testable = false) + public static WebArchive createDeployment2() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-clientConfig-inContainer-client.war"); + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.common\n")) + .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/clientConfig/META-INF/jaxws-client-config.xml"), "META-INF/jaxws-client-config.xml") + .addClass(org.jboss.test.helper.ClientHelper.class) + .addClass(org.jboss.test.helper.TestServlet.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.CustomHandler.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.Endpoint2.class) + .addAsResource("org/jboss/test/ws/jaxws/clientConfig/jaxws-client-config.xml", "jaxws-client-config.xml") + .addClass(org.jboss.test.ws.jaxws.clientConfig.Helper.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.LogHandler.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.RoutingHandler.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.TestUtils.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.UserHandler.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/clientConfig/META-INF/permissions.xml"), "permissions.xml"); + return archive; + } + + @Deployment(name = "jaxws-clientConfig", order = 3, testable = false) + public static WebArchive createDeployment3() { + WebArchive archive = ShrinkWrap.create(WebArchive.class,"jaxws-clientConfig.war"); 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"); - } - }); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-clientConfig-inContainer-client.war") { { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.common\n")) - .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/clientConfig/META-INF/jaxws-client-config.xml"), "META-INF/jaxws-client-config.xml") - .addClass(org.jboss.test.helper.ClientHelper.class) - .addClass(org.jboss.test.helper.TestServlet.class) - .addClass(org.jboss.test.ws.jaxws.clientConfig.CustomHandler.class) .addClass(org.jboss.test.ws.jaxws.clientConfig.Endpoint.class) - .addClass(org.jboss.test.ws.jaxws.clientConfig.Endpoint2.class) - .addAsResource("org/jboss/test/ws/jaxws/clientConfig/jaxws-client-config.xml", "jaxws-client-config.xml") - .addClass(org.jboss.test.ws.jaxws.clientConfig.Helper.class) - .addClass(org.jboss.test.ws.jaxws.clientConfig.LogHandler.class) - .addClass(org.jboss.test.ws.jaxws.clientConfig.RoutingHandler.class) - .addClass(org.jboss.test.ws.jaxws.clientConfig.TestUtils.class) - .addClass(org.jboss.test.ws.jaxws.clientConfig.UserHandler.class) - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/clientConfig/META-INF/permissions.xml"), "permissions.xml"); - } - }); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-clientConfig.war") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.clientConfig.Endpoint.class) .addClass(org.jboss.test.ws.jaxws.clientConfig.EndpointImpl.class); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + return archive; } - public static Test suite() - { - return new JBossWSTestSetup(ClientConfigurationTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - - /** - * Verifies the client configurer is properly resolved - */ + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-client") public void testClientConfigurer() { if (isIntegrationCXF()) { assertTrue(getHelper().testClientConfigurer()); } } - + + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-inContainer-client") public void testClientConfigurerInContainer() throws Exception { if (isIntegrationCXF()) { assertEquals("1", runTestInContainer("testClientConfigurer")); @@ -109,34 +125,58 @@ * * @throws Exception */ + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-inContainer-client") public void testCustomClientConfigurationFromFile() throws Exception { assertTrue(getHelper().testCustomClientConfigurationFromFile()); } + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-client") public void testCustomClientConfigurationOnDispatchFromFile() throws Exception { assertTrue(getHelper().testCustomClientConfigurationOnDispatchFromFile()); } + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-inContainer-client") public void testCustomClientConfigurationFromFileInContainer() throws Exception { assertEquals("1", runTestInContainer("testCustomClientConfigurationFromFile")); } - + + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-inContainer-client") public void testCustomClientConfigurationOnDispatchFromFileInContainer() throws Exception { assertEquals("1", runTestInContainer("testCustomClientConfigurationOnDispatchFromFile")); } - + + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-client") public void testCustomClientConfigurationFromFileUsingFeature() throws Exception { assertTrue(getHelper().testCustomClientConfigurationFromFileUsingFeature()); } + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-inContainer-client") public void testCustomClientConfigurationFromFileUsingFeatureOnDispatch() throws Exception { assertTrue(getHelper().testCustomClientConfigurationFromFileUsingFeatureOnDispatch()); } + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-inContainer-client") public void testCustomClientConfigurationFromFileUsingFeatureInContainer() throws Exception { assertEquals("1", runTestInContainer("testCustomClientConfigurationFromFileUsingFeature")); } - + + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-inContainer-client") public void testCustomClientConfigurationFromFileUsingFeatureOnDispatchInContainer() throws Exception { assertEquals("1", runTestInContainer("testCustomClientConfigurationFromFileUsingFeatureOnDispatch")); } @@ -146,18 +186,31 @@ * * @throws Exception */ + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-client") public void testConfigurationChange() throws Exception { assertTrue(getHelper().testConfigurationChange()); } + + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-client") public void testConfigurationChangeOnDispatch() throws Exception { assertTrue(getHelper().testConfigurationChangeOnDispatch()); } + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-inContainer-client") public void testConfigurationChangeInContainer() throws Exception { assertEquals("1", runTestInContainer("testConfigurationChange")); } + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-inContainer-client") public void testConfigurationChangeOnDispatchInContainer() throws Exception { assertEquals("1", runTestInContainer("testConfigurationChangeOnDispatch")); } @@ -166,15 +219,16 @@ private Helper getHelper() { Helper helper = new Helper(); + //helper.setTargetEndpoint(baseURL + "/EndpointImpl"); helper.setTargetEndpoint("http://" + getServerHost() + ":8080/jaxws-clientConfig/EndpointImpl"); return helper; } private String runTestInContainer(String test) throws Exception { - URL url = new URL("http://" + getServerHost() - + ":8080/jaxws-clientConfig-inContainer-client?path=/jaxws-clientConfig/EndpointImpl&method=" + test - + "&helper=" + Helper.class.getName()); + URL url = new URL(baseURL + + "?path=/jaxws-clientConfig/EndpointImpl&method=" + test + + "&helper=" + Helper.class.getName()); return IOUtils.readAndCloseStream(url.openStream()); } }