JBossWS SVN: r19223 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3401.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-23 09:32:09 -0500 (Tue, 23 Dec 2014)
New Revision: 19223
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3401/JBWS3401TestCase.java
Log:
arquillian migration jbws3401 test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3401/JBWS3401TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3401/JBWS3401TestCase.java 2014-12-23 14:23:23 UTC (rev 19222)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3401/JBWS3401TestCase.java 2014-12-23 14:32:09 UTC (rev 19223)
@@ -29,7 +29,15 @@
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.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.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
@@ -41,11 +49,15 @@
*
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
+(a)RunWith(Arquillian.class)
public class JBWS3401TestCase extends JBossWSTest
{
- public static BaseDeployment<?>[] createDeployments() {
- List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
- list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3401.war") { {
+ @ArquillianResource
+ private URL baseURL;
+
+ @Deployment(testable = false)
+ public static WebArchive createDeployments() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws3401.war");
archive
.addManifest()
.addClass(org.jboss.test.ws.jaxws.jbws3401.TestEndpoint.class)
@@ -56,20 +68,13 @@
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3401/WEB-INF/wsdl/schema3.xsd"), "wsdl/schema3.xsd")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3401/WEB-INF/wsdl/schema4.xsd"), "wsdl/schema4.xsd")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3401/WEB-INF/wsdl/schema5.xsd"), "wsdl/schema5.xsd");
- }
- });
- return list.toArray(new BaseDeployment<?>[list.size()]);
+ return archive;
}
- public static Test suite() throws Exception
- {
- return new JBossWSTestSetup(JBWS3401TestCase.class, JBossWSTestHelper.writeToFile(createDeployments()));
- }
-
private TestEndpoint getPort() throws Exception
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3401/TestEndpointService/TestEndpoint?wsdl");
+ URL wsdlURL = new URL(baseURL + "/TestEndpointService/TestEndpoint?wsdl");
QName serviceName = new QName("http://org.jboss.test.ws/jbws3401", "TestEndpointService");
Service service = Service.create(wsdlURL, serviceName);
@@ -77,6 +82,8 @@
return service.getPort(TestEndpoint.class);
}
+ @Test
+ @RunAsClient
public void testCall() throws Exception
{
String message = "Hi";
9 years, 4 months
JBossWS SVN: r19222 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1665.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-23 09:23:23 -0500 (Tue, 23 Dec 2014)
New Revision: 19222
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java
Log:
arquillian migration jbws1665 test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2014-12-23 11:24:45 UTC (rev 19221)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2014-12-23 14:23:23 UTC (rev 19222)
@@ -29,7 +29,15 @@
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
-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.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
@@ -41,13 +49,15 @@
*
* http://jira.jboss.org/jira/browse/JBWS-1665
*/
+(a)RunWith(Arquillian.class)
public class JBWS1665TestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1665/TrackingService";
+ @ArquillianResource
+ private URL baseURL;
- public static BaseDeployment<?>[] createDeployments() {
- List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
- list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1665.jar") { {
+ @Deployment(testable = false)
+ public static JavaArchive createDeployments() {
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws1665.jar");
archive
.addManifest()
.addClass(org.jboss.test.ws.jaxws.jbws1665.CoordinateData.class)
@@ -57,19 +67,14 @@
.addClass(org.jboss.test.ws.jaxws.jbws1665.TracePollData.class)
.addClass(org.jboss.test.ws.jaxws.jbws1665.TrackingServiceBean.class)
.addClass(org.jboss.test.ws.jaxws.jbws1665.TrackingServiceInterface.class);
- }
- });
- return list.toArray(new BaseDeployment<?>[list.size()]);
+ return archive;
}
- public static Test suite()
- {
- return new JBossWSTestSetup(JBWS1665TestCase.class, JBossWSTestHelper.writeToFile(createDeployments()));
- }
-
+ @Test
+ @RunAsClient
public void testWebService() throws Exception
{
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ URL wsdlURL = new URL(baseURL + "/jaxws-jbws1665/TrackingService?wsdl");
WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
Definition wsdlDefinition = wsdlReader.readWSDL(wsdlURL.toString());
assertNotNull(wsdlDefinition);
9 years, 4 months
JBossWS SVN: r19221 - in stack/cxf/trunk/modules/testsuite/cxf-tests/src/test: resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-12-23 06:24:45 -0500 (Tue, 23 Dec 2014)
New Revision: 19221
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WSImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase.java
Log:
[JBWS-3861] Revisiting JBWS-3792 testcase and externalizing the wsdlLocation setup to a webservices.xml descriptor, which allows build-time expansion of jboss.bind.address property
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WSImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WSImpl.java 2014-12-23 11:12:16 UTC (rev 19220)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WSImpl.java 2014-12-23 11:24:45 UTC (rev 19221)
@@ -27,7 +27,7 @@
serviceName = "JBWS3792WSService",
portName = "JBWS3792WSPort",
targetNamespace = "http://test.jbws3792/",
- wsdlLocation = "http://localhost:8080/jbws3792-external-wsdl/jbws3792.wsdl",
+ wsdlLocation = "http://bar:8080/jbws3792-external-wsdl/jbws3792.wsdl", //this is overridden in webservices.xml, to allow using a property that's resolved at build time
endpointInterface = "org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WS")
public class JBWS3792WSImpl implements JBWS3792WS {
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase.java 2014-12-23 11:12:16 UTC (rev 19220)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase.java 2014-12-23 11:24:45 UTC (rev 19221)
@@ -70,6 +70,7 @@
.addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WS.class)
.addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WSImpl.class)
.addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WSService.class)
+ .addAsWebInfResource(new FileAsset(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml")), "webservices.xml")
.setWebXML(new File(JBossWSTestHelper.getTestResourcesDir()
+ "/jaxws/cxf/jbws3792/wsImpl/WEB-INF/web.xml"))
;
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml 2014-12-23 11:24:45 UTC (rev 19221)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<webservices xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsdl="http://Hello.org" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd" version="1.2">
+ <webservice-description>
+ <webservice-description-name>JBWS3792WSService</webservice-description-name>
+ <wsdl-file>http://@jboss.bind.address@:8080/jbws3792-external-wsdl/jbws3792.wsdl</wsdl-file>
+ <port-component>
+ <service-impl-bean>
+ <servlet-link>org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WSImpl</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
9 years, 4 months
JBossWS SVN: r19220 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-12-23 06:12:16 -0500 (Tue, 23 Dec 2014)
New Revision: 19220
Modified:
stack/cxf/trunk/pom.xml
Log:
Use latest jbossws-spi snapshot
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2014-12-23 11:11:07 UTC (rev 19219)
+++ stack/cxf/trunk/pom.xml 2014-12-23 11:12:16 UTC (rev 19220)
@@ -62,7 +62,7 @@
<!-- Properties -->
<properties>
<jbossws.api.version>1.0.3.CR2</jbossws.api.version>
- <jbossws.spi.version>3.0.0.Beta3</jbossws.spi.version>
+ <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version>
<jbossws.common.version>3.0.0.Beta2</jbossws.common.version>
<jbossws.common.tools.version>1.2.1.CR1</jbossws.common.tools.version>
<jbossws.wildfly800.version>5.0.0-SNAPSHOT</jbossws.wildfly800.version>
9 years, 4 months
JBossWS SVN: r19219 - spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-12-23 06:11:07 -0500 (Tue, 23 Dec 2014)
New Revision: 19219
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java
Log:
[JBWS-3862] Prevent NPE
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java 2014-12-23 09:15:56 UTC (rev 19218)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java 2014-12-23 11:11:07 UTC (rev 19219)
@@ -100,9 +100,11 @@
UnifiedHandlerChainsMetaData handlerChains)
{
this.portComponentName = portComponentName;
- if (wsdlPort.getNamespaceURI().length() == 0)
- Loggers.METADATA_LOGGER.webservicesXmlElementNotNamespaceQualified(wsdlPort);
- this.wsdlPort = wsdlPort;
+ if (wsdlPort != null) {
+ if (wsdlPort.getNamespaceURI().length() == 0)
+ Loggers.METADATA_LOGGER.webservicesXmlElementNotNamespaceQualified(wsdlPort);
+ this.wsdlPort = wsdlPort;
+ }
this.serviceEndpointInterface = serviceEndpointInterface;
this.ejbLink = ejbLink;
this.servletLink = servletLink;
@@ -241,8 +243,10 @@
final QName wsdlPort = getWsdlPort();
StringBuilder builder = new StringBuilder("<port-component>");
builder.append("<port-component-name>").append(portComponentName).append("</port-component-name>");
- builder.append("<wsdl-port xmlns:").append(wsdlPort.getPrefix()).append("='").append(wsdlPort.getNamespaceURI()).append("'>");
- builder.append(wsdlPort.getPrefix()).append(':').append(wsdlPort.getLocalPart()).append("</wsdl-port>");
+ if (wsdlPort != null) {
+ builder.append("<wsdl-port xmlns:").append(wsdlPort.getPrefix()).append("='").append(wsdlPort.getNamespaceURI()).append("'>");
+ builder.append(wsdlPort.getPrefix()).append(':').append(wsdlPort.getLocalPart()).append("</wsdl-port>");
+ }
builder.append("<service-endpoint-interface>").append(serviceEndpointInterface).append("</service-endpoint-interface>");
builder.append("<service-impl-bean>");
if (ejbLink != null)
9 years, 4 months
JBossWS SVN: r19218 - stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-12-23 04:15:56 -0500 (Tue, 23 Dec 2014)
New Revision: 19218
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java
Log:
[JBWS-3861] Additional test fix
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java 2014-12-23 08:57:53 UTC (rev 19217)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java 2014-12-23 09:15:56 UTC (rev 19218)
@@ -69,7 +69,9 @@
assertEquals(500, c.getResponseCode());
String error = IOUtils.readAndCloseStream(c.getErrorStream());
c.disconnect();
- assertTrue(error.contains("Could not instantiate ClientServlet2"));
+ if (error.contains("error-text-div")) { //the actual error exception does not seem to be always returned by web layer
+ assertTrue(error.contains("Could not instantiate ClientServlet2"));
+ }
} finally {
JBossWSTestHelper.undeploy(DeploymentArchives.CLIENT_2);
}
9 years, 4 months
JBossWS SVN: r19217 - in stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws: samples/soapbinding and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-12-23 03:57:53 -0500 (Tue, 23 Dec 2014)
New Revision: 19217
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java
Log:
Convert tests to run with Arquillian
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2014-12-23 02:24:26 UTC (rev 19216)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2014-12-23 08:57:53 UTC (rev 19217)
@@ -24,7 +24,6 @@
import java.io.File;
import java.net.URL;
import java.util.ArrayList;
-import java.util.LinkedList;
import java.util.List;
import javax.wsdl.Binding;
@@ -40,12 +39,16 @@
import javax.xml.ws.Service;
import javax.xml.ws.handler.Handler;
-import junit.framework.Test;
-
+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.spec.WebArchive;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
-import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment;
-import org.jboss.wsf.test.JBossWSTestSetup;
+import org.junit.Test;
+import org.junit.runner.RunWith;
/**
* Test SOAP12 binding type
@@ -53,34 +56,29 @@
* @author Thomas.Diesler(a)jboss.org
* @since 12-Aug-2006
*/
+(a)RunWith(Arquillian.class)
public class SOAPBindingTestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-binding";
-
- public static BaseDeployment<?>[] createDeployments() {
- List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
- list.add(new JBossWSTestHelper.WarDeployment("jaxws-binding.war") { {
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.binding.SOAPEndpoint.class)
- .addClass(org.jboss.test.ws.jaxws.binding.SOAPEndpointBean.class)
- .addClass(org.jboss.test.ws.jaxws.binding.ServerHandler.class)
- .addAsResource("org/jboss/test/ws/jaxws/binding/jaxws-server-handlers.xml")
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/binding/WEB-INF/web.xml"));
- }
- });
- return list.toArray(new BaseDeployment<?>[list.size()]);
- }
-
- public static Test suite()
- {
- return new JBossWSTestSetup(SOAPBindingTestCase.class, JBossWSTestHelper.writeToFile(createDeployments()));
- }
-
+ @ArquillianResource
+ private URL baseURL;
+ @Deployment(testable = false)
+ public static WebArchive createDeployment() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-binding.war");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.binding.SOAPEndpoint.class)
+ .addClass(org.jboss.test.ws.jaxws.binding.SOAPEndpointBean.class)
+ .addClass(org.jboss.test.ws.jaxws.binding.ServerHandler.class)
+ .addAsResource("org/jboss/test/ws/jaxws/binding/jaxws-server-handlers.xml")
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/binding/WEB-INF/web.xml"));
+ return archive;
+ }
// [JBWS-1761] - WSProvide ignores SOAPBinding declaration
+ @Test
+ @RunAsClient
public void testWSDLAccess() throws Exception
{
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ URL wsdlURL = new URL(baseURL + "?wsdl");
WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
Definition wsdl = wsdlReader.readWSDL(wsdlURL.toString());
@@ -114,10 +112,11 @@
assertEquals("Invalid transport uri", "http://schemas.xmlsoap.org/soap/http", transport);
}
}
-
+ @Test
+ @RunAsClient
public void testClientAccess() throws Exception
{
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ URL wsdlURL = new URL(baseURL + "?wsdl");
QName qname = new QName("http://org.jboss.ws/jaxws/binding", "SOAPEndpointService");
Service service = Service.create(wsdlURL, qname);
SOAPEndpoint port = service.getPort(SOAPEndpoint.class);
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java 2014-12-23 02:24:26 UTC (rev 19216)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java 2014-12-23 08:57:53 UTC (rev 19217)
@@ -24,8 +24,6 @@
import java.io.ByteArrayInputStream;
import java.io.File;
import java.net.URL;
-import java.util.LinkedList;
-import java.util.List;
import javax.xml.bind.JAXBContext;
import javax.xml.namespace.QName;
@@ -38,12 +36,16 @@
import javax.xml.ws.Service;
import javax.xml.ws.Service.Mode;
-import junit.framework.Test;
-
+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.spec.WebArchive;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
-import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment;
-import org.jboss.wsf.test.JBossWSTestSetup;
+import org.junit.Test;
+import org.junit.runner.RunWith;
/**
* Test the JSR-181 annotation: javax.jws.SOAPBinding
@@ -52,42 +54,42 @@
* @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
* @since 17-Oct-2005
*/
+(a)RunWith(Arquillian.class)
public class SOAPBindingTestCase extends JBossWSTest
{
+ @ArquillianResource
+ private URL baseURL;
private final String targetNS = "http://soapbinding.samples.jaxws.ws.test.jboss.org/";
- public static BaseDeployment<?>[] createDeployments() {
- List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
- list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-soapbinding.war") { {
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.DocBare.class)
- .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.DocBareServiceImpl.class)
- .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.DocWrapped.class)
- .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.DocWrappedServiceImpl.class)
- .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.ExampleSEI.class)
- .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.ExampleServiceImpl.class)
- .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.SubmitBareRequest.class)
- .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.SubmitBareResponse.class)
- .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.jaxws.SubmitNamespacedPO.class)
- .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.jaxws.SubmitNamespacedPOResponse.class)
- .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.jaxws.SubmitPO.class)
- .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.jaxws.SubmitPOResponse.class)
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/soapbinding/WEB-INF/web.xml"));
- }
- });
- return list.toArray(new BaseDeployment<?>[list.size()]);
- }
- public static Test suite()
- {
- return new JBossWSTestSetup(SOAPBindingTestCase.class, JBossWSTestHelper.writeToFile(createDeployments()));
- }
+ @Deployment(testable = false)
+ public static WebArchive createDeployment() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-soapbinding.war");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.DocBare.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.DocBareServiceImpl.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.DocWrapped.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.DocWrappedServiceImpl.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.ExampleSEI.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.ExampleServiceImpl.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.SubmitBareRequest.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.SubmitBareResponse.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.jaxws.SubmitNamespacedPO.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.jaxws.SubmitNamespacedPOResponse.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.jaxws.SubmitPO.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.jaxws.SubmitPOResponse.class)
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/soapbinding/WEB-INF/web.xml"));
+ return archive;
+ }
+
+ @Test
+ @RunAsClient
public void testExampleService() throws Exception
{
QName serviceName = new QName(targetNS, "ExampleService");
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-soapbinding/ExampleService?wsdl");
+ URL wsdlURL = new URL(baseURL + "/ExampleService?wsdl");
Service service = Service.create(wsdlURL, serviceName);
ExampleSEI port = service.getPort(ExampleSEI.class);
@@ -95,11 +97,12 @@
Object retObj = port.concat("first", "second", "third");
assertEquals("first|second|third", retObj);
}
-
+ @Test
+ @RunAsClient
public void testDocBareService() throws Exception
{
QName serviceName = new QName(targetNS, "DocBareService");
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-soapbinding/DocBareService?wsdl");
+ URL wsdlURL = new URL(baseURL + "/DocBareService?wsdl");
Service service = Service.create(wsdlURL, serviceName);
DocBare port = service.getPort(DocBare.class);
@@ -108,12 +111,13 @@
SubmitBareResponse poRes = port.submitPO(poReq);
assertEquals("Ferrari", poRes.getProduct());
}
-
+ @Test
+ @RunAsClient
public void testDocBareDispatchService() throws Exception
{
QName serviceName = new QName(targetNS, "DocBareService");
QName portName = new QName(targetNS, "DocBarePort");
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-soapbinding/DocBareService?wsdl");
+ URL wsdlURL = new URL(baseURL + "/DocBareService?wsdl");
Service service = Service.create(wsdlURL, serviceName);
JAXBContext jbc = JAXBContext.newInstance(new Class[] { SubmitBareRequest.class, SubmitBareResponse.class });
@@ -125,12 +129,13 @@
SubmitBareResponse poRes = (SubmitBareResponse)dispatch.invoke(poReq);
assertEquals("Ferrari", poRes.getProduct());
}
-
+ @Test
+ @RunAsClient
public void testDocBareServiceMessageAccess() throws Exception
{
QName serviceName = new QName(targetNS, "DocBareService");
QName portName = new QName(targetNS, "DocBarePort");
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-soapbinding/DocBareService?wsdl");
+ URL wsdlURL = new URL(baseURL + "/DocBareService?wsdl");
Service service = Service.create(wsdlURL, serviceName);
Dispatch<SOAPMessage> dispatch = service.createDispatch(portName, SOAPMessage.class, Mode.MESSAGE);
@@ -153,12 +158,13 @@
soapElement = (SOAPElement)soapElement.getChildElements(new QName(targetNS, "product")).next();
assertEquals("Ferrari", soapElement.getValue());
}
-
+ @Test
+ @RunAsClient
public void testNamespacedDocBareServiceMessageAccess() throws Exception
{
QName serviceName = new QName(targetNS, "DocBareService");
QName portName = new QName(targetNS, "DocBarePort");
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-soapbinding/DocBareService?wsdl");
+ URL wsdlURL = new URL(baseURL + "/DocBareService?wsdl");
Service service = Service.create(wsdlURL, serviceName);
Dispatch<SOAPMessage> dispatch = service.createDispatch(portName, SOAPMessage.class, Mode.MESSAGE);
@@ -184,11 +190,12 @@
soapElement = (SOAPElement)soapElement.getChildElements(new QName(targetNS, "product")).next();
assertEquals("Ferrari", soapElement.getValue());
}
-
+ @Test
+ @RunAsClient
public void testDocWrappedService() throws Exception
{
QName serviceName = new QName(targetNS, "DocWrappedService");
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-soapbinding/DocWrappedService?wsdl");
+ URL wsdlURL = new URL(baseURL + "/DocWrappedService?wsdl");
Service service = Service.create(wsdlURL, serviceName);
DocWrapped port = service.getPort(DocWrapped.class);
@@ -199,7 +206,8 @@
poRes = port.submitNamespacedPO("Ferrari", "message");
assertEquals("Ferrari", poRes);
}
-
+ @Test
+ @RunAsClient
public void testDocWrappedServiceMessageAccess() throws Exception
{
MessageFactory msgFactory = MessageFactory.newInstance();
@@ -215,7 +223,7 @@
"</env:Envelope>";
SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes()));
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-soapbinding/DocWrappedService?wsdl");
+ URL wsdlURL = new URL(baseURL + "/DocWrappedService?wsdl");
QName serviceName = new QName(targetNS, "DocWrappedService");
QName portName = new QName(targetNS, "DocWrappedPort");
Service service = Service.create(wsdlURL, serviceName);
@@ -228,7 +236,8 @@
soapElement = (SOAPElement)soapElement.getChildElements(new QName("PurchaseOrderAck")).next();
assertEquals("Ferrari", soapElement.getValue());
}
-
+ @Test
+ @RunAsClient
public void testNamespacedDocWrappedServiceMessageAccess() throws Exception
{
MessageFactory msgFactory = MessageFactory.newInstance();
@@ -249,7 +258,7 @@
" </env:Body>" +
"</env:Envelope>";
SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes()));
- URL epURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-soapbinding/DocWrappedService");
+ URL epURL = new URL(baseURL + "/DocWrappedService");
SOAPMessage resMsg = con.call(reqMsg, epURL);
9 years, 4 months
JBossWS SVN: r19216 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-22 21:24:26 -0500 (Mon, 22 Dec 2014)
New Revision: 19216
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/JBWS2419TestCase.java
Log:
arquillian migration jbws2419 test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/JBWS2419TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/JBWS2419TestCase.java 2014-12-23 02:12:44 UTC (rev 19215)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/JBWS2419TestCase.java 2014-12-23 02:24:26 UTC (rev 19216)
@@ -38,7 +38,15 @@
import javax.xml.ws.handler.Handler;
import javax.xml.ws.soap.SOAPBinding;
-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.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
@@ -51,13 +59,15 @@
* @author mageshbk(a)jboss.com
* @since 20-Feb-2009
*/
+(a)RunWith(Arquillian.class)
public class JBWS2419TestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2419";
+ @ArquillianResource
+ private URL baseURL;
- public static BaseDeployment<?>[] createDeployments() {
- List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
- list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2419.war") { {
+ @Deployment(testable = false)
+ public static WebArchive createDeployments() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws2419.war");
archive
.addManifest()
.addClass(org.jboss.test.ws.jaxws.jbws2419.SOAP11Endpoint.class)
@@ -70,19 +80,14 @@
.addAsResource("org/jboss/test/ws/jaxws/jbws2419/jaxws-server-handlers2.xml")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2419/WEB-INF/wsdl/SOAP12Service.wsdl"), "wsdl/SOAP12Service.wsdl")
.setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2419/WEB-INF/web.xml"));
- }
- });
- return list.toArray(new BaseDeployment<?>[list.size()]);
+ return archive;
}
- public static Test suite()
- {
- return new JBossWSTestSetup(JBWS2419TestCase.class, JBossWSTestHelper.writeToFile(createDeployments()));
- }
-
+ @Test
+ @RunAsClient
public void testSOAP12ClientAccess() throws Exception
{
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "/soap12?wsdl");
+ URL wsdlURL = new URL(baseURL + "/soap12?wsdl");
QName qname = new QName("http://org.jboss.ws/jaxws/jbws2419", "SOAP12EndpointBeanService");
Service service = Service.create(wsdlURL, qname);
SOAP12Endpoint port = service.getPort(SOAP12Endpoint.class);
@@ -100,9 +105,11 @@
assertEquals("Hello Jimbo", messg);
}
+ @Test
+ @RunAsClient
public void testSOAP11ClientAccess() throws Exception
{
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "/soap11?wsdl");
+ URL wsdlURL = new URL(baseURL + "/soap11?wsdl");
QName qname = new QName("http://org.jboss.ws/jaxws/jbws2419", "SOAP11EndpointBeanService");
Service service = Service.create(wsdlURL, qname);
SOAP11Endpoint port = service.getPort(SOAP11Endpoint.class);
9 years, 4 months
JBossWS SVN: r19215 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2009.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-22 21:12:44 -0500 (Mon, 22 Dec 2014)
New Revision: 19215
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2009/JBWS2009TestCase.java
Log:
arquillian migration jbws2009 test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2009/JBWS2009TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2009/JBWS2009TestCase.java 2014-12-23 02:00:54 UTC (rev 19214)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2009/JBWS2009TestCase.java 2014-12-23 02:12:44 UTC (rev 19215)
@@ -29,7 +29,15 @@
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.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.test.ws.jaxws.jbws2009.generated.CountryCodeType;
import org.jboss.test.ws.jaxws.jbws2009.generated.CurrencyCodeType;
@@ -46,14 +54,18 @@
* @author thomas.diesler(a)jboss.com
* @since 16-Oct-2007
*/
+(a)RunWith(Arquillian.class)
public class JBWS2009TestCase extends JBossWSTest
{
private String targetNS = "http://jbws2009.jaxws.ws.test.jboss.org/";
private ServiceType proxy;
- public static BaseDeployment<?>[] createDeployments() {
- List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
- list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2009.war") { {
+ @ArquillianResource
+ private URL baseURL;
+
+ @Deployment(testable = false)
+ public static WebArchive createDeployments() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws2009.war");
archive
.addManifest()
.addClass(org.jboss.test.ws.jaxws.jbws2009.ServiceImpl.class)
@@ -62,15 +74,9 @@
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2009/WEB-INF/wsdl/schema/common/1.0-SNAPSHOT/CoreComponentTypes.xsd"), "wsdl/schema/common/1.0-SNAPSHOT/CoreComponentTypes.xsd")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2009/WEB-INF/wsdl/schema/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd"), "wsdl/schema/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd")
.setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2009/WEB-INF/web.xml"));
- }
- });
- return list.toArray(new BaseDeployment<?>[list.size()]);
+ return archive;
}
- public static Test suite()
- {
- return new JBossWSTestSetup(JBWS2009TestCase.class, JBossWSTestHelper.writeToFile(createDeployments()));
- }
@Override
protected void setUp() throws Exception
@@ -78,30 +84,39 @@
super.setUp();
QName serviceName = new QName(targetNS, "EndpointService");
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2009/Service?wsdl");
+ URL wsdlURL = new URL(baseURL + "/Service?wsdl");
Service service = Service.create(wsdlURL, serviceName);
proxy = service.getPort(ServiceType.class);
}
-
+
+ @Test
+ @RunAsClient
public void testCountryCodes() throws Exception
{
+ setUp();
Response response = proxy.getCountryCodes();
List<CountryCodeType> countryCodes = response.getCountry();
assertEquals(countryCodes.get(0), CountryCodeType.CZ);
assertEquals(countryCodes.get(1), CountryCodeType.DE);
}
+ @Test
+ @RunAsClient
public void testCurrencyCodes() throws Exception
{
+ setUp();
org.jboss.test.ws.jaxws.jbws2009.generated.GetCurrencyCodesResponse.Response response = proxy.getCurrencyCodes();
List<CurrencyCodeType> currencyCodes = response.getCurrency();
assertEquals(currencyCodes.get(0), CurrencyCodeType.CZK);
assertEquals(currencyCodes.get(1), CurrencyCodeType.EUR);
}
-
+
+ @Test
+ @RunAsClient
public void test() throws Exception
{
+ setUp();
assertEquals(CurrencyCodeType.CZK, proxy.getCurrency(CountryCodeType.CZ));
assertEquals(CurrencyCodeType.EUR, proxy.getCurrency(CountryCodeType.DE));
}
9 years, 4 months
JBossWS SVN: r19214 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2955.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-22 21:00:54 -0500 (Mon, 22 Dec 2014)
New Revision: 19214
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2955/JBWS2955TestCase.java
Log:
arquillian migration jbws2955 test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2955/JBWS2955TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2955/JBWS2955TestCase.java 2014-12-23 01:00:20 UTC (rev 19213)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2955/JBWS2955TestCase.java 2014-12-23 02:00:54 UTC (rev 19214)
@@ -26,39 +26,44 @@
import java.util.LinkedList;
import java.util.List;
-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.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment;
import org.jboss.wsf.test.JBossWSTestSetup;
+(a)RunWith(Arquillian.class)
public class JBWS2955TestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2955";
+ @ArquillianResource
+ private URL baseURL;
- public static BaseDeployment<?>[] createDeployments() {
- List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
- list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2955.war") { {
+ @Deployment(testable = false)
+ public static WebArchive createDeployments() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws2955.war");
archive
.addManifest()
.addClass(org.jboss.test.ws.jaxws.jbws2955.Endpoint.class)
.addClass(org.jboss.test.ws.jaxws.jbws2955.EndpointImpl.class)
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2955/WEB-INF/jboss-web.xml"), "jboss-web.xml")
.setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2955/WEB-INF/web.xml"));
- }
- });
- return list.toArray(new BaseDeployment<?>[list.size()]);
+ return archive;
}
- public static Test suite() throws Exception
- {
- return new JBossWSTestSetup(JBWS2955TestCase.class, JBossWSTestHelper.writeToFile(createDeployments()));
- }
-
+ @Test
+ @RunAsClient
public void testCall() throws Exception
{
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ URL wsdlURL = new URL(baseURL + "?wsdl");
EndpointService service = new EndpointService(wsdlURL);
Endpoint port = service.getEndpointPort();
9 years, 4 months