[jbossws-commits] JBossWS SVN: r19300 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Dec 30 18:56:07 EST 2014
Author: rsearls
Date: 2014-12-30 18:56:07 -0500 (Tue, 30 Dec 2014)
New Revision: 19300
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java
Log:
arquillian migration webservice test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java 2014-12-30 16:26:29 UTC (rev 19299)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java 2014-12-30 23:56:07 UTC (rev 19300)
@@ -22,12 +22,29 @@
package org.jboss.test.ws.jaxws.samples.webservice;
import java.io.File;
+import java.net.URL;
-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.wsf.test.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestSetup;
+//----------------
+import java.net.MalformedURLException;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
/**
* Test the JSR-181 annotation: javax.jws.WebService
*
@@ -35,75 +52,92 @@
* @author <a href="jason.greene at jboss.com">Jason T. Greene</a>
* @since 29-Apr-2005
*/
+ at RunWith(Arquillian.class)
public class WebServiceEJB3TestCase extends WebServiceBase
{
- static {
- JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-webservice02-ejb3.jar") { {
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.samples.webservice.EJB3Bean02.class)
- .addClass(org.jboss.test.ws.jaxws.samples.webservice.EJB3RemoteInterface.class)
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webservice/META-INF02/wsdl/TestService.wsdl"), "wsdl/TestService.wsdl");
- }
- });
- JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-webservice01-ejb3.jar") { {
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.samples.webservice.EJB3Bean01.class)
- .addClass(org.jboss.test.ws.jaxws.samples.webservice.EJB3RemoteInterface.class);
- }
- });
- JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-webservice03-ejb3.jar") { {
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.samples.webservice.EJB3Bean03.class)
- .addClass(org.jboss.test.ws.jaxws.samples.webservice.EJB3RemoteInterface.class)
- .addClass(org.jboss.test.ws.jaxws.samples.webservice.EndpointInterface03.class);
- }
- });
+ @ArquillianResource
+ Deployer deployer;
+
+ private static final String WEBSERVICE_02 = "jaxws-samples-webservice02-ejb3";
+
+ @Deployment(name = WEBSERVICE_02, testable = false, managed = false)
+ public static JavaArchive createDeployment2() {
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, WEBSERVICE_02 + ".jar");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.samples.webservice.EJB3Bean02.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.webservice.EJB3RemoteInterface.class)
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webservice/META-INF02/wsdl/TestService.wsdl"), "wsdl/TestService.wsdl");
+ return archive;
}
- public static Test suite()
- {
- return new JBossWSTestSetup(WebServiceEJB3TestCase.class, "");
+ private static final String WEBSERVICE_01 = "jaxws-samples-webservice01-ejb3";
+
+ @Deployment(name = WEBSERVICE_01, testable = false, managed = false)
+ public static JavaArchive createDeployment1() {
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, WEBSERVICE_01 + ".jar");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.samples.webservice.EJB3Bean01.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.webservice.EJB3RemoteInterface.class);
+ return archive;
}
+ private static final String WEBSERVICE_03 = "jaxws-samples-webservice03-ejb3";
+
+ @Deployment(name = WEBSERVICE_03, testable = false, managed = false)
+ public static JavaArchive createDeployment3() {
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, WEBSERVICE_03 + ".jar");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.samples.webservice.EJB3Bean03.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.webservice.EJB3RemoteInterface.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.webservice.EndpointInterface03.class);
+ return archive;
+ }
+
+ @Test
+ @RunAsClient
public void testWebServiceTest() throws Exception
{
- deploy("jaxws-samples-webservice01-ejb3.jar");
+ deployer.deploy(WEBSERVICE_01);
try
{
webServiceTest("jaxws-samples-webservice01-ejb3");
}
finally
{
- undeploy("jaxws-samples-webservice01-ejb3.jar");
+ deployer.undeploy(WEBSERVICE_01);
}
}
+ @Test
+ @RunAsClient
public void testWebServiceWsdlLocationTest() throws Exception
{
- deploy("jaxws-samples-webservice02-ejb3.jar");
+ deployer.deploy(WEBSERVICE_02);
try
{
webServiceWsdlLocationTest("jaxws-samples-webservice02-ejb3");
}
finally
{
- undeploy("jaxws-samples-webservice02-ejb3.jar");
+ deployer.undeploy(WEBSERVICE_02);
}
}
+ @Test
+ @RunAsClient
public void testWebServiceEndpointInterfaceTest() throws Exception
{
- deploy("jaxws-samples-webservice03-ejb3.jar");
+ deployer.deploy(WEBSERVICE_03);
try
{
webServiceEndpointInterfaceTest("jaxws-samples-webservice03-ejb3");
}
finally
{
- undeploy("jaxws-samples-webservice03-ejb3.jar");
+ deployer.undeploy(WEBSERVICE_03);
}
}
-}
+ }
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java 2014-12-30 16:26:29 UTC (rev 19299)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java 2014-12-30 23:56:07 UTC (rev 19300)
@@ -22,8 +22,18 @@
package org.jboss.test.ws.jaxws.samples.webservice;
import java.io.File;
+import java.net.URL;
-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.wsf.test.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -35,75 +45,93 @@
* @author <a href="jason.greene at jboss.com">Jason T. Greene</a>
* @since 29-Apr-2005
*/
+ at RunWith(Arquillian.class)
public class WebServiceJSETestCase extends WebServiceBase
{
- static {
- JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-webservice03-jse.war") { {
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.samples.webservice.EndpointInterface03.class)
- .addClass(org.jboss.test.ws.jaxws.samples.webservice.JSEBean03.class)
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webservice/WEB-INF03/web.xml"));
- }
- });
- JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-webservice02-jse.war") { {
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.samples.webservice.JSEBean02.class)
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webservice/WEB-INF02/wsdl/TestService.wsdl"), "wsdl/TestService.wsdl")
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webservice/WEB-INF02/web.xml"));
- }
- });
- JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-webservice01-jse.war") { {
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.samples.webservice.JSEBean01.class)
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webservice/WEB-INF01/web.xml"));
- }
- });
+ @ArquillianResource
+ Deployer deployer;
+
+ private static final String WEBSERVICE_03 = "jaxws-samples-webservice03-jse";
+
+ @Deployment(name = WEBSERVICE_03, testable = false, managed = false)
+ public static WebArchive createClientDeployment3() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-webservice03-jse.war");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.samples.webservice.EndpointInterface03.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.webservice.JSEBean03.class)
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webservice/WEB-INF03/web.xml"));
+ return archive;
}
- public static Test suite()
- {
- return new JBossWSTestSetup(WebServiceJSETestCase.class, "");
+ private static final String WEBSERVICE_02 = "jaxws-samples-webservice02-jse";
+
+ @Deployment(name = WEBSERVICE_02, testable = false, managed = false)
+ public static WebArchive createClientDeployment2() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-webservice02-jse.war");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.samples.webservice.JSEBean02.class)
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webservice/WEB-INF02/wsdl/TestService.wsdl"), "wsdl/TestService.wsdl")
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webservice/WEB-INF02/web.xml"));
+ return archive;
}
+ private static final String WEBSERVICE_01 = "jaxws-samples-webservice01-jse";
+
+ @Deployment(name = WEBSERVICE_01, testable = false, managed = false)
+ public static WebArchive createClientDeployment1() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-webservice01-jse.war");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.samples.webservice.JSEBean01.class)
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webservice/WEB-INF01/web.xml"));
+ return archive;
+ }
+
+ @Test
+ @RunAsClient
public void testWebServiceTest() throws Exception
{
- deploy("jaxws-samples-webservice01-jse.war");
+ deployer.deploy(WEBSERVICE_01);
try
{
webServiceTest("jaxws-samples-webservice01-jse");
}
finally
{
- undeploy("jaxws-samples-webservice01-jse.war");
+ deployer.undeploy(WEBSERVICE_01);
}
}
+ @Test
+ @RunAsClient
public void testWebServiceWsdlLocation() throws Exception
{
- deploy("jaxws-samples-webservice02-jse.war");
+ deployer.deploy(WEBSERVICE_02);
try
{
webServiceWsdlLocationTest("jaxws-samples-webservice02-jse");
}
finally
{
- undeploy("jaxws-samples-webservice02-jse.war");
+ deployer.undeploy(WEBSERVICE_02);
}
}
+ @Test
+ @RunAsClient
public void testWebServiceEndpointInterface() throws Exception
{
- deploy("jaxws-samples-webservice03-jse.war");
+ deployer.deploy(WEBSERVICE_03);
try
{
webServiceEndpointInterfaceTest("jaxws-samples-webservice03-jse");
}
finally
{
- undeploy("jaxws-samples-webservice03-jse.war");
+ deployer.undeploy(WEBSERVICE_03);
}
}
+
}
More information about the jbossws-commits
mailing list