Author: rsearls Date: 2015-01-02 22:23:39 -0500 (Fri, 02 Jan 2015) New Revision: 19310 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCaseForked.java Log: arquillian migration clientConfig test Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCaseForked.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCaseForked.java 2015-01-02 21:25:47 UTC (rev 19309) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCaseForked.java 2015-01-03 03:23:39 UTC (rev 19310) @@ -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.shrinkwrap.api.asset.StringAsset; import org.jboss.ws.common.IOUtils; @@ -41,11 +52,15 @@ * @author alessio.soldano(a)jboss.com * @since 31-May-2012 */ +(a)RunWith(Arquillian.class) public class ClientConfigurationTestCaseForked extends JBossWSTest { - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-clientConfig-inContainer-client.war") { { + @ArquillianResource + private URL baseURL; + + @Deployment(name="jaxws-clientConfig-inContainer-client", 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" + "Dependencies: org.jboss.ws.common\n")) @@ -62,32 +77,34 @@ .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(ClientConfigurationTestCaseForked.class, JBossWSTestHelper.writeToFile(createDeployments())); + @Deployment(name = "jaxws-clientConfig", testable = false) + public static WebArchive createDeployment1() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-clientConfig.war"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.clientConfig.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.EndpointImpl.class); + return archive; } - + /** * Verifies the default client configuration from AS model is used * * @throws Exception */ + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-inContainer-client") public void testDefaultClientConfigurationInContainer() throws Exception { assertEquals("1", runTestInContainer("testDefaultClientConfiguration")); } - + + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-inContainer-client") public void testDefaultClientConfigurationOnDispatchInContainer() throws Exception { assertEquals("1", runTestInContainer("testDefaultClientConfigurationOnDispatch")); } @@ -97,6 +114,9 @@ * * @throws Exception */ + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-inContainer-client") public void testSEIClassDefaultClientConfigurationInContainer() throws Exception { assertEquals("1", runTestInContainer("testSEIClassDefaultClientConfiguration")); } @@ -107,6 +127,9 @@ * * @throws Exception */ + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-inContainer-client") public void testSEIClassDefaultFileClientConfigurationInContainer() throws Exception { assertEquals("1", runTestInContainer("testSEIClassDefaultFileClientConfiguration")); } @@ -117,18 +140,30 @@ * * @throws Exception */ + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-inContainer-client") public void testCustomClientConfigurationInContainer() throws Exception { assertEquals("1", runTestInContainer("testCustomClientConfiguration")); } - + + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-inContainer-client") public void testCustomClientConfigurationOnDispatchInContainer() throws Exception { assertEquals("1", runTestInContainer("testCustomClientConfigurationOnDispatch")); } - + + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-inContainer-client") public void testCustomClientConfigurationUsingFeatureInContainer() throws Exception { assertEquals("1", runTestInContainer("testCustomClientConfigurationUsingFeature")); } - + + @Test + @RunAsClient + @OperateOnDeployment("jaxws-clientConfig-inContainer-client") public void testCustomClientConfigurationOnDispatchUsingFeatureInContainer() throws Exception { assertEquals("1", runTestInContainer("testCustomClientConfigurationOnDispatchUsingFeature")); } @@ -137,8 +172,8 @@ private String runTestInContainer(String test) throws Exception { - URL url = new URL("http://" + getServerHost() - + ":8080/jaxws-clientConfig-inContainer-client?path=/jaxws-clientConfig/EndpointImpl&method=" + test + URL url = new URL(baseURL + + "?path=/jaxws-clientConfig/EndpointImpl&method=" + test + "&helper=" + Helper.class.getName()); return IOUtils.readAndCloseStream(url.openStream()); }