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&gt; * @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);