Author: rsearls Date: 2014-12-21 19:25:41 -0500 (Sun, 21 Dec 2014) New Revision: 19171 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java Log: arquillian conversion jbws1702 test Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java 2014-12-22 00:00:30 UTC (rev 19170) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java 2014-12-22 00:25:41 UTC (rev 19171) @@ -24,6 +24,7 @@ import static org.jboss.wsf.test.JBossWSTestHelper.getTestResourcesDir; import java.io.File; +import java.lang.System; import java.net.URL; import java.util.LinkedList; import java.util.List; @@ -32,7 +33,15 @@ import javax.xml.ws.BindingProvider; 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.jbws1702.types.ClassB; import org.jboss.test.ws.jaxws.jbws1702.types.ClassC; @@ -48,40 +57,39 @@ * * @author Heiko.Braun(a)jboss.com */ +(a)RunWith(Arquillian.class) public class JBWS1702TestCase extends JBossWSTest { - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws1702.war") { { + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployments() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws1702.war"); archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.jbws1702.JBWS1702TestCase.class) - .addClass(org.jboss.test.ws.jaxws.jbws1702.SampleWSBareSEI.class) - .addClass(org.jboss.test.ws.jaxws.jbws1702.SampleWSRpcSEI.class) - .addClass(org.jboss.test.ws.jaxws.jbws1702.SampleWSWithDocument_Bare.class) - .addClass(org.jboss.test.ws.jaxws.jbws1702.SampleWSWithDocument_Wrapped.class) - .addClass(org.jboss.test.ws.jaxws.jbws1702.SampleWSWithRPC_Bare.class) - .addClass(org.jboss.test.ws.jaxws.jbws1702.SampleWSWrappedSEI.class) - .addClass(org.jboss.test.ws.jaxws.jbws1702.types.ClassA.class) - .addClass(org.jboss.test.ws.jaxws.jbws1702.types.ClassB.class) - .addClass(org.jboss.test.ws.jaxws.jbws1702.types.ClassC.class) - .addClass(org.jboss.test.ws.jaxws.jbws1702.types.ResponseWrapperB.class) - .addClass(org.jboss.test.ws.jaxws.jbws1702.types.ResponseWrapperC.class) - .addAsWebInfResource(new File(getTestResourcesDir() + "/jaxws/jbws1702/WEB-INF/jboss-web.xml"), "jboss-web.xml") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1702/WEB-INF/web.xml")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1702.JBWS1702TestCase.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.SampleWSBareSEI.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.SampleWSRpcSEI.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.SampleWSWithDocument_Bare.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.SampleWSWithDocument_Wrapped.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.SampleWSWithRPC_Bare.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.SampleWSWrappedSEI.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.types.ClassA.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.types.ClassB.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.types.ClassC.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.types.ResponseWrapperB.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.types.ResponseWrapperC.class) + .addAsWebInfResource(new File(getTestResourcesDir() + "/jaxws/jbws1702/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1702/WEB-INF/web.xml")); + return archive; } - public static Test suite() - { - return new JBossWSTestSetup(JBWS1702TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testInheritanceRpc() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1702/SampleWSWithRPC_Bare?wsdl"); + URL wsdlURL = new URL(baseURL + "SampleWSWithRPC_Bare?wsdl"); QName serviceName = new QName("http://jbws1702.jaxws.ws.test.jboss.org/";, "SampleWSWithRPC_BareService"); Service service = Service.create(wsdlURL, serviceName); @@ -90,9 +98,11 @@ assertTrue("Should be an instance of ClassC, but was " + b, (b instanceof ClassC)); } + @Test + @RunAsClient public void testInheritanceBare() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1702/SampleWSWithDocument_Bare?wsdl"); + URL wsdlURL = new URL(baseURL + "SampleWSWithDocument_Bare?wsdl"); QName serviceName = new QName("http://jbws1702.jaxws.ws.test.jboss.org/";, "SampleWSWithDocument_BareService"); Service service = Service.create(wsdlURL, serviceName); @@ -107,9 +117,11 @@ assertNotNull(wrapperC.getData()); } + @Test + @RunAsClient public void testInheritanceWrapped() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1702/SampleWSWithDocument_Wrapped?wsdl"); + URL wsdlURL = new URL(baseURL + "SampleWSWithDocument_Wrapped?wsdl"); QName serviceName = new QName("http://jbws1702.jaxws.ws.test.jboss.org/";, "SampleWSWithDocument_WrappedService"); Service service = Service.create(wsdlURL, serviceName);