Author: asoldano Date: 2014-12-01 16:18:19 -0500 (Mon, 01 Dec 2014) New Revision: 19118 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/EarSchemaImportTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/JBWS3679TestCase.java Log: More tests converted... Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/EarSchemaImportTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/EarSchemaImportTestCase.java 2014-12-01 11:23:50 UTC (rev 19117) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/EarSchemaImportTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) @@ -27,52 +27,59 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; -import junit.framework.Test; - +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.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestSetup; +import org.junit.Test; +import org.junit.runner.RunWith; +(a)RunWith(Arquillian.class) public class EarSchemaImportTestCase extends JBossWSTest { - public final String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3655/HelloService"; - - static { - JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jbws3655-ejb.jar") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloWSEJBImpl.class); - } - }); - JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jbws3655-jaxws.jar") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloRequest.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloResponse.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloWs.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloWsImpl.class) - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3655/META-INF/wsdl/Hello.wsdl"), "wsdl/Hello.wsdl") - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3655/META-INF/wsdl/Hello_schema1.xsd"), "wsdl/Hello_schema1.xsd"); - } - }); - JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jbws3655.ear") { { - archive - .addManifest() - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3655/META-INF/application.xml")) - .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-cxf-jbws3655-jaxws.jar"), "lib/jaxws-cxf-jbws3655-jaxws.jar") - .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-cxf-jbws3655-ejb.jar")); - } - }); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static JavaArchive createDeployment3() { + JavaArchive archive1 = ShrinkWrap.create(JavaArchive.class, "jaxws-cxf-jbws3655-ejb.jar"); + archive1.addManifest().addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloWSEJBImpl.class); + writeToDisk(archive1); + + JavaArchive archive2 = ShrinkWrap.create(JavaArchive.class, "jaxws-cxf-jbws3655-jaxws.jar"); + archive2.addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloRequest.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloWs.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloWsImpl.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3655/META-INF/wsdl/Hello.wsdl"), "wsdl/Hello.wsdl") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3655/META-INF/wsdl/Hello_schema1.xsd"), "wsdl/Hello_schema1.xsd"); + writeToDisk(archive2); + + JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-cxf-jbws3655.ear"); + archive.addManifest() + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3655/META-INF/application.xml")) + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-cxf-jbws3655-jaxws.jar"), "lib/jaxws-cxf-jbws3655-jaxws.jar") + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-cxf-jbws3655-ejb.jar")); + return archive; } - - public static Test suite() + + public static void writeToDisk(JavaArchive archive) { - return new JBossWSTestSetup(EarSchemaImportTestCase.class, "jaxws-cxf-jbws3655.ear"); + File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName()); + archive.as(ZipExporter.class).exportTo(file, true); } + @Test + @RunAsClient public void testSchemaImport() throws Exception { - HelloWs port = getPort(endpointAddress); + HelloWs port = getPort(baseURL + "/jaxws-cxf-jbws3655/HelloService"); HelloRequest request = new HelloRequest(); request.setInput("hello"); HelloResponse response = port.doHello(request); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/JBWS3679TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/JBWS3679TestCase.java 2014-12-01 11:23:50 UTC (rev 19117) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/JBWS3679TestCase.java 2014-12-01 21:18:19 UTC (rev 19118) @@ -18,52 +18,52 @@ import java.io.File; import java.net.URL; -import java.util.LinkedList; -import java.util.List; -import junit.framework.Test; - +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.spec.WebArchive; 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.Test; +import org.junit.runner.RunWith; +(a)RunWith(Arquillian.class) public class JBWS3679TestCase extends JBossWSTest { - public final String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3679/ServletClient"; - - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3679.war") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3679.CDIBeanClient.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3679.EndpointOne.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3679.EndpointOneImpl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3679.EndpointOneService.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3679.ServletClient.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3679/WEB-INF/beans.xml"), "beans.xml") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3679/WEB-INF/web.xml")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-jbws3679.war"); + archive.addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3679.CDIBeanClient.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3679.EndpointOne.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3679.EndpointOneImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3679.EndpointOneService.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3679.ServletClient.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3679/WEB-INF/beans.xml"), "beans.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3679/WEB-INF/web.xml")); + return archive; } - public static Test suite() - { - return new JBossWSTestSetup(JBWS3679TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testServletClient() throws Exception { - URL url = new URL(endpointAddress); + URL url = new URL(baseURL + "/ServletClient"); assertEquals("Echoded with:input", IOUtils.readAndCloseStream(url.openStream())); } + @Test + @RunAsClient public void testCDIClient() throws Exception { - URL url = new URL(endpointAddress + "?client=CDI"); + URL url = new URL(baseURL + "/ServletClient?client=CDI"); assertEquals("Echoded with:cdiInput", IOUtils.readAndCloseStream(url.openStream())); } }