Author: rsearls Date: 2014-12-27 16:28:00 -0500 (Sat, 27 Dec 2014) New Revision: 19280 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/JBWS3287TestCase.java Log: arquillian migration jbws3287 test Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/JBWS3287TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/JBWS3287TestCase.java 2014-12-27 21:08:00 UTC (rev 19279) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/JBWS3287TestCase.java 2014-12-27 21:28:00 UTC (rev 19280) @@ -29,7 +29,17 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; -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.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; @@ -44,13 +54,17 @@ * @author alessio.soldano(a)jboss.com * @since 25-May-2012 */ +(a)RunWith(Arquillian.class) public class JBWS3287TestCase extends JBossWSTest { private static final String targetNS = "http://jbws3287.jaxws.ws.test.jboss.org/"; - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws3287-C.jar") { { + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false, name = "depC", order = 1) + public static JavaArchive createDeploymentC() { + JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws3287-C.jar"); archive .addManifest() .addClass(org.jboss.test.ws.jaxws.jbws3287.AuthorizationHandler.class) @@ -62,9 +76,12 @@ .addAsResource("org/jboss/test/ws/jaxws/jbws3287/jaxws-handlers-server.xml") .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3287/META-INF/jaxws-endpoint-config.xml"), "jaxws-endpoint-config.xml") .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3287/META-INF/jboss-webservices.xml"), "jboss-webservices.xml"); - } - }); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3287-B.war") { { + return archive; + } + + @Deployment(testable = false,name = "depB", order = 2) + public static WebArchive createDeploymentB() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws3287-B.war"); archive .addManifest() .addClass(org.jboss.test.ws.jaxws.jbws3287.AuthorizationHandler.class) @@ -76,9 +93,12 @@ .addAsResource("org/jboss/test/ws/jaxws/jbws3287/jaxws-handlers-server.xml") .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3287/WEB-INF/jaxws-endpoint-config.xml"), "jaxws-endpoint-config.xml") .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3287/WEB-INF/web-B.xml")); - } - }); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3287-A.war") { { + return archive; + } + + @Deployment(testable = false, name = "depA", order = 3) + public static WebArchive createDeploymentA() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws3287-A.war"); archive .addManifest() .addClass(org.jboss.test.ws.jaxws.jbws3287.AuthorizationHandler.class) @@ -91,26 +111,28 @@ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3287/WEB-INF/jaxws-endpoint-config.xml"), "jaxws-endpoint-config.xml") .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3287/WEB-INF/jboss-webservices.xml"), "jboss-webservices.xml") .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3287/WEB-INF/web-A.xml")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + return archive; } - - public static Test suite() - { - return new JBossWSTestSetup(JBWS3287TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } + @Test + @RunAsClient + @OperateOnDeployment("depA") public void testJBossWebservicesXmlDD() throws Exception { runTestInternal("jaxws-jbws3287-A/TestService?wsdl"); } - + + @Test + @RunAsClient + @OperateOnDeployment("depB") public void testWebXmlDD() throws Exception { runTestInternal("jaxws-jbws3287-B/TestService?wsdl"); } - + + @Test + @RunAsClient + @OperateOnDeployment("depC") public void testEJB3JBossWebservicesXmlDD() throws Exception { runTestInternal("jaxws-jbws3287-C/EndpointImplService/Endpoint?wsdl");