Author: rsearls Date: 2014-12-24 15:55:00 -0500 (Wed, 24 Dec 2014) New Revision: 19256 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java Log: arquillian migration jbws1505 test Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java 2014-12-24 20:48:37 UTC (rev 19255) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java 2014-12-24 20:55:00 UTC (rev 19256) @@ -31,7 +31,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.JavaArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; @@ -41,38 +49,35 @@ /** * [JBWS-1505] Verify wsdl generation on SEI inheritance. */ +(a)RunWith(Arquillian.class) public class JBWS1505TestCase extends JBossWSTest { private final String targetNS = "http://org.jboss.test.ws/jbws1505"; private Interface2 port; private URL wsdlURL; - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1505.jar") { { + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static JavaArchive createDeployments() { + JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws1505.jar"); archive .addManifest() .addClass(org.jboss.test.ws.jaxws.jbws1505.CustomType.class) .addClass(org.jboss.test.ws.jaxws.jbws1505.Interface1.class) .addClass(org.jboss.test.ws.jaxws.jbws1505.Interface2.class) .addClass(org.jboss.test.ws.jaxws.jbws1505.JBWS1505EndpointImpl.class); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + return archive; } - public static Test suite() - { - return new JBossWSTestSetup(JBWS1505TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - @Override protected void setUp() throws Exception { super.setUp(); QName serviceName = new QName(targetNS, "JBWS1505Service"); - wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1505/JBWS1505Service/JBWS1505EndpointImpl?wsdl"); + wsdlURL = new URL(baseURL + "/jaxws-jbws1505/JBWS1505Service/JBWS1505EndpointImpl?wsdl"); Service service = Service.create(wsdlURL, serviceName); port = service.getPort(Interface2.class); @@ -91,14 +96,18 @@ * * @throws Exception */ + @Test + @RunAsClient public void testWSDLGeneration() throws Exception { + setUp(); Definition wsdl = WSDLFactory.newInstance().newWSDLReader().readWSDL(wsdlURL.toString()); Map<?, ?> services = wsdl.getAllServices(); assertTrue(services.size() == 1); // a simple port javax.wsdl.Service service = (javax.wsdl.Service)services.values().iterator().next(); javax.wsdl.Port port = (javax.wsdl.Port)service.getPorts().values().iterator().next(); assertTrue(port.getBinding().getBindingOperations().size() == 5); // with five op's + tearDown(); } /** @@ -107,10 +116,14 @@ * * @throws Exception */ + @Test + @RunAsClient public void testTypeInheritance() throws Exception { + setUp(); CustomType ct = port.getCustomType(); assertTrue(ct.getMember1() == 1); assertTrue(ct.getMember2() == 2); + tearDown(); } }