Author: rsearls Date: 2014-12-20 15:18:59 -0500 (Sat, 20 Dec 2014) New Revision: 19166 Removed: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/ArchiveDeployment.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/EndpointImpl.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/ExtManagedProcessor.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MyManagedProcessor.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MyManagedProcessorMBean.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/jaxws-handlers-server.xml Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java Log: arquillian conversion recording tests Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/ArchiveDeployment.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/ArchiveDeployment.java 2014-12-20 20:17:21 UTC (rev 19165) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/ArchiveDeployment.java 2014-12-20 20:18:59 UTC (rev 19166) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2014, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.management.recording; - -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.wsf.test.JBossWSTestHelper; - -public final class ArchiveDeployment -{ - public static final String NAME = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("management-recording-as7.jar") { { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.logging\n")) - .addClass(org.jboss.test.ws.management.recording.Endpoint.class) - .addClass(org.jboss.test.ws.management.recording.EndpointWithConfigImpl.class); - } - }); - - private ArchiveDeployment() { - //NOOP - } -} Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java 2014-12-20 20:17:21 UTC (rev 19165) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java 2014-12-20 20:18:59 UTC (rev 19166) @@ -22,15 +22,27 @@ package org.jboss.test.ws.management.recording; import java.net.URL; +import java.io.File; import javax.management.MBeanServerConnection; import javax.management.ObjectName; import javax.xml.namespace.QName; import javax.xml.ws.Service; +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.shrinkwrap.api.exporter.ZipExporter; + import org.jboss.ws.api.monitoring.RecordProcessor; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.runner.RunWith; +import org.junit.Test; /** * This test case shows how to dynamically add a custom record processor @@ -39,40 +51,37 @@ * @author alessio.soldano(a)jboss.com * @since 6-Aug-2008 */ +(a)RunWith(Arquillian.class) public class CustomRecordProcessorTestCase extends JBossWSTest { - private final String endpointURL = "http://" + getServerHost() + ":8080/management-recording/EndpointImpl"; - private final String targetNS = "http://recording.management.ws.test.jboss.org/"; - private String endpointObjectName; + private final String endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl"; - @Override - protected void setUp() throws Exception - { - endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl"; - JBossWSTestHelper.deploy(ArchiveDeployment.NAME); - } + @ArquillianResource + private URL baseURL; - @Override - protected void tearDown() throws Exception - { - JBossWSTestHelper.undeploy(ArchiveDeployment.NAME); + @Deployment(testable = false) + public static JavaArchive createDeployment() { + JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "management-recording-as7.jar"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.management.recording.Endpoint.class) + .addClass(org.jboss.test.ws.management.recording.EndpointWithConfigImpl.class); + return archive; } + @Test + @RunAsClient public void testAddCustomProcessor() throws Exception { - URL wsdlURL = new URL(endpointURL + "?wsdl"); - QName serviceName = new QName(targetNS, "EndpointService"); + URL wsdlURL = new URL(baseURL + "/management-recording/EndpointImpl?wsdl"); + QName serviceName = new QName("http://recording.management.ws.test.jboss.org/";, "EndpointService"); Service service = Service.create(wsdlURL, serviceName); @SuppressWarnings("unused") Endpoint port = service.getPort(Endpoint.class); System.out.println("FIXME: [JBWS-3330] RMI class loader disabled / CNFE with remote classloader");//FIXME [JBWS-3330] RMI class loader disabled / CNFE with remote classloader -// addCustomProcessor(); -// Object retObj = port.echo1("Hello"); -// assertEquals("Hello", retObj); -// checkCustomProcessorJob(); } - + /********** @SuppressWarnings("unused") private void addCustomProcessor() throws Exception { @@ -94,4 +103,5 @@ assertEquals(1, server.getAttribute(oname, "Size")); assertEquals("Attribute value", server.getAttribute(oname, "Attribute")); } + **********/ } Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/EndpointImpl.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/EndpointImpl.java 2014-12-20 20:17:21 UTC (rev 19165) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/EndpointImpl.java 2014-12-20 20:18:59 UTC (rev 19166) @@ -1,53 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.management.recording; - -import javax.ejb.Stateless; -import javax.jws.WebService; - -import org.jboss.logging.Logger; -import org.jboss.ws.api.annotation.WebContext; - -/** - * author alessio.soldano(a)jboss.org - * @since 06-Aug-2008 - */ -@Stateless -@WebService(serviceName="EndpointService", endpointInterface = "org.jboss.test.ws.management.recording.Endpoint") -@WebContext(contextRoot="/management-recording", urlPattern="/EndpointImpl") -public class EndpointImpl -{ - // Provide logging - private static Logger log = Logger.getLogger(EndpointImpl.class); - - public String echo1(String input) - { - log.info("echo1: " + input); - return input; - } - - public String echo2(String input) - { - log.info("echo2: " + input); - return input; - } -} Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.java 2014-12-20 20:17:21 UTC (rev 19165) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.java 2014-12-20 20:18:59 UTC (rev 19166) @@ -1,55 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.management.recording; - -import javax.ejb.Stateless; -import javax.jws.HandlerChain; -import javax.jws.WebService; - -import org.jboss.logging.Logger; -import org.jboss.ws.api.annotation.WebContext; - -/** - * @author alessio.soldano(a)jboss.org - * @since 06-Aug-2008 - */ -@Stateless -@WebService(serviceName="EndpointService", endpointInterface = "org.jboss.test.ws.management.recording.Endpoint") -(a)HandlerChain(file=&quot;jaxws-handlers-server.xml&quot;) -@WebContext(contextRoot="/management-recording", urlPattern="/EndpointImpl") -public class EndpointWithHandlerImpl -{ - // Provide logging - private static Logger log = Logger.getLogger(EndpointWithHandlerImpl.class); - - public String echo1(String input) - { - log.info("echo1: " + input); - return input; - } - - public String echo2(String input) - { - log.info("echo2: " + input); - return input; - } -} Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/ExtManagedProcessor.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/ExtManagedProcessor.java 2014-12-20 20:17:21 UTC (rev 19165) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/ExtManagedProcessor.java 2014-12-20 20:18:59 UTC (rev 19166) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.management.recording; - -import java.io.Serializable; - -public class ExtManagedProcessor extends MyManagedProcessor implements Serializable { - - private static final long serialVersionUID = 908532514661675105L; - private String extAttribute; - - public String getExtAttribute() { - return extAttribute; - } - - public void setExtAttribute(String extAttribute) { - this.extAttribute = extAttribute; - } -} Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2014-12-20 20:17:21 UTC (rev 19165) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2014-12-20 20:18:59 UTC (rev 19166) @@ -21,10 +21,12 @@ */ package org.jboss.test.ws.management.recording; +import java.lang.System; import java.net.URL; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.io.File; import javax.management.Attribute; import javax.management.MBeanServerConnection; @@ -40,32 +42,45 @@ import org.jboss.ws.common.monitoring.OperationFilter; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.arquillian.container.test.api.Deployment; +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.shrinkwrap.api.exporter.ZipExporter; +import org.junit.runner.RunWith; +import org.jboss.arquillian.container.test.api.RunAsClient; +import org.junit.Test; + /** * This tests the MemoryBufferRecorder * * @author alessio.soldano(a)jboss.com * @since 7-Aug-2008 */ +(a)RunWith(Arquillian.class) public class MemoryBufferRecorderTestCase extends JBossWSTest { - private final String endpointURL = "http://" + getServerHost() + ":8080/management-recording/EndpointImpl"; private final String targetNS = "http://recording.management.ws.test.jboss.org/"; - private String endpointObjectName; - - @Override - protected void setUp() throws Exception - { - endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl"; - JBossWSTestHelper.deploy(ArchiveDeployment.NAME); + private final String endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl"; + + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static JavaArchive createDeployment() { + JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "management-recording-as7.jar"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.management.recording.Endpoint.class) + .addClass(org.jboss.test.ws.management.recording.EndpointWithConfigImpl.class); + return archive; } - @Override - protected void tearDown() throws Exception - { - JBossWSTestHelper.undeploy(ArchiveDeployment.NAME); - } - + @Test + @RunAsClient public void testRecording() throws Exception { Endpoint port = getPort(); @@ -82,6 +97,8 @@ assertEquals(3, endSize - startSize); } + @Test + @RunAsClient @SuppressWarnings("unchecked") public void testGetRecordsByOperation() throws Exception { @@ -122,7 +139,8 @@ } } - + @Test + @RunAsClient @SuppressWarnings("unchecked") public void testGetRecordsByClientHost() throws Exception { @@ -145,7 +163,9 @@ assertTrue("No records for " + host, localhostRecords.size() > 0); assertTrue("There are records for 72.21.203.1", amazonRecords.size() == 0); } - + + @Test + @RunAsClient @SuppressWarnings("unchecked") public void testGetMatchingRecords() throws Exception { @@ -173,6 +193,8 @@ assertEquals(1, stopRecords.keySet().size() - startRecords.keySet().size()); } + @Test + @RunAsClient public void testAddRemoveFilter() throws Exception { Endpoint port = getPort(); @@ -225,7 +247,7 @@ private Endpoint getPort() throws Exception { - URL wsdlURL = new URL(endpointURL + "?wsdl"); + URL wsdlURL = new URL(baseURL + "/management-recording/EndpointImpl?wsdl"); QName serviceName = new QName(targetNS, "EndpointService"); Service service = Service.create(wsdlURL, serviceName); return service.getPort(Endpoint.class); Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MyManagedProcessor.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MyManagedProcessor.java 2014-12-20 20:17:21 UTC (rev 19165) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MyManagedProcessor.java 2014-12-20 20:18:59 UTC (rev 19166) @@ -1,42 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.management.recording; - -import java.io.Serializable; - -import org.jboss.ws.common.monitoring.MemoryBufferRecorder; - -public class MyManagedProcessor extends MemoryBufferRecorder implements MyManagedProcessorMBean, Serializable { - - private static final long serialVersionUID = 8403680807812334470L; - private String attribute; - - @Override - public String getAttribute() { - return attribute; - } - - @Override - public void setAttribute(String attribute) { - this.attribute = attribute; - } -} Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MyManagedProcessorMBean.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MyManagedProcessorMBean.java 2014-12-20 20:17:21 UTC (rev 19165) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MyManagedProcessorMBean.java 2014-12-20 20:18:59 UTC (rev 19166) @@ -1,31 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.management.recording; - -import org.jboss.ws.common.monitoring.MemoryBufferRecorderMBean; - -public interface MyManagedProcessorMBean extends MemoryBufferRecorderMBean -{ - public String getAttribute(); - public void setAttribute(String attribute); - -} Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/jaxws-handlers-server.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/jaxws-handlers-server.xml 2014-12-20 20:17:21 UTC (rev 19165) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/jaxws-handlers-server.xml 2014-12-20 20:18:59 UTC (rev 19166) @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <handler> - <handler-name>Recording Handler</handler-name> - <handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</handler-class> - </handler> - </handler-chain> -</handler-chains> \ No newline at end of file