Author: jim.ma Date: 2015-01-09 04:12:54 -0500 (Fri, 09 Jan 2015) New Revision: 19353 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase.java Log: Fix JBWS2937TestCase Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase.java 2015-01-09 08:10:17 UTC (rev 19352) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase.java 2015-01-09 09:12:54 UTC (rev 19353) @@ -21,7 +21,6 @@ */ package org.jboss.test.ws.jaxws.jbws2937; -import java.io.File; import java.io.StringReader; import java.net.URL; @@ -40,17 +39,18 @@ import javax.xml.ws.soap.AddressingFeature; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.logging.Logger; import org.jboss.shrinkwrap.api.ArchivePath; import org.jboss.shrinkwrap.api.Filter; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.exporter.ZipExporter; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.ws.common.DOMUtils; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.w3c.dom.Element; @@ -81,28 +81,10 @@ private UserType user; - //@ArquillianResource - //private URL baseURL; - - @Deployment(name="jaxws-jbws2937-client", order=2, testable = false) - public static JavaArchive createDeployment1() { - JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws2937-client.jar"); - archive - .addManifest() - .addPackages(false, new Filter<ArchivePath>() { - @Override - public boolean include(ArchivePath path) { - return !path.get().contains("TestCase"); - } - }, "org.jboss.test.ws.jaxws.jbws2937"); - - System.out.println("###: " + archive.toString(true) ); // rls debug - archive.as(ZipExporter.class).exportTo(new File("/tmp/u4/jaxws-jbws2937-client.jar"), true); // rls debug - - return archive; - } - - @Deployment(name="jaxws-jbws2937", order=1, testable = false) + @ArquillianResource + private URL baseURL; + + @Deployment(name="jaxws-jbws2937", testable = false) public static JavaArchive createDeployment2() { JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws2937.jar"); archive @@ -111,12 +93,11 @@ .addClass(org.jboss.test.ws.jaxws.jbws2937.UserType.class); return archive; } - - protected void setUp() throws Exception + @Before + public void setUp() throws Exception { super.setUp(); - - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2937" + "?wsdl"); + URL wsdlURL = new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-jbws2937" + "?wsdl"); this.service = EndpointService.create(wsdlURL, SERVICE_QNAME); this.proxy = (Endpoint)this.service.getPort(PORT_QNAME, Endpoint.class); this.epr = ((BindingProvider)this.proxy).getEndpointReference(); @@ -128,20 +109,16 @@ @Test @RunAsClient - @OperateOnDeployment("jaxws-jbws2937-client") public void testProxy() throws Exception { - setUp(); final UserType response = this.proxy.echo(this.user); assertEquals(this.user, response); } @Test @RunAsClient - @OperateOnDeployment("jaxws-jbws2937-client") public void testCreateDispatchUsingEPRAndSource() throws Exception { - setUp(); Dispatch<Source> dispatch = this.service.createDispatch(PORT_QNAME, Source.class, Mode.PAYLOAD); assertNotNull("Dispatch is null", dispatch); this.invokeSourceDispatch(dispatch); @@ -163,10 +140,8 @@ @Test @RunAsClient - @OperateOnDeployment("jaxws-jbws2937-client") public void testCreateDispatchUsingEPRAndJAXBContext() throws Exception { - setUp(); Dispatch<Object> dispatch = this.service.createDispatch(PORT_QNAME, this.createJAXBContext(), Mode.PAYLOAD); assertNotNull("Dispatch is null", dispatch); this.invokeObjectDispatch(dispatch);