Author: rsearls Date: 2014-12-24 14:01:22 -0500 (Wed, 24 Dec 2014) New Revision: 19243 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java Log: arquillian migration jbws2934 test Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java 2014-12-24 17:21:07 UTC (rev 19242) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java 2014-12-24 19:01:22 UTC (rev 19243) @@ -29,13 +29,15 @@ import org.jboss.logging.Logger; import org.jboss.wsf.test.JBossWSTest; +import org.junit.Test; +import org.jboss.arquillian.container.test.api.RunAsClient; /** * [JBWS-2934] WebServiceContext implementation have to be ThreadLocal aware. * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ -abstract class AbstractTestCase extends JBossWSTest +public abstract class AbstractTestCase extends JBossWSTest { private static final int THREADS_COUNT = 20; private static final int REQUESTS_COUNT = 20; @@ -63,8 +65,11 @@ } } + @Test + @RunAsClient public void testEndpointConcurrently() throws Exception { + setUp(); boolean traceEnabled = log.isTraceEnabled(); for (int i = 0; i < THREADS_COUNT; i++) { Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java 2014-12-24 17:21:07 UTC (rev 19242) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java 2014-12-24 19:01:22 UTC (rev 19243) @@ -23,8 +23,17 @@ import java.util.LinkedList; import java.util.List; +import java.net.URL; -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.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; @@ -35,31 +44,26 @@ * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ +(a)RunWith(Arquillian.class) public final class JBWS2934EJBTestCase extends AbstractTestCase { - private final String ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2934-ejb"; - - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws2934-ejb.jar") { { + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static JavaArchive createDeployments() { + JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws2934-ejb.jar"); archive .addManifest() .addClass(org.jboss.test.ws.jaxws.jbws2934.AbstractEndpoint.class) .addClass(org.jboss.test.ws.jaxws.jbws2934.Endpoint.class) .addClass(org.jboss.test.ws.jaxws.jbws2934.EndpointEJB.class); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + return archive; } - - public static Test suite() - { - return new JBossWSTestSetup(JBWS2934EJBTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } @Override protected String getEndpointAddress() { - return ENDPOINT_ADDRESS; + return baseURL.toString() + "/jaxws-jbws2934-ejb"; } } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java 2014-12-24 17:21:07 UTC (rev 19242) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java 2014-12-24 19:01:22 UTC (rev 19243) @@ -24,8 +24,17 @@ import java.io.File; import java.util.LinkedList; import java.util.List; +import java.net.URL; -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.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; @@ -36,32 +45,27 @@ * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ +(a)RunWith(Arquillian.class) public final class JBWS2934JSETestCase extends AbstractTestCase { - private final String ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2934-jse"; - - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2934-jse.war") { { + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployments() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws2934-jse.war"); archive .addManifest() .addClass(org.jboss.test.ws.jaxws.jbws2934.AbstractEndpoint.class) .addClass(org.jboss.test.ws.jaxws.jbws2934.Endpoint.class) .addClass(org.jboss.test.ws.jaxws.jbws2934.EndpointJSE.class) .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2934/WEB-INF/web.xml")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + return archive; } - - public static Test suite() - { - return new JBossWSTestSetup(JBWS2934JSETestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } @Override protected String getEndpointAddress() { - return ENDPOINT_ADDRESS; + return baseURL.toString(); } }