From jbossws-commits at lists.jboss.org Sun Dec 28 17:21:03 2014 Content-Type: multipart/mixed; boundary="===============3777966591620034890==" MIME-Version: 1.0 From: jbossws-commits at lists.jboss.org To: jbossws-commits at lists.jboss.org Subject: [jbossws-commits] JBossWS SVN: r19293 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref. Date: Sun, 28 Dec 2014 17:21:03 -0500 Message-ID: <201412282221.sBSML3dx017279@svn01.web.mwc.hst.phx2.redhat.com> --===============3777966591620034890== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rsearls Date: 2014-12-28 17:21:02 -0500 (Sun, 28 Dec 2014) New Revision: 19293 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/ja= va/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/ja= va/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java Log: arquillian migration serviceref test Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/= test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/j= ava/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2= 014-12-28 21:35:51 UTC (rev 19292) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/j= ava/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2= 014-12-28 22:21:02 UTC (rev 19293) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.samples.serviceref; = +import java.io.File; import java.io.InputStream; import java.net.URL; = @@ -28,7 +29,20 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; = -import junit.framework.Test; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.jboss.arquillian.container.test.api.Deployer; +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.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; = import org.jboss.test.ws.jaxws.samples.serviceref.EJBRemote; import org.jboss.ws.common.IOUtils; @@ -41,23 +55,60 @@ * @author Thomas.Diesler(a)jboss.com * @author Richard Opalka */ +(a)RunWith(Arquillian.class) public class ServiceRefEJBTestCase extends JBossWSTest { - public final String TARGET_ENDPOINT_ADDRESS =3D "http://" + getServerHo= st() + ":8080/jaxws-samples-serviceref"; - = - public static Test suite() - { - return new JBossWSTestSetup(ServiceRefEJBTestCase.class, DeploymentA= rchives.getServerArchiveFilename() + "," + DeploymentArchives.getEJBClientA= rchiveFilename()); + @ArquillianResource + private URL baseURL; + + @Deployment(name=3D"jaxws-samples-serviceref", order=3D1, testable =3D = false) + public static WebArchive createDeployment() { + WebArchive archive =3D ShrinkWrap.create(WebArchive.class, "jaxws-sa= mples-serviceref.war"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.Endpoint.cla= ss) + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.EndpointImpl= .class) + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.EndpointServ= ice.class) + .setWebXML( + new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/sam= ples/serviceref/WEB-INF/web.xml")); + return archive; } = + @Deployment(name =3D "jaxws-samples-serviceref-ejbclient", order =3D 2,= testable =3D false) + public static JavaArchive createDeployment1() { + JavaArchive archive =3D ShrinkWrap.create(JavaArchive.class, "jaxws-= samples-serviceref-ejbclient.jar"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.EJBClient.cl= ass) + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.EJBRemote.cl= ass) + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.Endpoint.cla= ss) + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.EndpointServ= ice.class) + .addAsManifestResource( + new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/samples/serviceref/META-INF/ejb-jar.xml"), "ejb-j= ar.xml") + .addAsManifestResource( + new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/samples/serviceref/META-INF/permissions.xml"), "p= ermissions.xml") + .addAsManifestResource( + new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl"),= "wsdl/Endpoint.wsdl"); + return archive; + } + + @Test + @RunAsClient + @OperateOnDeployment("jaxws-samples-serviceref") public void testWSDLAccess() throws Exception { - URL wsdlURL =3D new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + URL wsdlURL =3D new URL(baseURL + "?wsdl"); InputStream inputStream =3D wsdlURL.openStream(); assertNotNull(inputStream); IOUtils.readAndCloseStream(inputStream); } = + @Test + @RunAsClient + @OperateOnDeployment("jaxws-samples-serviceref") public void testDynamicProxy() throws Exception { URL wsdlURL =3D getResourceURL("jaxws/samples/serviceref/META-INF/ws= dl/Endpoint.wsdl"); @@ -70,6 +121,9 @@ assertEquals(helloWorld, retObj); } = + @Test + @RunAsClient + @OperateOnDeployment("jaxws-samples-serviceref") public void testEJBClient() throws Exception { = InitialContext iniCtx =3D null; Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/= test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestC= ase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/j= ava/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.ja= va 2014-12-28 21:35:51 UTC (rev 19292) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/j= ava/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.ja= va 2014-12-28 22:21:02 UTC (rev 19293) @@ -21,13 +21,24 @@ */ package org.jboss.test.ws.jaxws.samples.serviceref; = +import java.io.File; import java.io.InputStream; import java.net.URL; = import javax.xml.namespace.QName; import javax.xml.ws.Service; = -import junit.framework.Test; +import org.jboss.wsf.test.JBossWSTestHelper; +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.arquillian.container.test.api.OperateOnDeployment; = import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; @@ -39,24 +50,59 @@ * @author Thomas.Diesler(a)jboss.com * @author Richard Opalka */ +(a)RunWith(Arquillian.class) public class ServiceRefServletTestCase extends JBossWSTest { - = - public final String TARGET_ENDPOINT_ADDRESS =3D "http://" + getServerHo= st() + ":8080/jaxws-samples-serviceref"; - = - public static Test suite() - { - return new JBossWSTestSetup(ServiceRefServletTestCase.class, Deploym= entArchives.getServerArchiveFilename() + "," + DeploymentArchives.getServle= tClientArchiveFilename()); + @ArquillianResource + private URL baseURL; + + @Deployment(name=3D"jaxws-samples-serviceref", order=3D1, testable =3D = false) + public static WebArchive createDeployment() { + WebArchive archive =3D ShrinkWrap.create(WebArchive.class, "jaxws-sa= mples-serviceref.war"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.Endpoint.cla= ss) + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.EndpointImpl= .class) + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.EndpointServ= ice.class) + .setWebXML( + new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/sam= ples/serviceref/WEB-INF/web.xml")); + return archive; } = + @Deployment(name=3D"jaxws-samples-serviceref-servlet-client", order=3D2= , testable =3D false) + public static WebArchive createDeployment1() { + WebArchive archive =3D ShrinkWrap.create(WebArchive.class, "jaxws-sa= mples-serviceref-servlet-client.war"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.Endpoint.cla= ss) + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.EndpointServ= ice.class) + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.ServletClien= t.class) + .addAsWebInfResource( + new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl"),= "wsdl/Endpoint.wsdl") + .addAsWebInfResource( + new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/samples/serviceref/servlet-client/WEB-INF/jboss-w= eb.xml"), "jboss-web.xml") + .setWebXML( + new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml= ")); + return archive; + } + + @Test + @RunAsClient + @OperateOnDeployment("jaxws-samples-serviceref-servlet-client") public void testWSDLAccess() throws Exception { - URL wsdlURL =3D new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + URL wsdlURL =3D new URL("http://" + baseURL.getHost() + ":8080/jaxws= -samples-serviceref?wsdl"); InputStream inputStream =3D wsdlURL.openStream(); assertNotNull(inputStream); IOUtils.readAndCloseStream(inputStream); } - = + + @Test + @RunAsClient + @OperateOnDeployment("jaxws-samples-serviceref") public void testDynamicProxy() throws Exception { URL wsdlURL =3D getResourceURL("jaxws/samples/serviceref/META-INF/ws= dl/Endpoint.wsdl"); @@ -69,9 +115,12 @@ assertEquals(helloWorld, retObj); = } = + @Test + @RunAsClient + @OperateOnDeployment("jaxws-samples-serviceref-servlet-client") public void testServletClient() throws Exception { - URL url =3D new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo= =3DHelloWorld"); + URL url =3D new URL("http://" + baseURL.getHost() + ":8080/jaxws-sam= ples-serviceref-servlet-client?echo=3DHelloWorld"); assertEquals("HelloWorld", IOUtils.readAndCloseStream(url.openStream= ())); } = --===============3777966591620034890==--