Author: rsearls Date: 2014-12-30 20:33:14 -0500 (Tue, 30 Dec 2014) New Revision: 19301 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java Log: arquillian migration jbws1822 test Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java 2014-12-30 23:56:07 UTC (rev 19300) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java 2014-12-31 01:33:14 UTC (rev 19301) @@ -27,7 +27,19 @@ 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.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.arquillian.container.test.api.Deployer; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3RemoteIface; import org.jboss.wsf.test.JBossWSTest; @@ -41,85 +53,98 @@ * * @since Jan 8, 2008 */ +(a)RunWith(Arquillian.class) public final class JBWS1822TestCase extends JBossWSTest { - static { - JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws1822-shared.jar") { { - archive + @ArquillianResource + Deployer deployer; + + public static void createDeployment3() { + JavaArchive archive1 = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws1822-shared.jar"); + archive1 .addManifest() .addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanIface.class) .addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanImpl.class); - } - }); - JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws1822-two-ejb3-inside.jar") { { + writeToDisk(archive1); + } + + @Deployment(name="jaxws-jbws1822-two-ejb-modules", testable = false, managed=false) + public static EnterpriseArchive createDeployment2() { + JavaArchive archive3 = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws1822-one-ejb3-inside.jar"); + archive3 + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3Bean.class) + .addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3RemoteIface.class); + writeToDisk(archive3); + + EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws1822-two-ejb-modules.ear"); archive .addManifest() - .addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanIface.class) - .addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanImpl.class) - .addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3Bean.class) - .addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3RemoteIface.class); - } - }); - JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws1822-one-ejb3-inside.jar") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3Bean.class) - .addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3RemoteIface.class); - } - }); - JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws1822-two-ejb-modules.ear") { { - archive - .addManifest() .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-one-ejb3-inside.jar")) .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-shared.jar")); - } - }); - JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws1822-one-ejb-module.ear") { { + return archive; + } + + @Deployment(name = "jaxws-jbws1822-one-ejb-module", testable = false, managed = false) + public static EnterpriseArchive createDeployment1() { + JavaArchive archive2 = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws1822-two-ejb3-inside.jar"); + archive2 + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanIface.class) + .addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3Bean.class) + .addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3RemoteIface.class); + writeToDisk(archive2); + + EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws1822-one-ejb-module.ear"); archive - .addManifest() - .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-two-ejb3-inside.jar")); - } - }); + .addManifest() + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-two-ejb3-inside.jar")); + return archive; } - public static Test suite() + public static void writeToDisk(JavaArchive archive) { - return new JBossWSTestSetup(JBWS1822TestCase.class, ""); + File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName()); + archive.as(ZipExporter.class).exportTo(file, true); } private EJB3RemoteIface getProxy() throws Exception { QName serviceName = new QName("http://jbossws.org/JBWS1822";, "EndpointService"); URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1822?wsdl"); - Service service = Service.create(wsdlURL, serviceName); return (EJB3RemoteIface)service.getPort(EJB3RemoteIface.class); } - + + @Test + @RunAsClient public void testOneEjbModule() throws Exception { - deploy("jaxws-jbws1822-one-ejb-module.ear"); + deployer.deploy("jaxws-jbws1822-one-ejb-module"); try { assertEquals(getProxy().getMessage(), "Injected hello message"); } finally { - undeploy("jaxws-jbws1822-one-ejb-module.ear"); + deployer.undeploy("jaxws-jbws1822-one-ejb-module"); } } - + + @Test + @RunAsClient public void testTwoEjbModules() throws Exception { - deploy("jaxws-jbws1822-two-ejb-modules.ear"); + deployer.deploy("jaxws-jbws1822-two-ejb-modules"); try { assertEquals(getProxy().getMessage(), "Injected hello message"); } finally { - undeploy("jaxws-jbws1822-two-ejb-modules.ear"); + deployer.undeploy("jaxws-jbws1822-two-ejb-modules"); } } - + }