Author: rsearls
Date: 2014-12-30 20:54:54 -0500 (Tue, 30 Dec 2014)
New Revision: 19302
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140TestCase.java
Log:
arquillian migration jbws3140 test
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140TestCase.java
===================================================================
---
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140TestCase.java 2014-12-31
01:33:14 UTC (rev 19301)
+++
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140TestCase.java 2014-12-31
01:54:54 UTC (rev 19302)
@@ -34,13 +34,28 @@
import org.jboss.wsf.test.JBossWSTestHelper.WarDeployment;
import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment;
+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.arquillian.container.test.api.Deployer;
+
+(a)RunWith(Arquillian.class)
public class JBWS3140TestCase extends JBossWSTest
{
- public final String servletClientURL = "http://" + getServerHost() +
":8080/jbws3140-client/ServletTest";
+ @ArquillianResource
+ Deployer deployer;
- public static BaseDeployment<?>[] createDeployments() {
- List<BaseDeployment<?>> list = new
LinkedList<BaseDeployment<?>>();
- list.add(new WarDeployment("jbws3140-server.war") { {
+ @Deployment(name="jbws3140-server", testable = false, managed=false)
+ public static WebArchive createDeployment1() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class,
"jbws3140-server.war");
archive
.addManifest()
.addClass(org.jboss.test.ws.jaxws.jbws3140.ClientHandler.class)
@@ -56,31 +71,37 @@
.addAsWebInfResource(new File(getTestResourcesDir() +
"/jaxws/jbws3140/WEB-INF-Server/web.xml"), "web.xml")
.addAsWebInfResource(new File(getTestResourcesDir() +
"/jaxws/jbws3140/WEB-INF-Server/webservices.xml"), "webservices.xml")
.setWebXML(new File(getTestResourcesDir() +
"/jaxws/jbws3140/WEB-INF-Server/web.xml"));
- }
- });
- list.add(new WarDeployment("jbws3140-responses-server.war") { {
+ return archive;
+ }
+
+ @Deployment(name = "jbws3140-responses-server", testable = false,
managed=false)
+ public static WebArchive createDeployment2() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class,
"jbws3140-responses-server.war");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.jbws3140.ClientHandler.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws3140.DataType.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws3140.EndpointService.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws3140.MTOMTest.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws3140.MTOMTestImpl.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws3140.ObjectFactory.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws3140.ResponseType.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws3140.ServerHandler.class)
+
.addAsResource("org/jboss/test/ws/jaxws/jbws3140/client-handlers.xml")
+
.addAsResource("org/jboss/test/ws/jaxws/jbws3140/server-handlers.xml")
+ .addAsWebInfResource(new File(getTestResourcesDir() +
"/jaxws/jbws3140/wsdl/TestEndpoint.wsdl"), "wsdl/TestEndpoint.wsdl")
+ .addAsWebInfResource(new File(getTestResourcesDir() +
"/jaxws/jbws3140/WEB-INF-Responses-Server/jboss-web.xml"),
"jboss-web.xml")
+ .addAsWebInfResource(new File(getTestResourcesDir() +
"/jaxws/jbws3140/WEB-INF-Responses-Server/web.xml"), "web.xml")
+ .addAsWebInfResource(new File(getTestResourcesDir() +
"/jaxws/jbws3140/WEB-INF-Responses-Server/webservices.xml"),
"webservices.xml")
+ .setWebXML(new File(getTestResourcesDir() +
"/jaxws/jbws3140/WEB-INF-Server/web.xml"));
+ return archive;
+ }
+
+ @Deployment(name = "jbws3140-client", testable = false, managed=false)
+ public static WebArchive createDeployment3() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class,
"jbws3140-client.war");
archive
.addManifest()
- .addClass(org.jboss.test.ws.jaxws.jbws3140.ClientHandler.class)
- .addClass(org.jboss.test.ws.jaxws.jbws3140.DataType.class)
- .addClass(org.jboss.test.ws.jaxws.jbws3140.EndpointService.class)
- .addClass(org.jboss.test.ws.jaxws.jbws3140.MTOMTest.class)
- .addClass(org.jboss.test.ws.jaxws.jbws3140.MTOMTestImpl.class)
- .addClass(org.jboss.test.ws.jaxws.jbws3140.ObjectFactory.class)
- .addClass(org.jboss.test.ws.jaxws.jbws3140.ResponseType.class)
- .addClass(org.jboss.test.ws.jaxws.jbws3140.ServerHandler.class)
-
.addAsResource("org/jboss/test/ws/jaxws/jbws3140/client-handlers.xml")
-
.addAsResource("org/jboss/test/ws/jaxws/jbws3140/server-handlers.xml")
- .addAsWebInfResource(new File(getTestResourcesDir() +
"/jaxws/jbws3140/wsdl/TestEndpoint.wsdl"), "wsdl/TestEndpoint.wsdl")
- .addAsWebInfResource(new File(getTestResourcesDir() +
"/jaxws/jbws3140/WEB-INF-Responses-Server/jboss-web.xml"),
"jboss-web.xml")
- .addAsWebInfResource(new File(getTestResourcesDir() +
"/jaxws/jbws3140/WEB-INF-Responses-Server/web.xml"), "web.xml")
- .addAsWebInfResource(new File(getTestResourcesDir() +
"/jaxws/jbws3140/WEB-INF-Responses-Server/webservices.xml"),
"webservices.xml")
- .setWebXML(new File(getTestResourcesDir() +
"/jaxws/jbws3140/WEB-INF-Server/web.xml"));
- }
- });
- list.add(new WarDeployment("jbws3140-client.war") { {
- archive
- .addManifest()
.addAsResource(new File(getTestResourcesDir() +
"/jaxws/jbws3140/large.jpg"))
.addAsResource(new File(getTestResourcesDir() +
"/jaxws/jbws3140/small.jpg"))
.addClass(org.jboss.test.ws.jaxws.jbws3140.ClientHandler.class)
@@ -97,41 +118,39 @@
.addAsWebInfResource(new File(getTestResourcesDir() +
"/jaxws/jbws3140/wsdl/TestEndpoint.wsdl"), "wsdl/TestEndpoint.wsdl")
.addAsWebInfResource(new File(getTestResourcesDir() +
"/jaxws/jbws3140/WEB-INF-Client/jboss-web.xml"), "jboss-web.xml")
.setWebXML(new File(getTestResourcesDir() +
"/jaxws/jbws3140/WEB-INF-Client/web.xml"));
- }
- });
- return list.toArray(new BaseDeployment<?>[list.size()]);
+ return archive;
}
-
- static {
- JBossWSTestHelper.writeToFile(createDeployments());
- }
+ @Test
+ @RunAsClient
public void testWsaResponses() throws Exception
{
try {
- JBossWSTestHelper.deploy("jbws3140-responses-server.war");
- JBossWSTestHelper.deploy("jbws3140-client.war");
- String result = IOUtils.readAndCloseStream(new URL(servletClientURL +
"?mtom=small").openStream());
+ deployer.deploy("jbws3140-responses-server");
+ deployer.deploy("jbws3140-client");
+ String result = IOUtils.readAndCloseStream(new URL("http://" +
getServerHost() + ":8080/jbws3140-client/ServletTest" +
"?mtom=small").openStream());
assertTrue("SOAPFaultException is expected but received: " + result,
result.indexOf("SOAPFaultException") > -1);
String expectedDetail = "A header representing a Message Addressing
Property is not valid";
assertTrue("Expected message wasn't found in response: " + result,
result.indexOf(expectedDetail) > -1);
} finally {
- JBossWSTestHelper.undeploy("jbws3140-responses-server.war");
- JBossWSTestHelper.undeploy("jbws3140-client.war");
+ deployer.undeploy("jbws3140-responses-server");
+ deployer.undeploy("jbws3140-client");
}
}
+ @Test
+ @RunAsClient
public void testMtomSmall() throws Exception
{
try {
- JBossWSTestHelper.deploy("jbws3140-server.war");
- JBossWSTestHelper.deploy("jbws3140-client.war");
- String result = IOUtils.readAndCloseStream(new URL(servletClientURL +
"?mtom=small").openStream());
+ deployer.deploy("jbws3140-server");
+ deployer.deploy("jbws3140-client");
+ String result = IOUtils.readAndCloseStream(new URL("http://" +
getServerHost() + ":8080/jbws3140-client/ServletTest" +
"?mtom=small").openStream());
String expected
="--ClientMTOMEnabled--ServerMTOMEnabled--ServerAddressingEnabled--ClientAddressingEnabled";
assertTrue("Expected string wasn't found in response: " + result,
result.indexOf(expected) > -1);
} finally {
- JBossWSTestHelper.undeploy("jbws3140-server.war");
- JBossWSTestHelper.undeploy("jbws3140-client.war");
+ deployer.undeploy("jbws3140-server");
+ deployer.undeploy("jbws3140-client");
}
}
}
Show replies by thread