[jbossws-commits] JBossWS SVN: r19311 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Sat Jan 3 11:57:47 EST 2015
Author: rsearls
Date: 2015-01-03 11:57:47 -0500 (Sat, 03 Jan 2015)
New Revision: 19311
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/DeploymentArchives.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java
Log:
arquillian migration webserviceref test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/DeploymentArchives.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/DeploymentArchives.java 2015-01-03 03:23:39 UTC (rev 19310)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/DeploymentArchives.java 2015-01-03 16:57:47 UTC (rev 19311)
@@ -22,92 +22,104 @@
package org.jboss.test.ws.jaxws.samples.webserviceref;
import java.io.File;
+import java.lang.System;
import org.jboss.shrinkwrap.api.asset.StringAsset;
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.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.Archive;
+
public final class DeploymentArchives
{
- private final String server;
- private final String appclient;
- private final String appclientEar;
- private final String ejbClient;
- private final String servletClient;
-
- private static final DeploymentArchives me = new DeploymentArchives();
-
- public static String getServerArchiveFilename() {
- return me.server;
+ public static final String DEP_EJB3_CLIENT_JAR = "jaxws-samples-webserviceref-ejb3-client";
+ public static JavaArchive getEJBClientArchiveFilename() {
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-samples-webserviceref-ejb3-client.jar");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Remote.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.Endpoint.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointService.class)
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/jboss.xml"), "jboss.xml")
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/permissions.xml"), "permissions.xml")
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl")
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl"), "wsdl/MultipleEndpoint.wsdl");
+ return archive;
}
-
- public static String getAppclientJarArchiveFilename() {
- return me.appclient;
+
+ public static final String DEP_WAR = "jaxws-samples-webserviceref";
+
+ public static WebArchive getServerArchiveFilename() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-webserviceref.war");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointImpl.class)
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/WEB-INF/web.xml"));
+ return archive;
}
-
- public static String getAppclientEarArchiveFilename() {
- return me.appclientEar;
+
+ public static final String DEP_APPCLIENT_JAR ="jaxws-samples-webserviceref-appclient";
+
+ public static JavaArchive getAppclientJarArchiveFilename() {
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-samples-webserviceref-appclient.jar");
+ archive
+ .setManifest(new StringAsset("Manifest-Version: 1.0\n"
+ + "main-class: org.jboss.test.ws.jaxws.samples.webserviceref.EndpointClientOne\n"))
+ .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.Endpoint.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointClientOne.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointService.class)
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/application-client.xml"), "application-client.xml")
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/jboss-client.xml"), "jboss-client.xml")
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl")
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl"), "wsdl/MultipleEndpoint.wsdl");
+ writeToDisk(archive);
+ return archive;
}
-
- public static String getEJBClientArchiveFilename() {
- return me.ejbClient;
+
+ public static final String DEP_APPCLIENT_EAR="jaxws-samples-webserviceref-appclient";
+
+ public static EnterpriseArchive getAppclientEarArchiveFilename() {
+ EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-samples-webserviceref-appclient.ear");
+ archive
+ .addManifest()
+ .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-samples-webserviceref-appclient.jar"));
+ writeToDisk(archive);
+ return archive;
}
-
- public static String getServletClientArchiveFilename() {
- return me.servletClient;
+
+ public static final String DEP_SERVLET_CLIENT_WAR = "jaxws-samples-webserviceref-servlet-client";
+
+ public static WebArchive getServletClientArchiveFilename() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-webserviceref-servlet-client.war");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.Endpoint.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointService.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.MultipleEndpointService.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient.class)
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml"), "jboss-web.xml")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl"), "wsdl/MultipleEndpoint.wsdl")
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/WEB-INF-client/web.xml"));
+ return archive;
}
-
- private DeploymentArchives() {
- ejbClient = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-webserviceref-ejb3-client.jar") { {
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client.class)
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Remote.class)
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.Endpoint.class)
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointService.class)
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/jboss.xml"), "jboss.xml")
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/permissions.xml"), "permissions.xml")
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl")
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl"), "wsdl/MultipleEndpoint.wsdl");
- }
- });
- server = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-webserviceref.war") { {
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointImpl.class)
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/WEB-INF/web.xml"));
- }
- });
- appclient = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-webserviceref-appclient.jar") { {
- archive
- .setManifest(new StringAsset("Manifest-Version: 1.0\n"
- + "main-class: org.jboss.test.ws.jaxws.samples.webserviceref.EndpointClientOne\n"))
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.Endpoint.class)
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointClientOne.class)
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointService.class)
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/application-client.xml"), "application-client.xml")
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/jboss-client.xml"), "jboss-client.xml")
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl")
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl"), "wsdl/MultipleEndpoint.wsdl");
- }
- });
- appclientEar = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-webserviceref-appclient.ear") { {
- archive
- .addManifest()
- .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-samples-webserviceref-appclient.jar"));
- }
- });
- servletClient = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-webserviceref-servlet-client.war") { {
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.Endpoint.class)
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointService.class)
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.MultipleEndpointService.class)
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient.class)
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml"), "jboss-web.xml")
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl")
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl"), "wsdl/MultipleEndpoint.wsdl")
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/WEB-INF-client/web.xml"));
- }
- });
+
+ public static void writeToDisk(Archive archive)
+ {
+ File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName());
+ archive.as(ZipExporter.class).exportTo(file, true);
}
}
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2015-01-03 03:23:39 UTC (rev 19310)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2015-01-03 16:57:47 UTC (rev 19311)
@@ -24,11 +24,24 @@
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
import java.net.URL;
+import java.io.File;
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.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.shrinkwrap.api.spec.EnterpriseArchive;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
@@ -40,18 +53,36 @@
* @author Thomas.Diesler at jboss.com
* @since 23-Oct-2005
*/
+ at RunWith(Arquillian.class)
public class WebServiceRefClientTestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-webserviceref";
- public static Test suite()
- {
- return new JBossWSTestSetup(WebServiceRefClientTestCase.class, DeploymentArchives.getServerArchiveFilename());
+ private static String fullAppclientDepName;
+
+ @ArquillianResource
+ private URL baseURL;
+
+ @ArquillianResource
+ Deployer deployer;
+
+ @Deployment(name=DeploymentArchives.DEP_WAR, testable = false)
+ public static WebArchive createDeployment() {
+ return DeploymentArchives.getServerArchiveFilename();
}
+ @Deployment(name = DeploymentArchives.DEP_APPCLIENT_EAR, testable = false, managed = false)
+ public static EnterpriseArchive createDeployment1() {
+ JavaArchive jarArchive = DeploymentArchives.getAppclientJarArchiveFilename();
+ EnterpriseArchive earArchive = DeploymentArchives.getAppclientEarArchiveFilename();
+ fullAppclientDepName = earArchive.getName() + "#" + jarArchive.getName();
+ return earArchive;
+ }
+
+ @Test
+ @RunAsClient
public void testGeneratedService() throws Exception
{
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ URL wsdlURL = new URL(baseURL + "?wsdl");
QName serviceQName = new QName("http://org.jboss.ws/wsref", "EndpointService");
EndpointService service = new EndpointService(wsdlURL, serviceQName);
@@ -62,9 +93,11 @@
assertEquals(helloWorld, retObj);
}
+ @Test
+ @RunAsClient
public void testDynamicProxy() throws Exception
{
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ URL wsdlURL = new URL(baseURL + "?wsdl");
QName serviceQName = new QName("http://org.jboss.ws/wsref", "EndpointService");
Service service = Service.create(wsdlURL, serviceQName);
Endpoint port = service.getPort(Endpoint.class);
@@ -73,10 +106,14 @@
Object retObj = port.echo(helloWorld);
assertEquals(helloWorld, retObj);
}
-
+ /** todo:
+ * Arquillian does not have like function to deploy client app.
+ * Need to create functionality to run this test in aqruillian.
+ **/
+ @Test
+ @RunAsClient
public void testApplicationClient() throws Throwable
{
- final String fullAppclientDepName = DeploymentArchives.getAppclientEarArchiveFilename() + "#" + DeploymentArchives.getAppclientJarArchiveFilename();
try
{
final String appclientArg = "Hello World!";
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java 2015-01-03 03:23:39 UTC (rev 19310)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java 2015-01-03 16:57:47 UTC (rev 19311)
@@ -37,8 +37,6 @@
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;
@@ -62,31 +60,14 @@
@ArquillianResource
Deployer deployer;
- @Deployment(testable = false)
+ @Deployment(name=DeploymentArchives.DEP_WAR, testable = false)
public static WebArchive createDeployment() {
- WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-webserviceref.war");
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointImpl.class)
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/WEB-INF/web.xml"));
- return archive;
+ return DeploymentArchives.getServerArchiveFilename();
}
- private static final String DEPLOYMENT = "jaxws-samples-webserviceref-ejb3-client";
- @Deployment(name = DEPLOYMENT, testable = false, managed = false)
+ @Deployment(name = DeploymentArchives.DEP_EJB3_CLIENT_JAR, testable = false, managed = false)
public static JavaArchive createDeployment1(){
- JavaArchive archive = ShrinkWrap.create(JavaArchive.class, DEPLOYMENT + ".jar");
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client.class)
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Remote.class)
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.Endpoint.class)
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointService.class)
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/jboss.xml"), "jboss.xml")
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/permissions.xml"), "permissions.xml")
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl")
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl"), "wsdl/MultipleEndpoint.wsdl");
- return archive;
+ return DeploymentArchives.getEJBClientArchiveFilename();
}
@Test
@@ -106,7 +87,7 @@
public void testEJB3Client() throws Exception
{
InitialContext iniCtx = null;
- deployer.deploy(DEPLOYMENT);
+ deployer.deploy(DeploymentArchives.DEP_EJB3_CLIENT_JAR);
try
{
iniCtx = getServerInitialContext();
@@ -122,7 +103,7 @@
{
iniCtx.close();
}
- deployer.undeploy(DEPLOYMENT);
+ deployer.undeploy(DeploymentArchives.DEP_EJB3_CLIENT_JAR);
}
}
}
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2015-01-03 03:23:39 UTC (rev 19310)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2015-01-03 16:57:47 UTC (rev 19311)
@@ -36,8 +36,6 @@
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;
@@ -54,39 +52,20 @@
@RunWith(Arquillian.class)
public class WebServiceRefServletTestCase extends JBossWSTest
{
- @ArquillianResource
- private URL baseURL;
+ @ArquillianResource
+ private URL baseURL;
@ArquillianResource
Deployer deployer;
- @Deployment(testable = false)
+ @Deployment(name=DeploymentArchives.DEP_WAR, testable = false)
public static WebArchive createDeployment() {
- WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-webserviceref.war");
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointImpl.class)
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/WEB-INF/web.xml"));
- return archive;
+ return DeploymentArchives.getServerArchiveFilename();
}
- private static final String DEPLOYMENT = "jaxws-samples-webserviceref-servlet-client";
-
- @Deployment(name = DEPLOYMENT, testable = false, managed = false)
+ @Deployment(name = DeploymentArchives.DEP_SERVLET_CLIENT_WAR, testable = false, managed = false)
public static WebArchive createDeployment1() {
-
- WebArchive archive = ShrinkWrap.create(WebArchive.class, DEPLOYMENT + ".war");
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.Endpoint.class)
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointService.class)
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.MultipleEndpointService.class)
- .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient.class)
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml"), "jboss-web.xml")
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl")
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl"), "wsdl/MultipleEndpoint.wsdl")
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/WEB-INF-client/web.xml"));
- return archive;
+ return DeploymentArchives.getServletClientArchiveFilename();
}
@Test
@@ -107,7 +86,7 @@
@RunAsClient
public void testServletClient() throws Exception
{
- deployer.deploy(DEPLOYMENT);
+ deployer.deploy(DeploymentArchives.DEP_SERVLET_CLIENT_WAR);
try
{
String text = baseURL.toString().substring(0, baseURL.toString().length()-1);
@@ -116,7 +95,7 @@
}
finally
{
- deployer.undeploy(DEPLOYMENT);
+ deployer.undeploy(DeploymentArchives.DEP_SERVLET_CLIENT_WAR);
}
}
}
More information about the jbossws-commits
mailing list