JBossWS SVN: r19273 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-26 23:00:55 -0500 (Fri, 26 Dec 2014)
New Revision: 19273
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/DeploymentArchive.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java
Log:
arquillian migration doclit test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/DeploymentArchive.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/DeploymentArchive.java 2014-12-27 03:02:22 UTC (rev 19272)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/DeploymentArchive.java 2014-12-27 04:00:55 UTC (rev 19273)
@@ -24,33 +24,37 @@
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 DeploymentArchive
{
- public static final String NAME = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-xop-doclit.war") { {
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.DHRequest.class)
- .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.DHResponse.class)
- .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.FakeInputStream.class)
- .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.GeneratorDataSource.class)
- .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.ImageRequest.class)
- .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.ImageResponse.class)
- .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMCheckClientHandler.class)
- .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMEndpoint.class)
- .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMEndpointBean.class)
- .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMProtocolHandler.class)
- .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.SourceRequest.class)
- .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.SourceResponse.class)
- .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.WrappedEndpoint.class)
- .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.WrappedEndpointImpl.class)
- .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.XOPBase.class)
- .addAsResource("org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws-handlers-server.xml")
- .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.jaxws.ParameterAnnotation.class)
- .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.jaxws.ParameterAnnotationResponse.class)
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/xop/doclit/WEB-INF/web.xml"));
- }
- });
+ public static WebArchive createDeployment() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-xop-doclit.war");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.DHRequest.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.DHResponse.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.FakeInputStream.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.GeneratorDataSource.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.ImageRequest.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.ImageResponse.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMCheckClientHandler.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMEndpoint.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMEndpointBean.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMProtocolHandler.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.SourceRequest.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.SourceResponse.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.WrappedEndpoint.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.WrappedEndpointImpl.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.XOPBase.class)
+ .addAsResource("org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws-handlers-server.xml")
+ .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.jaxws.ParameterAnnotation.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.jaxws.ParameterAnnotationResponse.class)
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/xop/doclit/WEB-INF/web.xml"));
+ return archive;
+ }
private DeploymentArchive() {
//NOOP
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.java 2014-12-27 03:02:22 UTC (rev 19272)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.java 2014-12-27 04:00:55 UTC (rev 19273)
@@ -37,7 +37,14 @@
import javax.xml.ws.soap.MTOMFeature;
import javax.xml.ws.soap.SOAPBinding;
-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.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.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -48,15 +55,20 @@
* @author alessio.soldano(a)jboss.com
* @since 14-Jan-2009
*/
+(a)RunWith(Arquillian.class)
public class MTOMFeatureTestCase extends JBossWSTest {
- public static Test suite() {
- return new JBossWSTestSetup(MTOMFeatureTestCase.class, DeploymentArchive.NAME);
- }
+ @ArquillianResource
+ private URL baseURL;
- private MTOMEndpoint getPort(boolean mtomEnabled) throws Exception {
+ @Deployment(testable = false)
+ public static WebArchive createDeployment() {
+ return DeploymentArchive.createDeployment();
+ }
+
+ private MTOMEndpoint getPort(boolean mtomEnabled) throws Exception {
QName serviceName = new QName("http://doclit.xop.samples.jaxws.ws.test.jboss.org/", "MTOMService");
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/bare?wsdl");
+ URL wsdlURL = new URL(baseURL + "bare?wsdl");
Service service = Service.create(wsdlURL, serviceName);
return service.getPort(MTOMEndpoint.class, new MTOMFeature(mtomEnabled));
@@ -71,6 +83,8 @@
binding.setHandlerChain(handlerChain);
}
+ @Test
+ @RunAsClient
public void testWithMTOMRequest() throws Exception {
DataHandler dh = new DataHandler("DataHandlerRoundtrip", "text/plain");
MTOMEndpoint port = getPort(true);
@@ -85,6 +99,8 @@
assertEquals("text/plain", contentType);
}
+ @Test
+ @RunAsClient
public void testWithoutMTOMRequest() throws Exception {
DataHandler dh = new DataHandler("DataHandlerResponseOptimzed", "text/plain");
DHResponse response = getPort(false).echoDataHandler(new DHRequest(dh));
@@ -97,6 +113,8 @@
assertEquals("text/plain", contentType);
}
+ @Test
+ @RunAsClient
public void testErrorWithoutMTOMRequest() throws Exception {
DataHandler dh = new DataHandler("DataHandlerResponseOptimzed", "text/plain");
MTOMEndpoint port = getPort(false);
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2014-12-27 03:02:22 UTC (rev 19272)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2014-12-27 04:00:55 UTC (rev 19273)
@@ -29,7 +29,14 @@
import javax.xml.ws.Service;
import javax.xml.ws.soap.SOAPBinding;
-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.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.wsf.test.JBossWSTestSetup;
@@ -45,20 +52,21 @@
* @author Heiko Braun <heiko.braun(a)jboss.com>
* @since 05.12.2006
*/
+(a)RunWith(Arquillian.class)
public class XOPBareTestCase extends XOPBase
{
+ @ArquillianResource
+ private URL baseURL;
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/bare";
-
- public static Test suite()
- {
- return new JBossWSTestSetup(XOPBareTestCase.class, DeploymentArchive.NAME);
+ @Deployment(testable = false)
+ public static WebArchive createDeployment() {
+ return DeploymentArchive.createDeployment();
}
protected void setUp() throws Exception
{
QName serviceName = new QName("http://doclit.xop.samples.jaxws.ws.test.jboss.org/", "MTOMService");
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ URL wsdlURL = new URL(baseURL + "bare?wsdl");
Service service = Service.create(wsdlURL, serviceName);
port = service.getPort(MTOMEndpoint.class);
@@ -68,8 +76,11 @@
/**
* Consumption of XOP packages (not inlined) should resolve the correct java type.
*/
+ @Test
+ @RunAsClient
public void testDataHandlerRoundtrip() throws Exception
{
+ setUp();
getBinding().setMTOMEnabled(true);
DataHandler dh = new DataHandler("DataHandlerRoundtrip", "text/plain");
@@ -86,8 +97,11 @@
/**
* Consumption of XOP packages (not inlined) should resolve the correct java type.
*/
+ @Test
+ @RunAsClient
public void testDataHandlerResponseOptimzed() throws Exception
{
+ setUp();
getBinding().setMTOMEnabled(false);
DataHandler dh = new DataHandler("DataHandlerResponseOptimzed", "text/plain");
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2014-12-27 03:02:22 UTC (rev 19272)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2014-12-27 04:00:55 UTC (rev 19273)
@@ -33,8 +33,16 @@
import javax.xml.ws.Service;
import javax.xml.ws.soap.SOAPBinding;
-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.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.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -44,22 +52,24 @@
*
* @author Heiko.Braun(a)jboss.com
*/
+(a)RunWith(Arquillian.class)
public class XOPWrappedTestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/wrapped";
-
private WrappedEndpoint port;
- public static Test suite()
- {
- return new JBossWSTestSetup(XOPWrappedTestCase.class, DeploymentArchive.NAME);
+ @ArquillianResource
+ private URL baseURL;
+
+ @Deployment(testable = false)
+ public static WebArchive createDeployment() {
+ return DeploymentArchive.createDeployment();
}
protected void setUp() throws Exception
{
QName serviceName = new QName("http://doclit.xop.samples.jaxws.ws.test.jboss.org/", "WrappedService");
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ URL wsdlURL = new URL(baseURL + "wrapped?wsdl");
Service service = Service.create(wsdlURL, serviceName);
port = service.getPort(WrappedEndpoint.class);
@@ -69,8 +79,11 @@
}
+ @Test
+ @RunAsClient
public void testParameterAnnotation() throws Exception
{
+ setUp();
DataHandler request = new DataHandler("Client data", "text/plain");
DataHandler response = port.parameterAnnotation(request);
10 years, 12 months
- 1
- 0
JBossWS SVN: r19272 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jaxbintros.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-26 22:02:22 -0500 (Fri, 26 Dec 2014)
New Revision: 19272
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jaxbintros/AnnotationReaderTestCase.java
Log:
arquillian migration jaxbintros test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jaxbintros/AnnotationReaderTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jaxbintros/AnnotationReaderTestCase.java 2014-12-27 02:53:22 UTC (rev 19271)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jaxbintros/AnnotationReaderTestCase.java 2014-12-27 03:02:22 UTC (rev 19272)
@@ -32,13 +32,20 @@
import org.jboss.jaxb.intros.BindingCustomizationFactory;
import org.jboss.wsf.test.JBossWSTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
/**
* @author Heiko.Braun(a)jboss.com
* @author alessio.soldano(a)jboss.com
*/
+(a)RunWith(Arquillian.class)
public class AnnotationReaderTestCase extends JBossWSTest
{
+ @Test
+ @RunAsClient
public void testUnmarshal() throws Exception
{
String reqString =
10 years, 12 months
- 1
- 0
JBossWS SVN: r19271 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-26 21:53:22 -0500 (Fri, 26 Dec 2014)
New Revision: 19271
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java
Log:
arquillian migration eardeployment test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2014-12-26 04:27:21 UTC (rev 19270)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2014-12-27 02:53:22 UTC (rev 19271)
@@ -31,7 +31,20 @@
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
-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.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.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.wsf.test.JBossWSTest;
@@ -46,56 +59,55 @@
* @author Thomas.Diesler(a)jboss.org
* @author <a href="mailto:richard.opalka@jboss.org">Richard Opalka</a>
*/
+(a)RunWith(Arquillian.class)
public class EarTestCase extends JBossWSTest
{
- public static final class EarTestCaseDeploymentArchive {
- public static final String NAME = getName();
-
- private static String getName() {
- JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-eardeployment-ejb3.jar") { {
- archive
- .setManifest(new StringAsset("Manifest-Version: 1.0\n"
- + "Dependencies: org.jboss.logging\n"))
- .addClass(org.jboss.test.ws.jaxws.samples.eardeployment.EJB3Bean.class)
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl")
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/wsdl/TestService.xsd"), "wsdl/TestService.xsd");
- }
- });
- JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-eardeployment-pojo.war") { {
- archive
- .setManifest(new StringAsset("Manifest-Version: 1.0\n"
- + "Dependencies: org.jboss.logging,org.jboss.ws.common\n"))
- .addClass(org.jboss.test.ws.jaxws.samples.eardeployment.JSEBean.class)
- .addClass(org.jboss.test.ws.jaxws.samples.eardeployment.SupportServlet.class)
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/jboss-web.xml"), "jboss-web.xml")
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl")
- .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/wsdl/TestService.xsd"), "wsdl/TestService.xsd")
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/web.xml"));
- }
- });
- return JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-eardeployment.ear") { {
- archive
- .addManifest()
- .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-samples-eardeployment-ejb3.jar"))
- .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-samples-eardeployment-pojo.war"))
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/META-INF/permissions.xml"), "permissions.xml");
- }
- });
- }
-
- private EarTestCaseDeploymentArchive() {
- //NO OP
- }
+ @ArquillianResource
+ private URL baseURL;
+
+ @Deployment(testable = false)
+ public static EnterpriseArchive createDeployment() {
+ JavaArchive archive1 = ShrinkWrap.create(JavaArchive.class, "jaxws-samples-eardeployment-ejb3.jar");
+ archive1
+ .setManifest(new StringAsset("Manifest-Version: 1.0\n"
+ + "Dependencies: org.jboss.logging\n"))
+ .addClass(org.jboss.test.ws.jaxws.samples.eardeployment.EJB3Bean.class)
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl")
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/wsdl/TestService.xsd"), "wsdl/TestService.xsd");
+ writeToDisk(archive1);
+
+ WebArchive archive2 = ShrinkWrap.create(WebArchive.class, "jaxws-samples-eardeployment-pojo.war");
+ archive2
+ .setManifest(new StringAsset("Manifest-Version: 1.0\n"
+ + "Dependencies: org.jboss.logging,org.jboss.ws.common\n"))
+ .addClass(org.jboss.test.ws.jaxws.samples.eardeployment.JSEBean.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.eardeployment.SupportServlet.class)
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/jboss-web.xml"), "jboss-web.xml")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/wsdl/TestService.xsd"), "wsdl/TestService.xsd")
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/web.xml"));
+ writeToDisk(archive2);
+
+ EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-samples-eardeployment.ear");
+ archive
+ .addManifest()
+ .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-samples-eardeployment-ejb3.jar"))
+ .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-samples-eardeployment-pojo.war"))
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/META-INF/permissions.xml"), "permissions.xml");
+ return archive;
}
-
- public static Test suite()
+
+ private static void writeToDisk(Archive archive)
{
- return new JBossWSTestSetup(EarTestCase.class, EarTestCaseDeploymentArchive.NAME);
+ File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName());
+ archive.as(ZipExporter.class).exportTo(file, true);
}
+ @Test
+ @RunAsClient
public void testEJB3Endpoint() throws Exception
{
- String soapAddress = "http://" + getServerHost() + ":8080/earejb3/EndpointService/Endpoint";
+ String soapAddress = "http://" + baseURL.getHost() + ":8080/earejb3/EndpointService/Endpoint";
QName serviceName = new QName("http://eardeployment.jaxws/", "EndpointService");
Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName);
Endpoint port = service.getPort(Endpoint.class);
@@ -112,9 +124,11 @@
assertEquals(helloWorld, retObj);
}
+ @Test
+ @RunAsClient
public void testJSEEndpoint() throws Exception
{
- String soapAddress = "http://" + getServerHost() + ":8080/earjse/JSEBean";
+ String soapAddress = baseURL + "JSEBean";
QName serviceName = new QName("http://eardeployment.jaxws/", "EndpointService");
Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName);
Endpoint port = service.getPort(Endpoint.class);
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java 2014-12-26 04:27:21 UTC (rev 19270)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java 2014-12-27 02:53:22 UTC (rev 19271)
@@ -29,9 +29,14 @@
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
-import junit.framework.Test;
-
-import org.jboss.test.ws.jaxws.samples.eardeployment.EarTestCase.EarTestCaseDeploymentArchive;
+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.spec.EnterpriseArchive;
import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -42,20 +47,25 @@
*
* @author alessio.soldano(a)jboss.com
*/
+(a)RunWith(Arquillian.class)
public class WSDLPublishTestCase extends JBossWSTest
{
private File wsdlFileDir;
- private static long testStart;
-
- public static Test suite()
- {
- testStart = System.currentTimeMillis();
- return new JBossWSTestSetup(WSDLPublishTestCase.class, EarTestCaseDeploymentArchive.NAME);
+ private static long testStart = System.currentTimeMillis();
+
+ @ArquillianResource
+ private URL baseURL;
+
+ @Deployment(testable = false)
+ public static EnterpriseArchive createDeployment() {
+ return EarTestCase.createDeployment();
}
+ @Test
+ @RunAsClient
public void testEJB3Endpoint() throws Exception
{
- String soapAddress = "http://" + getServerHost() + ":8080/earejb3/EndpointService/Endpoint";
+ String soapAddress = "http://" + baseURL.getHost() + ":8080/earejb3/EndpointService/Endpoint";
QName serviceName = new QName("http://eardeployment.jaxws/", "EndpointService");
File file = new File(getWsdlFileDir().getAbsolutePath() + File.separator + "jaxws-samples-eardeployment.ear" + File.separator
@@ -77,9 +87,11 @@
assertEquals(helloWorld, retObj);
}
+ @Test
+ @RunAsClient
public void testJSEEndpoint() throws Exception
{
- String soapAddress = "http://" + getServerHost() + ":8080/earjse/JSEBean";
+ String soapAddress = baseURL + "JSEBean";
QName serviceName = new QName("http://eardeployment.jaxws/", "EndpointService");
File file = new File(getWsdlFileDir().getAbsolutePath() + File.separator + "jaxws-samples-eardeployment.ear" + File.separator
@@ -105,7 +117,7 @@
{
if (wsdlFileDir == null)
{
- URL url = new URL("http://" + getServerHost() + ":8080/earjse/support");
+ URL url = new URL("http://" + baseURL.getHost() + ":8080/earjse/support");
wsdlFileDir = new File(IOUtils.readAndCloseStream(url.openStream()), "wsdl");
}
return wsdlFileDir;
10 years, 12 months
- 1
- 0
JBossWS SVN: r19270 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-25 23:27:21 -0500 (Thu, 25 Dec 2014)
New Revision: 19270
Removed:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/DeploymentArchive.java
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java
Log:
arquillian migration asynchronous test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java 2014-12-26 03:55:06 UTC (rev 19269)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java 2014-12-26 04:27:21 UTC (rev 19270)
@@ -21,6 +21,7 @@
*/
package org.jboss.test.ws.jaxws.samples.asynchronous;
+import java.io.File;
import java.io.IOException;
import java.io.StringReader;
import java.net.MalformedURLException;
@@ -37,12 +38,21 @@
import javax.xml.ws.Service;
import javax.xml.ws.Service.Mode;
-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.ws.common.DOMUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
import org.w3c.dom.Element;
+import org.jboss.wsf.test.JBossWSTestHelper;
/**
* Test JAXWS asynchrous dispatch
@@ -50,6 +60,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 12-Aug-2006
*/
+(a)RunWith(Arquillian.class)
public class AsynchronousDispatchTestCase extends JBossWSTest
{
private final String targetNS = "http://org.jboss.ws/jaxws/asynchronous";
@@ -57,11 +68,22 @@
private Exception handlerException;
private boolean asyncHandlerCalled;
- public static Test suite()
- {
- return new JBossWSTestSetup(AsynchronousDispatchTestCase.class, DeploymentArchive.NAME);
+ @ArquillianResource
+ private URL baseURL;
+
+ @Deployment(testable = false)
+ public static WebArchive createDeployment() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-asynchronous.war");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.samples.asynchronous.Endpoint.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.asynchronous.EndpointBean.class)
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/asynchronous/WEB-INF/web.xml"));
+ return archive;
}
+ @Test
+ @RunAsClient
public void testInvokeAsynch() throws Exception
{
Source reqObj = new StreamSource(new StringReader(reqPayload));
@@ -69,6 +91,8 @@
verifyResponse(response.get(3000, TimeUnit.MILLISECONDS));
}
+ @Test
+ @RunAsClient
public void testInvokeAsynchHandler() throws Exception
{
AsyncHandler<Source> handler = new AsyncHandler<Source>()
@@ -99,7 +123,7 @@
private Dispatch<Source> createDispatch() throws MalformedURLException
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-asynchronous?wsdl");
+ URL wsdlURL = new URL(baseURL + "?wsdl");
QName serviceName = new QName(targetNS, "EndpointBeanService");
QName portName = new QName(targetNS, "EndpointPort");
Service service = Service.create(wsdlURL, serviceName);
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java 2014-12-26 03:55:06 UTC (rev 19269)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java 2014-12-26 04:27:21 UTC (rev 19270)
@@ -21,6 +21,7 @@
*/
package org.jboss.test.ws.jaxws.samples.asynchronous;
+import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.concurrent.Future;
@@ -31,10 +32,19 @@
import javax.xml.ws.Response;
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.JBossWSTestSetup;
+import org.jboss.wsf.test.JBossWSTestHelper;
/**
* Test JAXWS asynchrous proxy
@@ -42,17 +52,29 @@
* @author Thomas.Diesler(a)jboss.org
* @since 12-Aug-2006
*/
+(a)RunWith(Arquillian.class)
public class AsynchronousProxyTestCase extends JBossWSTest
{
private final String targetNS = "http://org.jboss.ws/jaxws/asynchronous";
private Exception handlerException;
private boolean asyncHandlerCalled;
- public static Test suite()
- {
- return new JBossWSTestSetup(AsynchronousProxyTestCase.class, DeploymentArchive.NAME);
+ @ArquillianResource
+ private URL baseURL;
+
+ @Deployment(testable = false)
+ public static WebArchive createDeployment() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-asynchronous.war");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.samples.asynchronous.Endpoint.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.asynchronous.EndpointBean.class)
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/asynchronous/WEB-INF/web.xml"));
+ return archive;
}
+ @Test
+ @RunAsClient
public void testInvokeSync() throws Exception
{
Endpoint port = createProxy();
@@ -60,6 +82,8 @@
assertEquals("Hello", retStr);
}
+ @Test
+ @RunAsClient
public void testInvokeAsync() throws Exception
{
Endpoint port = createProxy();
@@ -70,6 +94,8 @@
assertEquals("Async", retStr);
}
+ @Test
+ @RunAsClient
public void testInvokeAsyncHandler() throws Exception
{
AsyncHandler<String> handler = new AsyncHandler<String>()
@@ -106,7 +132,7 @@
private Endpoint createProxy() throws MalformedURLException
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-asynchronous?wsdl");
+ URL wsdlURL = new URL(baseURL + "?wsdl");
QName serviceName = new QName(targetNS, "EndpointBeanService");
Service service = Service.create(wsdlURL, serviceName);
return service.getPort(Endpoint.class);
Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/DeploymentArchive.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/DeploymentArchive.java 2014-12-26 03:55:06 UTC (rev 19269)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/DeploymentArchive.java 2014-12-26 04:27:21 UTC (rev 19270)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2014, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.asynchronous;
-
-import java.io.File;
-
-import org.jboss.wsf.test.JBossWSTestHelper;
-
-public final class DeploymentArchive
-{
- public static final String NAME = getName();
-
- private static String getName() {
- return JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-asynchronous.war") { {
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.samples.asynchronous.Endpoint.class)
- .addClass(org.jboss.test.ws.jaxws.samples.asynchronous.EndpointBean.class)
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/asynchronous/WEB-INF/web.xml"));
- }
- });
- }
-
- private DeploymentArchive() {
- //NO OP
- }
-}
10 years, 12 months
- 1
- 0
JBossWS SVN: r19269 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-25 22:55:06 -0500 (Thu, 25 Dec 2014)
New Revision: 19269
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/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/WebServiceRefEJB3TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java 2014-12-26 02:15:25 UTC (rev 19268)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java 2014-12-26 03:55:06 UTC (rev 19269)
@@ -21,17 +21,31 @@
*/
package org.jboss.test.ws.jaxws.samples.webserviceref;
+import java.lang.Exception;
+import java.lang.String;
import java.net.URL;
+import java.io.File;
import javax.naming.InitialContext;
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.test.ws.jaxws.samples.webserviceref.EJB3Remote;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
+import org.jboss.wsf.test.JBossWSTestHelper;
/**
* Test the JAXWS annotation: javax.xml.ws.WebServiceref
@@ -39,18 +53,47 @@
* @author Thomas.Diesler(a)jboss.com
* @since 23-Oct-2005
*/
+(a)RunWith(Arquillian.class)
public class WebServiceRefEJB3TestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-webserviceref";
+ @ArquillianResource
+ private URL baseURL;
- public static Test suite()
- {
- return new JBossWSTestSetup(WebServiceRefEJB3TestCase.class, DeploymentArchives.getServerArchiveFilename());
+ @ArquillianResource
+ Deployer deployer;
+
+ @Deployment(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;
}
+ private static final String DEPLOYMENT = "jaxws-samples-webserviceref-ejb3-client";
+ @Deployment(name = DEPLOYMENT, 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;
+ }
+
+ @Test
+ @RunAsClient
public void testDynamicProxy() throws Exception
{
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ URL wsdlURL = new URL(baseURL + "?wsdl");
QName qname = new QName("http://org.jboss.ws/wsref", "EndpointService");
Service service = Service.create(wsdlURL, qname);
Endpoint port = (Endpoint)service.getPort(Endpoint.class);
@@ -63,7 +106,7 @@
public void testEJB3Client() throws Exception
{
InitialContext iniCtx = null;
- deploy(DeploymentArchives.getEJBClientArchiveFilename());
+ deployer.deploy(DEPLOYMENT);
try
{
iniCtx = getServerInitialContext();
@@ -79,7 +122,7 @@
{
iniCtx.close();
}
- undeploy(DeploymentArchives.getEJBClientArchiveFilename());
+ deployer.undeploy(DEPLOYMENT);
}
}
}
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 2014-12-26 02:15:25 UTC (rev 19268)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2014-12-26 03:55:06 UTC (rev 19269)
@@ -21,16 +21,29 @@
*/
package org.jboss.test.ws.jaxws.samples.webserviceref;
+import java.lang.Exception;
+import java.lang.String;
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.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
+import org.jboss.wsf.test.JBossWSTestHelper;
/**
* Test the JAXWS annotation: javax.xml.ws.WebServiceref
@@ -38,18 +51,49 @@
* @author Thomas.Diesler(a)jboss.com
* @since 23-Oct-2005
*/
+(a)RunWith(Arquillian.class)
public class WebServiceRefServletTestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-webserviceref";
+ @ArquillianResource
+ private URL baseURL;
- public static Test suite()
- {
- return new JBossWSTestSetup(WebServiceRefServletTestCase.class, DeploymentArchives.getServerArchiveFilename());
+ @ArquillianResource
+ Deployer deployer;
+
+ @Deployment(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;
}
+ private static final String DEPLOYMENT = "jaxws-samples-webserviceref-servlet-client";
+
+ @Deployment(name = DEPLOYMENT, 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;
+ }
+
+ @Test
+ @RunAsClient
public void testDynamicProxy() throws Exception
{
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ URL wsdlURL = new URL(baseURL + "?wsdl");
QName qname = new QName("http://org.jboss.ws/wsref", "EndpointService");
Service service = Service.create(wsdlURL, qname);
Endpoint port = (Endpoint)service.getPort(Endpoint.class);
@@ -59,17 +103,20 @@
assertEquals(helloWorld, retObj);
}
+ @Test
+ @RunAsClient
public void testServletClient() throws Exception
{
- deploy(DeploymentArchives.getServletClientArchiveFilename());
+ deployer.deploy(DEPLOYMENT);
try
{
- URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld");
+ String text = baseURL.toString().substring(0, baseURL.toString().length()-1);
+ URL url = new URL(text + "-servlet-client?echo=HelloWorld");
assertEquals("HelloWorld", IOUtils.readAndCloseStream(url.openStream()));
}
finally
{
- undeploy(DeploymentArchives.getServletClientArchiveFilename());
+ deployer.undeploy(DEPLOYMENT);
}
}
}
10 years, 12 months
- 1
- 0
JBossWS SVN: r19268 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-25 21:15:25 -0500 (Thu, 25 Dec 2014)
New Revision: 19268
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumeScriptTestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.java
Log:
arquillian migration tools test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2014-12-26 01:16:36 UTC (rev 19267)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2014-12-26 02:15:25 UTC (rev 19268)
@@ -22,8 +22,14 @@
package org.jboss.test.ws.jaxws.smoke.tools;
import java.io.File;
+import java.lang.Exception;
import org.jboss.wsf.test.JBossWSTest;
+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;
/**
* [JBWS-1793] Provide a test case for the tools scripts that reside under JBOSS_HOME/bin
@@ -36,17 +42,18 @@
*
* @author Heiko.Braun(a)jboss.com
*/
+(a)RunWith(Arquillian.class)
public class ScriptTestCase extends JBossWSTest
{
- protected static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows
- protected static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows
- protected static final String EXT = ":".equals( PS ) ? ".sh" : ".bat";
+ public static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows
+ public static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows
+ public static final String EXT = ":".equals( PS ) ? ".sh" : ".bat";
- protected String ENDPOINT_CLASS;
+ public String ENDPOINT_CLASS;
- protected String JBOSS_HOME;
- protected String CLASSES_DIR;
- protected String TEST_DIR;
+ public String JBOSS_HOME;
+ public String CLASSES_DIR;
+ public String TEST_DIR;
protected void setUp() throws Exception
{
@@ -58,9 +65,12 @@
ENDPOINT_CLASS = "org.jboss.test.ws.jaxws.smoke.tools.CalculatorBean";
TEST_DIR = createResourceFile("..").getAbsolutePath();
}
-
- public void testScritpsAvailable()
+
+ @Test
+ @RunAsClient
+ public void testScritpsAvailable() throws Exception
{
+ setUp();
assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsprovide" + ".sh").exists());
assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsprovide" + ".bat").exists());
assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsconsume" + ".sh").exists());
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumeScriptTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumeScriptTestCase.java 2014-12-26 01:16:36 UTC (rev 19267)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumeScriptTestCase.java 2014-12-26 02:15:25 UTC (rev 19268)
@@ -22,6 +22,11 @@
package org.jboss.test.ws.jaxws.smoke.tools;
import java.io.File;
+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;
/**
* [JBWS-1793] Provide a test case for the tools scripts that reside under JBOSS_HOME/bin
@@ -34,12 +39,16 @@
*
* @author Heiko.Braun(a)jboss.com
*/
+(a)RunWith(Arquillian.class)
public class WSConsumeScriptTestCase extends ScriptTestCase
{
private String WSDL_LOCATION = "jaxws" + FS + "smoke" + FS + "tools" + FS + "wsdl" + FS + "TestServiceCatalog.wsdl";
+ @Test
+ @RunAsClient
public void testWSConsumeFromCommandLine() throws Exception
{
+ super.setUp();
// use absolute path for the output to be re-usable
String absWsdlLoc = getResourceFile(WSDL_LOCATION).getAbsolutePath();
String absOutput = new File(TEST_DIR, "wsconsume" + FS + "java").getAbsolutePath();
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.java 2014-12-26 01:16:36 UTC (rev 19267)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.java 2014-12-26 02:15:25 UTC (rev 19268)
@@ -22,6 +22,11 @@
package org.jboss.test.ws.jaxws.smoke.tools;
import java.io.File;
+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;
/**
* [JBWS-1793] Provide a test case for the tools scripts that reside under JBOSS_HOME/bin
@@ -34,11 +39,14 @@
*
* @author Heiko.Braun(a)jboss.com
*/
+(a)RunWith(Arquillian.class)
public class WSProvideScriptTestCase extends ScriptTestCase
{
-
+ @Test
+ @RunAsClient
public void testWSProvideFromCommandLine() throws Exception
{
+ super.setUp();
String absOutput = new File(TEST_DIR, "wsprovide" + FS + "java").getAbsolutePath();
String command = JBOSS_HOME + FS + "bin" + FS + "wsprovide" + EXT + " -k -w -o " + absOutput + " --classpath " + CLASSES_DIR + " " + ENDPOINT_CLASS;
executeCommand(command, "wsprovide");
10 years, 12 months
- 1
- 0
JBossWS SVN: r19267 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-25 20:16:36 -0500 (Thu, 25 Dec 2014)
New Revision: 19267
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse/UsecasesTestCase.java
Log:
arquillian migration jse test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse/UsecasesTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse/UsecasesTestCase.java 2014-12-26 00:51:10 UTC (rev 19266)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse/UsecasesTestCase.java 2014-12-26 01:16:36 UTC (rev 19267)
@@ -41,19 +41,26 @@
import org.jboss.test.ws.jaxws.endpoint.jse.endpoints.Endpoint1Iface;
import org.jboss.test.ws.jaxws.endpoint.jse.endpoints.Endpoint1Impl;
import org.jboss.wsf.test.JBossWSTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
/**
* Tests endpoint dynamic publishing in JSE environment.
*
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
+(a)RunWith(Arquillian.class)
public final class UsecasesTestCase extends JBossWSTest
{
private static WebServiceFeature[] mtomEnabled = new WebServiceFeature[] { new MTOMFeature(true) };
private static int port1 = 8871;
private static int port2 = 8872;
-
+
+ @Test
+ @RunAsClient
public void testDifferentPortsSameContext() throws Exception
{
String publishURL1 = "http://" + getServerHost() + ":" + port1 + "/jaxws-endpoint/";
@@ -69,6 +76,8 @@
endpoint2.stop();
}
+ @Test
+ @RunAsClient
public void testDifferentPortsNoContext() throws Exception
{
String publishURL1 = "http://" + getServerHost() + ":" + port1 + "/";
@@ -92,6 +101,8 @@
endpoint2.stop();
}
+ @Test
+ @RunAsClient
public void testDifferentPortsAndLongPaths() throws Exception
{
String publishURL1 = "http://" + getServerHost() + ":" + port1 + "/jaxws-endpoint/endpoint/long/path/";
@@ -107,6 +118,8 @@
endpoint2.stop();
}
+ @Test
+ @RunAsClient
public void testSamePortsAndAlmostIdenticalLongPaths() throws Exception
{
String publishURL1 = "http://" + getServerHost() + ":" + port1 + "/jaxws-endpoint/endpoint/number1/";
@@ -122,6 +135,8 @@
endpoint2.stop();
}
+ @Test
+ @RunAsClient
public void testDifferentPortsAndIdenticalPaths() throws Exception
{
String publishURL1 = "http://" + getServerHost() + ":" + port1 + "/jaxws-endpoint/endpoint/number1/";
@@ -137,6 +152,8 @@
endpoint2.stop();
}
+ @Test
+ @RunAsClient
public void testEndpointThrowingException() throws Exception
{
String publishURL = "http://" + getServerHost() + ":" + port1 + "/jaxws-endpoint/endpoint/number1";
@@ -145,6 +162,8 @@
endpoint.stop();
}
+ @Test
+ @RunAsClient
public void testEndpointProcessingAttachments() throws Exception
{
for (int i = 0; i < 2; i++)
10 years, 12 months
- 1
- 0
JBossWS SVN: r19266 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2591.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-25 19:51:10 -0500 (Thu, 25 Dec 2014)
New Revision: 19266
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2591/JBWS2591TestCase.java
Log:
arquillian migration jbws2591 test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2591/JBWS2591TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2591/JBWS2591TestCase.java 2014-12-25 23:41:17 UTC (rev 19265)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2591/JBWS2591TestCase.java 2014-12-26 00:51:10 UTC (rev 19266)
@@ -26,6 +26,11 @@
import java.io.FileReader;
import org.jboss.wsf.test.JBossWSTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.jboss.arquillian.junit.Arquillian;
+import org.junit.Test;
+import org.jboss.arquillian.container.test.api.RunAsClient;
/**
* [JBWS-2591] WSConsume does not generate @XmlList with doc/lit wsdl
@@ -35,6 +40,7 @@
* @author alessio.soldano(a)jboss.com
* @since 01-Apr-2009
*/
+(a)RunWith(Arquillian.class)
public class JBWS2591TestCase extends JBossWSTest
{
private static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows
@@ -54,8 +60,12 @@
TEST_DIR = createResourceFile("..").getAbsolutePath();
}
+
+ @Test
+ @RunAsClient
public void testWSConsumeFromCommandLine() throws Exception
{
+ setUp();
// use absolute path for the output to be re-usable
String absWsdlLoc = getResourceFile(WSDL_LOCATION).getAbsolutePath();
String absOutput = new File(TEST_DIR, "wsconsume" + FS + "java").getAbsolutePath();
10 years, 12 months
- 1
- 0
JBossWS SVN: r19265 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-25 18:41:17 -0500 (Thu, 25 Dec 2014)
New Revision: 19265
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java
Log:
arquillian migration jbws2634 test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java 2014-12-25 22:37:59 UTC (rev 19264)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java 2014-12-25 23:41:17 UTC (rev 19265)
@@ -27,7 +27,18 @@
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.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.test.ws.jaxws.jbws2634.webservice.EndpointIface;
@@ -40,67 +51,76 @@
*
* @author <a href="mailto:richard.opalka@jboss.org">Richard Opalka</a>
*/
+(a)RunWith(Arquillian.class)
public final class JBWS2634TestCase extends JBossWSTest
{
- static {
- JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-jbws2634-pojo.war") { {
+ @ArquillianResource
+ private URL baseURL;
+
+ @Deployment(testable = false)
+ public static JavaArchive createDeployment() {
+ WebArchive archive1 = ShrinkWrap.create(WebArchive.class, "jaxws-jbws2634-pojo.war");
+ archive1
+ .setManifest(new StringAsset("Manifest-Version: 1.0\n"
+ + "Dependencies: org.jboss.logging\n"))
+ .addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.POJOBean.class)
+ .addAsResource("org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml")
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2634/WEB-INF/web.xml"));
+ writeToDisk(archive1);
+
+ JavaArchive archive2 = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws2634.jar");
+ archive2
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.jbws2634.shared.BeanIface.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2634.shared.BeanImpl.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2634.shared.handlers.TestHandler.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.AbstractEndpointImpl.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.EndpointIface.class);
+ writeToDisk(archive2);
+
+ JavaArchive archive3 = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws2634-ejb3.jar");
+ archive3
+ .setManifest(new StringAsset("Manifest-Version: 1.0\n"
+ + "Dependencies: org.jboss.logging\n"))
+ .addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.EJB3Bean.class)
+ .addAsResource("org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml")
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2634/META-INF/ejb-jar.xml"), "ejb-jar.xml");
+ writeToDisk(archive3);
+
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws2634.ear");
archive
- .setManifest(new StringAsset("Manifest-Version: 1.0\n"
- + "Dependencies: org.jboss.logging\n"))
- .addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.POJOBean.class)
- .addAsResource("org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml")
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2634/WEB-INF/web.xml"));
- }
- });
- JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws2634.jar") { {
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.jbws2634.shared.BeanIface.class)
- .addClass(org.jboss.test.ws.jaxws.jbws2634.shared.BeanImpl.class)
- .addClass(org.jboss.test.ws.jaxws.jbws2634.shared.handlers.TestHandler.class)
- .addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.AbstractEndpointImpl.class)
- .addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.EndpointIface.class);
- }
- });
- JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws2634-ejb3.jar") { {
- archive
- .setManifest(new StringAsset("Manifest-Version: 1.0\n"
- + "Dependencies: org.jboss.logging\n"))
- .addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.EJB3Bean.class)
- .addAsResource("org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml")
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2634/META-INF/ejb-jar.xml"), "ejb-jar.xml");
- }
- });
- JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws2634.ear") { {
- archive
.addManifest()
.addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2634/META-INF/application.xml"), "application.xml")
.addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws2634-pojo.war"))
.addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws2634-ejb3.jar"))
.addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws2634.jar"));
- }
- });
+ return archive;
}
-
- public static Test suite()
+
+ public static void writeToDisk(Archive archive)
{
- return new JBossWSTestSetup(JBWS2634TestCase.class, "jaxws-jbws2634.ear");
+ File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName());
+ archive.as(ZipExporter.class).exportTo(file, true);
}
+ @Test
+ @RunAsClient
public void testPojoEndpointInjection() throws Exception
{
QName serviceName = new QName("http://jbossws.org/JBWS2634", "POJOService");
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2634-pojo/POJOService?wsdl");
+ URL wsdlURL = new URL(baseURL + "/POJOService?wsdl");
Service service = Service.create(wsdlURL, serviceName);
EndpointIface proxy = (EndpointIface)service.getPort(EndpointIface.class);
assertEquals("Hello World!:Inbound:TestHandler:POJOBean:Outbound:TestHandler", proxy.echo("Hello World!"));
}
+ @Test
+ @RunAsClient
public void testEjb3EndpointInjection() throws Exception
{
QName serviceName = new QName("http://jbossws.org/JBWS2634", "EJB3Service");
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2634-ejb3/EJB3Service?wsdl");
+ URL wsdlURL = new URL("http://" + baseURL.getHost() + ":8080//jaxws-jbws2634-ejb3/EJB3Service?wsdl");
Service service = Service.create(wsdlURL, serviceName);
EndpointIface proxy = (EndpointIface)service.getPort(EndpointIface.class);
10 years, 12 months
- 1
- 0
JBossWS SVN: r19264 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-12-25 17:37:59 -0500 (Thu, 25 Dec 2014)
New Revision: 19264
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java
Log:
arquillian migration jbws1581 test
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java 2014-12-25 21:37:59 UTC (rev 19263)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java 2014-12-25 22:37:59 UTC (rev 19264)
@@ -28,7 +28,18 @@
import javax.wsdl.Definition;
import javax.wsdl.factory.WSDLFactory;
-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.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.arquillian.container.test.api.Deployer;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
@@ -42,80 +53,106 @@
* @author Thomas.Diesler(a)jboss.com
* @since 19-Mar-2007
*/
+(a)RunWith(Arquillian.class)
public class JBWS1581TestCase extends JBossWSTest
{
- static {
- JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-jbws1581-pojo.war") { {
+ private static final String WAR_DEPLOYMENT = "jaxws-jbws1581-pojo";
+ private static final String EAR_DEPLOYMENT = "jaxws-jbws1581";
+
+ @ArquillianResource
+ private URL baseURL;
+
+ @ArquillianResource
+ Deployer deployer;
+
+ @Deployment(name = WAR_DEPLOYMENT, testable = false, managed = false)
+ public static WebArchive createDeployment1() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, WAR_DEPLOYMENT + ".war");
archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointBean.class)
- .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointInterface.class)
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1581/WEB-INF/web.xml"));
- }
- });
- JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws1581-ejb3.jar") { {
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointBean.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointInterface.class)
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1581/WEB-INF/web.xml"));
+ writeToDisk(archive);
+ return archive;
+ }
+
+ @Deployment(testable = false)
+ public static JavaArchive createDeployment2() {
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws1581-ejb3.jar");
archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.jbws1581.EJB3Bean.class)
- .addClass(org.jboss.test.ws.jaxws.jbws1581.EJB3Remote.class)
- .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointInterface.class)
- .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointService.class)
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1581/META-INF/permissions.xml"), "permissions.xml")
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl"), "wsdl/TestService.wsdl");
- }
- });
- JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws1581.ear") { {
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.jbws1581.EJB3Bean.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws1581.EJB3Remote.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointInterface.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointService.class)
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1581/META-INF/permissions.xml"), "permissions.xml")
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl"), "wsdl/TestService.wsdl");
+ return archive;
+ }
+
+ @Deployment(name = EAR_DEPLOYMENT, testable = false, managed = false)
+ public static JavaArchive createDeployment3() {
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, EAR_DEPLOYMENT + ".ear");
archive
- .addManifest()
- .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1581-pojo.war"));
- }
- });
+ .addManifest()
+ .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), WAR_DEPLOYMENT + ".war"));
+ return archive;
}
- public static Test suite()
+ public static void writeToDisk(WebArchive archive)
{
- return new JBossWSTestSetup(JBWS1581TestCase.class, "jaxws-jbws1581-ejb3.jar");
+ File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName());
+ archive.as(ZipExporter.class).exportTo(file, true);
}
-
+
+ @Test
+ @RunAsClient
public void testWSDLAccessWar() throws Exception {
try {
- JBossWSTestHelper.deploy("jaxws-jbws1581-pojo.war");
+ deployer.deploy(WAR_DEPLOYMENT);
internalTestWSDLAccess();
} finally {
- JBossWSTestHelper.undeploy("jaxws-jbws1581-pojo.war");
+ deployer.undeploy(WAR_DEPLOYMENT);
}
}
-
+
+ @Test
+ @RunAsClient
public void testEJBVehicleWar() throws Exception {
try {
- JBossWSTestHelper.deploy("jaxws-jbws1581-pojo.war");
+ deployer.deploy(WAR_DEPLOYMENT);
internalTestEJBVehicle();
} finally {
- JBossWSTestHelper.undeploy("jaxws-jbws1581-pojo.war");
+ deployer.undeploy(WAR_DEPLOYMENT);
}
}
+ @Test
+ @RunAsClient
public void testWSDLAccessEar() throws Exception {
try {
- JBossWSTestHelper.deploy("jaxws-jbws1581.ear");
+ deployer.deploy(EAR_DEPLOYMENT);
internalTestWSDLAccess();
} finally {
- JBossWSTestHelper.undeploy("jaxws-jbws1581.ear");
+ deployer.undeploy(EAR_DEPLOYMENT);
}
}
-
+
+ @Test
+ @RunAsClient
public void testEJBVehicleEar() throws Exception {
try {
- JBossWSTestHelper.deploy("jaxws-jbws1581.ear");
+ deployer.deploy(EAR_DEPLOYMENT);
internalTestEJBVehicle();
} finally {
- JBossWSTestHelper.undeploy("jaxws-jbws1581.ear");
+ deployer.undeploy(EAR_DEPLOYMENT);
}
}
private void internalTestWSDLAccess() throws Exception
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1581-pojo?wsdl");
+ URL wsdlURL = new URL(baseURL + "/jaxws-jbws1581-pojo?wsdl");
Definition wsdl = WSDLFactory.newInstance().newWSDLReader().readWSDL(wsdlURL.toString());
assertNotNull("wsdl expected", wsdl);
}
10 years, 12 months
- 1
- 0