Author: rsearls Date: 2015-01-03 15:36:05 -0500 (Sat, 03 Jan 2015) New Revision: 19316 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEJB3TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionHelper.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionServletTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java Log: arquillian migration exception test Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEJB3TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEJB3TestCase.java 2015-01-03 17:22:11 UTC (rev 19315) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEJB3TestCase.java 2015-01-03 20:36:05 UTC (rev 19316) @@ -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.JavaArchive; import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; @@ -37,11 +46,12 @@ * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> * @author alessio.soldano(a)jboss.com */ +(a)RunWith(Arquillian.class) public class ExceptionEJB3TestCase extends ExceptionTestCase { - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.JarDeployment("jaxws-samples-exception.jar") { { + @Deployment(name="jaxws-samples-exception", testable = false) + public static JavaArchive createDeployment() { + JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-samples-exception.jar"); archive .addManifest() .addClass(org.jboss.test.ws.jaxws.samples.exception.server.EndpointImpl.class) @@ -60,16 +70,9 @@ .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowSoapFaultExceptionResponse.class) .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.UserExceptionBean.class) .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/exception/META-INF/permissions.xml"), "permissions.xml"); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + return archive; } - public static Test suite() - { - return new JBossWSTestSetup(ExceptionEJB3TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - protected ExceptionHelper getHelper() { return new ExceptionEJB3Helper("http://" + getServerHost() + ":8080/jaxws-samples-exception/ExceptionEndpointEJB3Impl"); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionHelper.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionHelper.java 2015-01-03 17:22:11 UTC (rev 19315) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionHelper.java 2015-01-03 20:36:05 UTC (rev 19316) @@ -32,6 +32,8 @@ import org.jboss.test.ws.jaxws.samples.exception.client.UserException; import org.jboss.test.ws.jaxws.samples.exception.client.UserException_Exception; import org.w3c.dom.Element; +import org.junit.Test; +import org.jboss.arquillian.container.test.api.RunAsClient; public class ExceptionHelper implements ClientHelper { @@ -74,6 +76,8 @@ * 1. Serialized service specific exception (see WrapperException.getFaultInfo() in section 2.5) * 2. SOAPFaultException.getFault().getDetail() */ + @Test + @RunAsClient public void testRuntimeException() throws Exception { try @@ -88,6 +92,8 @@ } } + @Test + @RunAsClient public void testSoapFaultException() throws Exception { try @@ -105,6 +111,8 @@ } } + @Test + @RunAsClient public void testApplicationException() throws Exception { try Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionServletTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionServletTestCase.java 2015-01-03 17:22:11 UTC (rev 19315) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionServletTestCase.java 2015-01-03 20:36:05 UTC (rev 19316) @@ -26,58 +26,69 @@ import java.util.LinkedList; import java.util.List; -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.shrinkwrap.api.spec.JavaArchive; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; + import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; +(a)RunWith(Arquillian.class) public class ExceptionServletTestCase extends JBossWSTest { - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-exception-client.war") { { - archive - .addManifest() - .addClass(org.jboss.test.helper.ClientHelper.class) - .addClass(org.jboss.test.helper.TestServlet.class) - .addClass(org.jboss.test.ws.jaxws.samples.exception.ExceptionHelper.class) - .addClass(org.jboss.test.ws.jaxws.samples.exception.SOAP12ExceptionHelper.class) - .addPackage("org.jboss.test.ws.jaxws.samples.exception.client"); - } - }); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-exception-jse.war") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.samples.exception.server.EndpointImpl.class) - .addClass(org.jboss.test.ws.jaxws.samples.exception.server.ExceptionEndpoint.class) - .addClass(org.jboss.test.ws.jaxws.samples.exception.server.ExceptionEndpointImpl.class) - .addClass(org.jboss.test.ws.jaxws.samples.exception.server.SOAP12EndpointImpl.class) - .addClass(org.jboss.test.ws.jaxws.samples.exception.server.SOAP12ExceptionEndpointImpl.class) - .addClass(org.jboss.test.ws.jaxws.samples.exception.server.ServerHandler.class) - .addClass(org.jboss.test.ws.jaxws.samples.exception.server.UserException.class) - .addAsResource("org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml") - .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowApplicationException.class) - .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowApplicationExceptionResponse.class) - .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowRuntimeException.class) - .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowRuntimeExceptionResponse.class) - .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowSoapFaultException.class) - .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowSoapFaultExceptionResponse.class) - .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.UserExceptionBean.class) - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/exception/META-INF/permissions.xml"), "permissions.xml") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/exception/WEB-INF/web.xml")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @Deployment(name="jaxws-samples-exception-client", testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-exception-client.war"); + archive + .addManifest() + .addClass(org.jboss.test.helper.ClientHelper.class) + .addClass(org.jboss.test.helper.TestServlet.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.ExceptionHelper.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.SOAP12ExceptionHelper.class) + .addPackage("org.jboss.test.ws.jaxws.samples.exception.client"); + return archive; } - public static Test suite() - { - return new JBossWSTestSetup(ExceptionServletTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); + @Deployment(name = "jaxws-samples-exception-jse", testable = false) + public static WebArchive createDeployment1() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-exception-jse.war"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.ExceptionEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.ExceptionEndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.SOAP12EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.SOAP12ExceptionEndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.ServerHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.UserException.class) + .addAsResource("org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml") + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowApplicationException.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowApplicationExceptionResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowRuntimeException.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowRuntimeExceptionResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowSoapFaultException.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowSoapFaultExceptionResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.UserExceptionBean.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/exception/META-INF/permissions.xml"), "permissions.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/exception/WEB-INF/web.xml")); + return archive; } - + + @Test + @RunAsClient + @OperateOnDeployment("jaxws-samples-exception-client") public void testRuntimeException() throws Exception { assertEquals("1", runTestInContainer("testRuntimeException")); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2015-01-03 17:22:11 UTC (rev 19315) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2015-01-03 20:36:05 UTC (rev 19316) @@ -24,10 +24,20 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.PrintStream; +import java.lang.System; 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.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; @@ -39,11 +49,12 @@ * * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> */ +(a)RunWith(Arquillian.class) public class ExceptionTestCase extends JBossWSTest { - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-exception-jse-plain.war") { { + @Deployment(name="jaxws-samples-exception-jse-plain", testable = false) + public static WebArchive createDeployments() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-exception-jse-plain.war"); archive .addManifest() .addClass(org.jboss.test.ws.jaxws.samples.exception.server.EndpointImpl.class) @@ -63,16 +74,11 @@ .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.UserExceptionBean.class) .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/exception/META-INF/permissions.xml"), "permissions.xml") .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/exception/WEB-INF/web.xml")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + return archive; } - public static Test suite() - { - return new JBossWSTestSetup(ExceptionTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testRuntimeException() throws Exception { try @@ -85,6 +91,8 @@ } } + @Test + @RunAsClient public void testSoapFaultException() throws Exception { try @@ -97,6 +105,8 @@ } } + @Test + @RunAsClient public void testApplicationException() throws Exception { try @@ -108,7 +118,9 @@ fail(e); } } - + + @Test + @RunAsClient public void testSOAP12RuntimeException() throws Exception { try @@ -121,6 +133,8 @@ } } + @Test + @RunAsClient public void testSOAP12SoapFaultException() throws Exception { try @@ -133,6 +147,8 @@ } } + @Test + @RunAsClient public void testSOAP12ApplicationException() throws Exception { try