Author: rsearls Date: 2014-12-24 11:49:18 -0500 (Wed, 24 Dec 2014) New Revision: 19238 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3367/BothPojoAndEjbInWarTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3367/OnlyEjbInWarTestCase.java Log: arquillian migration jbws3367 test Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3367/BothPojoAndEjbInWarTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3367/BothPojoAndEjbInWarTestCase.java 2014-12-24 16:34:28 UTC (rev 19237) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3367/BothPojoAndEjbInWarTestCase.java 2014-12-24 16:49:18 UTC (rev 19238) @@ -30,7 +30,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; @@ -44,11 +52,15 @@ * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ +(a)RunWith(Arquillian.class) public class BothPojoAndEjbInWarTestCase extends JBossWSTest { - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3367-usecase1.war") { { + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployments() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws3367-usecase1.war"); archive .addManifest() .addClass(org.jboss.test.ws.jaxws.jbws3367.EJB3Endpoint.class) @@ -56,30 +68,27 @@ .addClass(org.jboss.test.ws.jaxws.jbws3367.POJOEndpoint.class) .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3367/WEB-INF/jboss-web.xml"), "jboss-web.xml") .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3367/WEB-INF/web.xml")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + return archive; } - public static Test suite() - { - return new JBossWSTestSetup(BothPojoAndEjbInWarTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testPOJOEndpoint() throws Exception { final QName serviceName = new QName("org.jboss.test.ws.jaxws.jbws3367", "POJOEndpointService"); - final URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws3367-customized/POJOEndpoint?wsdl"); + final URL wsdlURL = new URL(baseURL + "/POJOEndpoint?wsdl"); final Service service = Service.create(wsdlURL, serviceName); final EndpointIface port = service.getPort(EndpointIface.class); final String result = port.echo("hello"); assertEquals("POJO hello", result); } + @Test + @RunAsClient public void testEJB3Endpoint() throws Exception { final QName serviceName = new QName("org.jboss.test.ws.jaxws.jbws3367", "EJB3EndpointService"); - final URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws3367-customized/EJB3Endpoint?wsdl"); + final URL wsdlURL = new URL(baseURL + "/EJB3Endpoint?wsdl"); final Service service = Service.create(wsdlURL, serviceName); final EndpointIface port = service.getPort(EndpointIface.class); final String result = port.echo("hello"); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3367/OnlyEjbInWarTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3367/OnlyEjbInWarTestCase.java 2014-12-24 16:34:28 UTC (rev 19237) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3367/OnlyEjbInWarTestCase.java 2014-12-24 16:49:18 UTC (rev 19238) @@ -30,7 +30,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; @@ -44,30 +52,29 @@ * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ +(a)RunWith(Arquillian.class) public class OnlyEjbInWarTestCase extends JBossWSTest { - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3367-usecase2.war") { { + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployments() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws3367-usecase2.war"); archive .addManifest() .addClass(org.jboss.test.ws.jaxws.jbws3367.EJB3Endpoint.class) .addClass(org.jboss.test.ws.jaxws.jbws3367.EndpointIface.class) .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3367/WEB-INF-2/jboss-web.xml"), "jboss-web.xml"); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + return archive; } - public static Test suite() - { - return new JBossWSTestSetup(OnlyEjbInWarTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testEJB3Endpoint() throws Exception { final QName serviceName = new QName("org.jboss.test.ws.jaxws.jbws3367", "EJB3EndpointService"); - final URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws3367-customized2/EJB3Endpoint?wsdl"); + final URL wsdlURL = new URL(baseURL + "/EJB3Endpoint?wsdl"); final Service service = Service.create(wsdlURL, serviceName); final EndpointIface port = service.getPort(EndpointIface.class); final String result = port.echo("hello");