[jbossws-commits] JBossWS SVN: r19297 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Dec 29 10:50:04 EST 2014
Author: rsearls
Date: 2014-12-29 10:50:04 -0500 (Mon, 29 Dec 2014)
New Revision: 19297
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/DeploymentArchives.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java
Log:
arquillian migration jbws2307 test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/DeploymentArchives.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/DeploymentArchives.java 2014-12-29 14:56:57 UTC (rev 19296)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/DeploymentArchives.java 2014-12-29 15:50:04 UTC (rev 19297)
@@ -24,10 +24,15 @@
import java.io.File;
import org.jboss.wsf.test.JBossWSTestHelper;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
public final class DeploymentArchives
{
- public static final String SERVER = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-jbws2307-service.war") { {
+ public static final String SERVER_DEPLOYMENT = "jaxws-jbws2307-service";
+ public static WebArchive createDeployment() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, SERVER_DEPLOYMENT + ".war");
archive
.addManifest()
.addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class)
@@ -36,10 +41,12 @@
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/web.xml"), "web.xml")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl")
.setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/web.xml"));
- }
- });
-
- public static final String CLIENT_2 = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-jbws2307-client-2.war") { {
+ return archive;
+ }
+
+ public static final String CLIENT_2_DEPLOYMENT = "jaxws-jbws2307-client-2";
+ public static WebArchive createDeployment2() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_2_DEPLOYMENT + ".war");
archive
.addManifest()
.addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet2.class)
@@ -49,10 +56,12 @@
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web2.xml"), "web.xml")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl")
.setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web2.xml"));
- }
- });
-
- public static final String CLIENT_3 = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-jbws2307-client-3.war") { {
+ return archive;
+ }
+
+ public static final String CLIENT_3_DEPLOYMENT = "jaxws-jbws2307-client-3";
+ public static WebArchive createDeployment3() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_3_DEPLOYMENT + ".war");
archive
.addManifest()
.addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet3.class)
@@ -62,10 +71,12 @@
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web3.xml"), "web.xml")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl")
.setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web3.xml"));
- }
- });
-
- public static final String CLIENT = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-jbws2307-client.war") { {
+ return archive;
+ }
+
+ public static final String CLIENT_DEPLOYMENT = "jaxws-jbws2307-client";
+ public static WebArchive createDeployment4() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws2307-client.war");
archive
.addManifest()
.addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet.class)
@@ -75,9 +86,9 @@
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web.xml"), "web.xml")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl")
.setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web.xml"));
- }
- });
-
+ return archive;
+ }
+
private DeploymentArchives() {
//NOOP
}
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2014-12-29 14:56:57 UTC (rev 19296)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2014-12-29 15:50:04 UTC (rev 19297)
@@ -26,8 +26,17 @@
import java.net.HttpURLConnection;
import java.net.URL;
-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.spec.WebArchive;
+import org.jboss.arquillian.container.test.api.Deployer;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+
import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -37,21 +46,36 @@
*
* @author alessio.soldano at jboss.com
*/
+ at RunWith(Arquillian.class)
public class JBWS2307MTOMTestCase extends JBossWSTest
{
- public static Test suite()
- {
- return new JBossWSTestSetup(JBWS2307MTOMTestCase.class, DeploymentArchives.SERVER + " " + DeploymentArchives.CLIENT, true);
+ @ArquillianResource
+ private URL baseURL;
+
+ @Deployment(name= DeploymentArchives.SERVER_DEPLOYMENT, order=1, testable = false)
+ public static WebArchive createClientDeployment() {
+ return DeploymentArchives.createDeployment();
}
-
+
+ @Deployment(name = DeploymentArchives.CLIENT_DEPLOYMENT, order=2, testable = false)
+ public static WebArchive createDeployment4() {
+ return DeploymentArchives.createDeployment4();
+ }
+
+ @Test
+ @RunAsClient
+ @OperateOnDeployment(DeploymentArchives.CLIENT_DEPLOYMENT)
public void testMTOM() throws Exception
{
- assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080/jaxws-jbws2307-client/jbws2307?mtom=true").openStream()));
+ assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client/jbws2307?mtom=true").openStream()));
}
-
+
+ @Test
+ @RunAsClient
+ @OperateOnDeployment(DeploymentArchives.CLIENT_DEPLOYMENT)
public void testClient() throws Exception
{
- HttpURLConnection con = (HttpURLConnection)new URL("http://" + getServerHost() + ":8080/jaxws-jbws2307-client/jbws2307").openConnection();
+ HttpURLConnection con = (HttpURLConnection)new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client/jbws2307").openConnection();
BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream()));
assertEquals("true", isr.readLine());
}
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java 2014-12-29 14:56:57 UTC (rev 19296)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java 2014-12-29 15:50:04 UTC (rev 19297)
@@ -26,7 +26,14 @@
import java.net.HttpURLConnection;
import java.net.URL;
-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.spec.WebArchive;
+import org.jboss.arquillian.container.test.api.Deployer;
import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
@@ -38,32 +45,52 @@
*
* @author alessio.soldano at jboss.com
*/
+ at RunWith(Arquillian.class)
public class WebServiceRefMTOMTestCase extends JBossWSTest
{
+ @ArquillianResource
+ private URL baseURL;
- public static Test suite()
- {
- return new JBossWSTestSetup(WebServiceRefMTOMTestCase.class, DeploymentArchives.SERVER, true);
+ @ArquillianResource
+ Deployer deployer;
+
+ @Deployment(testable = false)
+ public static WebArchive createClientDeployment() {
+ return DeploymentArchives.createDeployment();
}
-
+
+ @Deployment(name = DeploymentArchives.CLIENT_3_DEPLOYMENT, testable = false, managed = false)
+ public static WebArchive createDeployment3() {
+ return DeploymentArchives.createDeployment3();
+ }
+
+ @Deployment(name = DeploymentArchives.CLIENT_2_DEPLOYMENT, testable = false, managed = false)
+ public static WebArchive createDeployment2() {
+ return DeploymentArchives.createDeployment2();
+ }
+
+ @Test
+ @RunAsClient
public void testUsingClientArchive3() throws Exception
{
try {
- JBossWSTestHelper.deploy(DeploymentArchives.CLIENT_3);
- assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080/jaxws-jbws2307-client-3/jbws2307?mtom=true").openStream()));
- HttpURLConnection con = (HttpURLConnection)new URL("http://" + getServerHost() + ":8080/jaxws-jbws2307-client-3/jbws2307").openConnection();
+ deployer.deploy(DeploymentArchives.CLIENT_3_DEPLOYMENT);
+ assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client-3/jbws2307?mtom=true").openStream()));
+ HttpURLConnection con = (HttpURLConnection)new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client-3/jbws2307").openConnection();
BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream()));
assertEquals("true", isr.readLine());
} finally {
- JBossWSTestHelper.undeploy(DeploymentArchives.CLIENT_3);
+ deployer.undeploy(DeploymentArchives.CLIENT_3_DEPLOYMENT);
}
}
-
+
+ @Test
+ @RunAsClient
public void testUsingClientArchive2() throws Exception
{
try {
- JBossWSTestHelper.deploy(DeploymentArchives.CLIENT_2);
- URL url = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2307-client-2/jbws2307?mtom=true");
+ deployer.deploy(DeploymentArchives.CLIENT_2_DEPLOYMENT);
+ URL url = new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client-2/jbws2307?mtom=true");
final HttpURLConnection c = (HttpURLConnection)url.openConnection();
c.connect();
assertEquals(500, c.getResponseCode());
@@ -71,7 +98,7 @@
c.disconnect();
assertTrue(error.contains("Could not instantiate ClientServlet2"));
} finally {
- JBossWSTestHelper.undeploy(DeploymentArchives.CLIENT_2);
+ deployer.undeploy(DeploymentArchives.CLIENT_2_DEPLOYMENT);
}
}
}
More information about the jbossws-commits
mailing list