Author: rsearls Date: 2014-12-22 15:53:33 -0500 (Mon, 22 Dec 2014) New Revision: 19194 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java Log: arquillian migration enventry test Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java 2014-12-22 20:32:38 UTC (rev 19193) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java 2014-12-22 20:53:33 UTC (rev 19194) @@ -29,7 +29,15 @@ 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.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; @@ -42,28 +50,27 @@ * @author Thomas.Diesler(a)jboss.org * @since 29-May-2008 */ +(a)RunWith(Arquillian.class) public class EnvEntryJSETestCase extends JBossWSTest { - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-enventry-jse.war") { { + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployments() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-enventry-jse.war"); archive .addManifest() .addClass(org.jboss.test.ws.jaxws.enventry.EnvEntryBeanJSE.class) .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/enventry/WEB-INF/jse-web.xml")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + return archive; } - public static Test suite() - { - return new JBossWSTestSetup(EnvEntryJSETestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testEndpoint() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-enventry-jse?wsdl"); + URL wsdlURL = new URL(baseURL + "?wsdl"); QName serviceName = new QName("http://org.jboss.ws/enventry", "EnvEntryService"); Service service = Service.create(wsdlURL, serviceName); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java 2014-12-22 20:32:38 UTC (rev 19193) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java 2014-12-22 20:53:33 UTC (rev 19194) @@ -26,7 +26,15 @@ 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.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; @@ -40,28 +48,26 @@ * @author Thomas.Diesler(a)jboss.org * @since 29-May-2008 */ +(a)RunWith(Arquillian.class) public class EnvEntryServletTestCase extends JBossWSTest { - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-enventry-servlet.war") { { + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployments() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-enventry-servlet.war"); archive .addManifest() .addClass(org.jboss.test.ws.jaxws.enventry.EnvEntryServlet.class) .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/enventry/WEB-INF/servlet-web.xml")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + return archive; } - public static Test suite() - { - return new JBossWSTestSetup(EnvEntryServletTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testEndpoint() throws Exception { - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-enventry-servlet"); - assertEquals("web:8", IOUtils.readAndCloseStream(url.openStream())); + assertEquals("web:8", IOUtils.readAndCloseStream(baseURL.openStream())); } }