December 2014 - jbossws-commits - Jboss List Archives

JBossWS SVN: r19123 - stack/cxf/branches/arquillian.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-12-04 09:27:34 -0500 (Thu, 04 Dec 2014) New Revision: 19123 Modified: stack/cxf/branches/arquillian/pom.xml Log: Require Maven 3.2.2 or greater (because of upcoming build changes) Modified: stack/cxf/branches/arquillian/pom.xml =================================================================== --- stack/cxf/branches/arquillian/pom.xml 2014-12-03 23:04:58 UTC (rev 19122) +++ stack/cxf/branches/arquillian/pom.xml 2014-12-04 14:27:34 UTC (rev 19123) @@ -1343,6 +1343,26 @@ <autoVersionSubmodules>true</autoVersionSubmodules> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.3.1</version> + <executions> + <execution> + <id>enforce-maven</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireMavenVersion> + <version>[3.2.2,)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build>

9 years, 5 months

1
0
0 / 0

JBossWS SVN: r19122 - in stack/cxf/branches/arquillian: modules/testsuite and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-12-03 18:04:58 -0500 (Wed, 03 Dec 2014) New Revision: 19122 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml stack/cxf/branches/arquillian/modules/testsuite/pom.xml stack/cxf/branches/arquillian/pom.xml Log: Restoring 'fast' profile Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2014-12-03 22:25:58 UTC (rev 19121) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2014-12-03 23:04:58 UTC (rev 19122) @@ -257,6 +257,61 @@ </build> </profile> +  + <profile> + <id>fast</id> + <build> + <plugins> + <plugin> + <groupId>org.wildfly.plugins</groupId> + <artifactId>wildfly-maven-plugin</artifactId> + <executions> + <execution> + <id>jboss</id> + <phase>pre-integration-test</phase> + <goals> + <goal>start</goal> + </goals> + <configuration> + <jvmArgs>-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m</jvmArgs> + <serverConfig>jbws-testsuite-default.xml</serverConfig> + <jbossHome>${jboss.home}</jbossHome> + <port>9990</port> + </configuration> + </execution> + <execution> + <id>ssl-mutual-auth</id> + <phase>pre-integration-test</phase> + <goals> + <goal>start</goal> + </goals> + <configuration> + <jvmArgs>-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=10000</jvmArgs> + <serverConfig>jbws-testsuite-ssl-mutual-auth.xml</serverConfig> + <jbossHome>${jboss.home}</jbossHome> + <port>19990</port> + </configuration> + </execution> + <execution> + <id>default-config-tests</id> + <phase>pre-integration-test</phase> + <goals> + <goal>start</goal> + </goals> + <configuration> + <jvmArgs>-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=20000</jvmArgs> + <serverConfig>jbws-testsuite-default-config-tests.xml</serverConfig> + <jbossHome>${jboss.home}</jbossHome> + <port>29990</port> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml 2014-12-03 22:25:58 UTC (rev 19121) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml 2014-12-03 23:04:58 UTC (rev 19122) @@ -17,7 +17,7 @@ <container qualifier="ssl-mutual-auth" mode="manual"> <configuration> <property name="jbossHome">${jboss.home}</property> - <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=10000</property> + <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=10000</property> <property name="serverConfig">jbws-testsuite-ssl-mutual-auth.xml</property> <property name="allowConnectingToRunningServer">true</property> <property name="managementPort">${as.managementPort:19990}</property> @@ -29,7 +29,7 @@ <container qualifier="default-config-tests" mode="manual"> <configuration> <property name="jbossHome">${jboss.home}</property> - <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=20000</property> + <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=20000</property> <property name="serverConfig">jbws-testsuite-default-config-tests.xml</property> <property name="allowConnectingToRunningServer">true</property> <property name="managementPort">${as.managementPort:29990}</property> Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2014-12-03 22:25:58 UTC (rev 19121) +++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2014-12-03 23:04:58 UTC (rev 19122) @@ -631,7 +631,6 @@ <profile> <id>wildfly800</id> <properties> - <jboss.version>${wildfly800.version}</jboss.version> <jbossws.integration.target>wildfly800</jbossws.integration.target> <remote.port>8080</remote.port> <remote.protocol>http-remoting</remote.protocol> @@ -641,6 +640,25 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-wildfly800-tests-integration</artifactId> </dependency> +  + <dependency> + <groupId>org.wildfly.arquillian</groupId> + <artifactId>wildfly-arquillian-container-managed</artifactId> + <version>1.0.0.Alpha2</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.jboss.slf4j</groupId> + <artifactId>slf4j-jboss-logmanager</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.protocol</groupId> + <artifactId>arquillian-protocol-servlet</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency>  <dependency> <groupId>org.littleshoot</groupId> @@ -713,7 +731,6 @@ <profile> <id>wildfly810</id> <properties> - <jboss.version>${wildfly810.version}</jboss.version> <jbossws.integration.target>wildfly810</jbossws.integration.target> <remote.port>8080</remote.port> <remote.protocol>http-remoting</remote.protocol> @@ -723,6 +740,25 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-wildfly810-tests-integration</artifactId> </dependency> +  + <dependency> + <groupId>org.wildfly.arquillian</groupId> + <artifactId>wildfly-arquillian-container-managed</artifactId> + <version>1.0.0.Alpha2</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.jboss.slf4j</groupId> + <artifactId>slf4j-jboss-logmanager</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.protocol</groupId> + <artifactId>arquillian-protocol-servlet</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency>  <dependency> <groupId>org.littleshoot</groupId> @@ -795,7 +831,6 @@ <profile> <id>wildfly900</id> <properties> - <jboss.version>${wildfly900.version}</jboss.version> <jbossws.integration.target>wildfly900</jbossws.integration.target> <remote.port>8080</remote.port> <remote.protocol>http-remoting</remote.protocol> Modified: stack/cxf/branches/arquillian/pom.xml =================================================================== --- stack/cxf/branches/arquillian/pom.xml 2014-12-03 22:25:58 UTC (rev 19121) +++ stack/cxf/branches/arquillian/pom.xml 2014-12-03 23:04:58 UTC (rev 19122) @@ -1283,6 +1283,16 @@ <version>2.2</version> </plugin> <plugin> + <groupId>org.codehaus.gmaven</groupId> + <artifactId>gmaven-plugin</artifactId> + <version>1.5</version> + </plugin> + <plugin> + <groupId>org.wildfly.plugins</groupId> + <artifactId>wildfly-maven-plugin</artifactId> + <version>1.0.2.Final</version> + </plugin> + <plugin> <groupId>org.jboss.maven.plugins</groupId> <artifactId>maven-jdocbook-plugin</artifactId> <version>2.1.2</version> @@ -1355,6 +1365,7 @@ <properties> <jbossws.integration.target>wildfly800</jbossws.integration.target> <jboss.home>${wildfly800.home}</jboss.home> + <jboss.version>${wildfly800.version}</jboss.version> </properties> </profile> @@ -1367,6 +1378,7 @@ <properties> <jbossws.integration.target>wildfly810</jbossws.integration.target> <jboss.home>${wildfly810.home}</jboss.home> + <jboss.version>${wildfly810.version}</jboss.version> </properties> </profile> @@ -1379,6 +1391,7 @@ <properties> <jbossws.integration.target>wildfly900</jbossws.integration.target> <jboss.home>${wildfly900.home}</jboss.home> + <jboss.version>${wildfly900.version}</jboss.version> </properties> </profile>

9 years, 5 months

1
0
0 / 0

JBossWS SVN: r19121 - in stack/cxf/trunk/modules: testsuite/shared-tests/src/test/java/org/jboss/test/ws/saaj and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: rsearls Date: 2014-12-03 17:25:58 -0500 (Wed, 03 Dec 2014) New Revision: 19121 Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/saaj/jbws3857/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/saaj/jbws3857/MultipartContentTypeTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/saaj/jbws3857/SoapMultipartCheckerServlet.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3857/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3857/META-INF/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3857/META-INF/beans.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3857/WEB-INF/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3857/WEB-INF/jboss-web.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3857/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3857/test.png Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java Log: [JBWS-3857] integration of jbossws-cxf-4.3.x.patch posted in bz-1167348 and added test case for patch. Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java 2014-12-02 16:55:07 UTC (rev 19120) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java 2014-12-03 22:25:58 UTC (rev 19121) @@ -80,7 +80,11 @@ try { final Conduit c = ci.getConduit(info, BusFactory.getThreadDefaultBus(false)); //TODO verify bus - + + if (msgOut.saveRequired()) + { + msgOut.saveChanges(); + } Map<String, List<String>> outHeaders = new HashMap<String, List<String>>(); for (Iterator<?> it = msgOut.getMimeHeaders().getAllHeaders(); it.hasNext();) Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/saaj/jbws3857/MultipartContentTypeTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/saaj/jbws3857/MultipartContentTypeTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/saaj/jbws3857/MultipartContentTypeTestCase.java 2014-12-03 22:25:58 UTC (rev 19121) @@ -0,0 +1,108 @@ +/* + * 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.saaj.jbws3857; + +import junit.framework.Test; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestSetup; +import org.junit.Assert; + +import javax.activation.DataHandler; +import javax.activation.URLDataSource; +import javax.xml.namespace.QName; +import javax.xml.soap.*; +import java.io.File; +import java.net.URL; +import java.util.LinkedList; +import java.util.List; + +import static org.jboss.wsf.test.JBossWSTestHelper.getTestResourcesDir; + +/** + * + */ +public class MultipartContentTypeTestCase extends JBossWSTest +{ + private static final String PROJECT_NAME = "reproducer-eap-wrong-multipart"; + private static final String TEST_SERVLET_URL = "http://" + getServerHost() + ":8080/" + PROJECT_NAME + "/testServlet"; + private static final String IN_IMG_NAME = "test.png"; + + public static JBossWSTestHelper.BaseDeployment<?>[] createDeployments() { + List<JBossWSTestHelper.BaseDeployment<?>> list = new LinkedList<JBossWSTestHelper.BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3857.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.saaj.jbws3857.SoapMultipartCheckerServlet.class) + .addAsWebInfResource(new File(getTestResourcesDir() + "/saaj/jbws3857/META-INF/beans.xml"), "classes/META-INF/beans.xml") + .addAsWebInfResource(new File(getTestResourcesDir() + "/saaj/jbws3857/test.png"), "classes/test.png") + .addAsWebInfResource(new File(getTestResourcesDir() + "/saaj/jbws3857/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/saaj/jbws3857/WEB-INF/web.xml")) + ; + } + }); + return list.toArray(new JBossWSTestHelper.BaseDeployment<?>[list.size()]); + } + + public static Test suite() + { + return new JBossWSTestSetup(MultipartContentTypeTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); + } + + public void testSendMultipartSoapMessage() throws Exception { + final MessageFactory msgFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); + final SOAPMessage msg = msgFactory.createMessage(); + final SOAPBodyElement bodyElement = msg.getSOAPBody().addBodyElement( + new QName("urn:ledegen:soap-attachment:1.0", "echoImage")); + bodyElement.addTextNode("cid:" + IN_IMG_NAME); + + final AttachmentPart ap = msg.createAttachmentPart(); + ap.setDataHandler(getResource("saaj/jbws3857/" + IN_IMG_NAME)); + ap.setContentId(IN_IMG_NAME); + msg.addAttachmentPart(ap); + + final SOAPConnectionFactory conFactory = SOAPConnectionFactory.newInstance(); + final SOAPConnection connection = conFactory.createConnection(); + final SOAPMessage response = connection.call(msg, new URL(TEST_SERVLET_URL)); + + final String contentTypeWeHaveSent = getBodyElementTextValue(response); + assertContentTypeStarts("multipart/related", contentTypeWeHaveSent); + } + + private void assertContentTypeStarts(final String expectedStart, final String actual) { + if (!actual.startsWith(expectedStart)) { + Assert.fail("We have send request with Content-Type " + actual + ", but expected start is " + expectedStart); + } + } + + private String getBodyElementTextValue(final SOAPMessage msg) throws Exception { + final SOAPBodyElement bodyElement = (SOAPBodyElement) msg.getSOAPBody().getChildElements().next(); + final String result = bodyElement.getTextContent(); + return result; + } + + private DataHandler getResource(final String resource) throws Exception { + URL imageUrl = getResourceURL(resource); + return new DataHandler(new URLDataSource(imageUrl)); + } + +} Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/saaj/jbws3857/SoapMultipartCheckerServlet.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/saaj/jbws3857/SoapMultipartCheckerServlet.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/saaj/jbws3857/SoapMultipartCheckerServlet.java 2014-12-03 22:25:58 UTC (rev 19121) @@ -0,0 +1,67 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.saaj.jbws3857; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.namespace.QName; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPBodyElement; +import javax.xml.soap.SOAPConstants; +import javax.xml.soap.SOAPMessage; +import java.io.IOException; +import java.io.OutputStream; + +/** + * + */ +public class SoapMultipartCheckerServlet extends HttpServlet { + + @Override + protected void service(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException { + final String requestedContentType = req.getHeader("Content-Type"); + System.out.println("Requested content type : " + requestedContentType); + + try { + replyRequestedContentTypeInResponse(requestedContentType, resp); + } catch (final Exception e) { + throw new ServletException(e.getMessage(), e); + } + } + + private void replyRequestedContentTypeInResponse(final String requestedContentType, final HttpServletResponse resp) throws Exception { + final MessageFactory msgFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); + final SOAPMessage msg = msgFactory.createMessage(); + final SOAPBodyElement bodyElement = msg.getSOAPBody().addBodyElement( + new QName("urn:not-important:1.0", "requestedContentType")); + + bodyElement.addTextNode(requestedContentType); + + resp.setStatus(HttpServletResponse.SC_OK); + resp.setHeader("Content-Type", "application/soap+xml; charset=utf-8"); + final OutputStream os = resp.getOutputStream(); + msg.writeTo(os); + os.close(); + } +} Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3857/META-INF/beans.xml =================================================================== Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3857/WEB-INF/jboss-web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3857/WEB-INF/jboss-web.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3857/WEB-INF/jboss-web.xml 2014-12-03 22:25:58 UTC (rev 19121) @@ -0,0 +1,3 @@ +<jboss-web> + <context-root>reproducer-eap-wrong-multipart</context-root> +</jboss-web> Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3857/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3857/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3857/WEB-INF/web.xml 2014-12-03 22:25:58 UTC (rev 19121) @@ -0,0 +1,13 @@ +<web-app> + <servlet> + <servlet-name>SoapMultipartCheckerServlet</servlet-name> + <servlet-class> + org.jboss.test.ws.saaj.jbws3857.SoapMultipartCheckerServlet + </servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>SoapMultipartCheckerServlet</servlet-name> + <url-pattern>/testServlet</url-pattern> + </servlet-mapping> +</web-app> \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3857/test.png =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3857/test.png ___________________________________________________________________ Added: svn:mime-type + image/png

9 years, 5 months

1
0
0 / 0

JBossWS SVN: r19120 - in stack/cxf/branches/arquillian/modules: testsuite and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-12-02 11:55:07 -0500 (Tue, 02 Dec 2014) New Revision: 19120 Modified: stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/catalog/OasisCatalogHelloWSTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/JBWS3792EpsilonTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default-config-tests.groovy stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default.groovy stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-ssl-mutual-auth.groovy stack/cxf/branches/arquillian/modules/testsuite/pom.xml Log: Fixed logging + misc issues Modified: stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-12-02 12:09:52 UTC (rev 19119) +++ stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-12-02 16:55:07 UTC (rev 19120) @@ -417,7 +417,7 @@ public T writeToFile() { - File archiveDir = assertArchiveDirExists(JBossWSTestHelper.getTestArchiveDir()); + File archiveDir = assertArchiveDirExists(); File file = new File(archiveDir, archive.getName()); archive.as(ZipExporter.class).exportTo(file, true); return archive; @@ -427,21 +427,21 @@ { return archive.getName(); } - - private File assertArchiveDirExists(String testArchiveDir) + } + + public static File assertArchiveDirExists() + { + File archiveDir = new File(testArchiveDir); + if (!archiveDir.exists()) { - File archiveDir = new File(testArchiveDir); - if (!archiveDir.exists()) - { - if (testArchiveDir == null) - throw new IllegalArgumentException("Cannot create archive - system property '" - + JBossWSTestHelper.SYSPROP_TEST_ARCHIVE_DIRECTORY + "' not set."); - if (!archiveDir.mkdirs()) - throw new IllegalArgumentException("Cannot create archive - can not create test archive directory '" - + archiveDir.getAbsolutePath() + "' not set."); - } - return archiveDir; + if (testArchiveDir == null) + throw new IllegalArgumentException("Cannot create archive - system property '" + + JBossWSTestHelper.SYSPROP_TEST_ARCHIVE_DIRECTORY + "' not set."); + if (!archiveDir.mkdirs()) + throw new IllegalArgumentException("Cannot create archive - can not create test archive directory '" + + archiveDir.getAbsolutePath() + "' not set."); } + return archiveDir; } public static String writeToFile(BaseDeployment<?>... deps) { Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2014-12-02 12:09:52 UTC (rev 19119) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2014-12-02 16:55:07 UTC (rev 19120) @@ -83,6 +83,7 @@ <properties> <inputFile>${jboss.home}/standalone/configuration/standalone.xml</inputFile> <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-default.xml</outputFile> + <serverLog>jbws-testsuite-default.log</serverLog> <usersPropFile>${project.build.directory}/test-classes/jbossws-users.properties</usersPropFile> <rolesPropFile>${project.build.directory}/test-classes/jbossws-roles.properties</rolesPropFile> <keystorePath>${project.build.directory}/test-classes/test.keystore</keystorePath> @@ -101,6 +102,7 @@ <properties> <inputFile>${jboss.home}/standalone/configuration/standalone.xml</inputFile> <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-ssl-mutual-auth.xml</outputFile> + <serverLog>jbws-testsuite-ssl-mutual-auth.log</serverLog> <keystorePath>${project.build.directory}/test-classes/test.keystore</keystorePath> <truststorePath>${project.build.directory}/test-classes/test.truststore</truststorePath> </properties> @@ -117,6 +119,7 @@ <properties> <inputFile>${jboss.home}/standalone/configuration/standalone.xml</inputFile> <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-default-config-tests.xml</outputFile> + <serverLog>jbws-testsuite-default-config-tests.log</serverLog> </properties> </configuration> </execution> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml 2014-12-02 12:09:52 UTC (rev 19119) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml 2014-12-02 16:55:07 UTC (rev 19120) @@ -6,14 +6,9 @@ <container qualifier="jboss" default="true"> <configuration> <property name="jbossHome">${jboss.home}</property> -  <property name="serverConfig">jbws-testsuite-default.xml</property> -  <property name="allowConnectingToRunningServer">true</property> -  <property name="managementPort">${as.managementPort:9990}</property> -  <property name="waitForPorts">${as.debug.port:8787} ${as.managementPort:9990}</property> <property name="waitForPortsTimeoutInSeconds">8</property> @@ -22,15 +17,10 @@ <container qualifier="ssl-mutual-auth" mode="manual"> <configuration> <property name="jbossHome">${jboss.home}</property> - <property name="javaVmArguments">-Djboss.socket.binding.port-offset=10000</property> -  + <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=10000</property> <property name="serverConfig">jbws-testsuite-ssl-mutual-auth.xml</property> -  <property name="allowConnectingToRunningServer">true</property> -  <property name="managementPort">${as.managementPort:19990}</property> -  <property name="waitForPorts">${as.debug.port:18787} ${as.managementPort:19990}</property> <property name="waitForPortsTimeoutInSeconds">8</property> @@ -39,15 +29,10 @@ <container qualifier="default-config-tests" mode="manual"> <configuration> <property name="jbossHome">${jboss.home}</property> - <property name="javaVmArguments">-Djboss.socket.binding.port-offset=20000</property> -  + <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=20000</property> <property name="serverConfig">jbws-testsuite-default-config-tests.xml</property> -  <property name="allowConnectingToRunningServer">true</property> -  <property name="managementPort">${as.managementPort:29990}</property> -  <property name="waitForPorts">${as.debug.port:28787} ${as.managementPort:29990}</property> <property name="waitForPortsTimeoutInSeconds">8</property> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/catalog/OasisCatalogHelloWSTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/catalog/OasisCatalogHelloWSTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/catalog/OasisCatalogHelloWSTestCase.java 2014-12-02 16:55:07 UTC (rev 19120) @@ -168,6 +168,7 @@ public static void writeToDisk(WebArchive archive) { + JBossWSTestHelper.assertArchiveDirExists(); File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName()); archive.as(ZipExporter.class).exportTo(file, true); } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase.java 2014-12-02 16:55:07 UTC (rev 19120) @@ -58,7 +58,7 @@ @ArquillianResource private URL baseURL; - @Deployment(name = DEP_EXT, testable = false) + @Deployment(name = DEP_EXT, testable = false, order = 1) public static WebArchive createDeployment() { WebArchive archive = ShrinkWrap.create(WebArchive.class, DEP_EXT + ".war"); archive @@ -69,7 +69,7 @@ return archive; } - @Deployment(name = DEP, testable = false) + @Deployment(name = DEP, testable = false, order = 2) public static WebArchive createDeployment2() { WebArchive archive = ShrinkWrap.create(WebArchive.class, DEP + ".war"); archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/JBWS3792EpsilonTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/JBWS3792EpsilonTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/JBWS3792EpsilonTestCase.java 2014-12-02 16:55:07 UTC (rev 19120) @@ -57,7 +57,7 @@ @ArquillianResource private URL baseURL; - @Deployment(name = DEP1, testable = false) + @Deployment(name = DEP1, testable = false, order = 1) public static WebArchive createDeployment() { WebArchive archive = ShrinkWrap.create(WebArchive.class, DEP1 + ".war"); archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" @@ -71,7 +71,7 @@ return archive; } - @Deployment(name = DEP2, testable = false) + @Deployment(name = DEP2, testable = false, order = 2) public static WebArchive createDeployment2() { WebArchive archive = ShrinkWrap.create(WebArchive.class, DEP2 + ".war"); archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default-config-tests.groovy =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default-config-tests.groovy 2014-12-02 12:09:52 UTC (rev 19119) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default-config-tests.groovy 2014-12-02 16:55:07 UTC (rev 19120) @@ -1,6 +1,16 @@ def root = new XmlParser().parse(project.properties['inputFile']) /** + * Fix logging: remove CONSOLE handler and set a specific log file + * + */ +def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] +def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} +logHandlers.remove(consoleHandler) +def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] +file.attributes()['path'] = project.properties['serverLog'] + +/** * Add a security-domain block like this: * * <security-domain name="JBossWS" cache-type="default"> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default.groovy =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default.groovy 2014-12-02 12:09:52 UTC (rev 19119) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default.groovy 2014-12-02 16:55:07 UTC (rev 19120) @@ -1,6 +1,16 @@ def root = new XmlParser().parse(project.properties['inputFile']) /** + * Fix logging: remove CONSOLE handler and set a specific log file + * + */ +def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] +def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} +logHandlers.remove(consoleHandler) +def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] +file.attributes()['path'] = project.properties['serverLog'] + +/** * Add a security-domain block like this: * * <security-domain name="JBossWS" cache-type="default"> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-ssl-mutual-auth.groovy =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-ssl-mutual-auth.groovy 2014-12-02 12:09:52 UTC (rev 19119) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-ssl-mutual-auth.groovy 2014-12-02 16:55:07 UTC (rev 19120) @@ -1,6 +1,16 @@ def root = new XmlParser().parse(project.properties['inputFile']) /** + * Fix logging: remove CONSOLE handler and set a specific log file + * + */ +def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] +def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} +logHandlers.remove(consoleHandler) +def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] +file.attributes()['path'] = project.properties['serverLog'] + +/** * Add a https connector like this: * * <security-realm name="jbws-test-https-realm"> Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2014-12-02 12:09:52 UTC (rev 19119) +++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2014-12-02 16:55:07 UTC (rev 19120) @@ -38,7 +38,7 @@  <modules> <module>cxf-tests</module> - <module>shared-tests</module> + </modules>

9 years, 5 months

1
0
0 / 0

JBossWS SVN: r19119 - in stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test: java/org/jboss/test/ws/jaxws/cxf/jbws3713 and 21 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-12-02 07:09:52 -0500 (Tue, 02 Dec 2014) New Revision: 19119 Added: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientBusStrategyTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/JBWS3792AlphaTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/JBWS3792BetaTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/JBWS3792DeltaTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/JBWS3792EpsilonTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/JBWS3792GammaTestCase.java Removed: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientBusStrategyTests.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/DeploymentArchives.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseNewBusStrategyTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseTCCLBusStrategyTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseThreadBusStrategyTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/JWBS3792AlphaTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/JWBS3792BetaTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/JWBS3792DeltaTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/JWBS3792EpsilonTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/JWBS3792GammaTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/DeploymentArchives.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3745/ Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientServlet.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientServletUsignThreadLocal.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/InContainerClientBusStrategyTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/JBWS3773TestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3805/JBWS3805TestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/JBWS3809TestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3813/JBWS3813AnnotationTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3813/JBWS3813TestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/CXFManagementTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/DisabledWSSubsystemTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/EmbeddedCXFTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/policy/PolicyInterceptorProviderTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx/ServletCtxTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCaseForked.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsmex/WSMexTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/JBWS3084CxfTestCase.java Log: More tests converted... Added: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientBusStrategyTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientBusStrategyTestCase.java (rev 0) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientBusStrategyTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -0,0 +1,168 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.jaxws.cxf.jbws3713; + +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.LinkedList; +import java.util.List; +import java.util.StringTokenizer; + +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.stack.cxf.client.Constants; +import org.jboss.wsf.stack.cxf.client.ProviderImpl; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Test; +import org.junit.runner.RunWith; + +(a)RunWith(Arquillian.class) +public class ClientBusStrategyTestCase extends JBossWSTest +{ + private final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows + + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-jbws3713.war"); + archive.addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloRequest.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloWSImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloWs.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello.wsdl"), "wsdl/Hello.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema1.xsd"), "wsdl/Hello_schema1.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema2.xsd"), "wsdl/Hello_schema2.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema3.xsd"), "wsdl/Hello_schema3.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema4.xsd"), "wsdl/Hello_schema4.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema5.xsd"), "wsdl/Hello_schema5.xsd"); + return archive; + } + + public static final String CLIENT_JAR = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jbws3713-client.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Main-Class: org.jboss.test.ws.jaxws.cxf.jbws3713.TestClient\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl,org.jboss.ws.jaxws-client\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.BusCounter.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloRequest.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloWs.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.Helper.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelperUsignThreadLocal.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.TestClient.class); + } + }); + + @Test + @RunAsClient + public void testClientWithNewBusStrategy() throws Exception + { + final int threadPoolSize = 4; + final int invocations = 5; + List<Integer> list = runJBossModulesClient(Constants.NEW_BUS_STRATEGY, baseURL + "/HelloService?wsdl", threadPoolSize, invocations); + assertEquals(threadPoolSize, list.get(0).intValue()); + assertEquals(invocations, list.get(1).intValue()); + } + + @Test + @RunAsClient + public void testClientWithTCCLBusStrategy() throws Exception + { + final int threadPoolSize = 4; + final int invocations = 5; + List<Integer> list = runJBossModulesClient(Constants.TCCL_BUS_STRATEGY, baseURL + "/HelloService?wsdl", threadPoolSize, invocations); + assertEquals(1, list.get(0).intValue()); + assertEquals(1, list.get(1).intValue()); + } + + @Test + @RunAsClient + public void testClientWithThreadBusStrategy() throws Exception + { + final int threadPoolSize = 4; + final int invocations = 5; + List<Integer> list = runJBossModulesClient(Constants.THREAD_BUS_STRATEGY, baseURL + "/HelloService?wsdl", threadPoolSize, invocations); + assertEquals(threadPoolSize, list.get(0).intValue()); + assertEquals(threadPoolSize, list.get(1).intValue()); + } + + /** + * Verifies jaxws client bus selection strategy controlled by system properties; in order for checking that, + * starting a new process is required, as the system property is read once and cached in JBossWS. + * + * @param strategy + * @param wsdlAddress + * @param threadPoolSize + * @param invocations + * @return + * @throws Exception + */ + protected List<Integer> runJBossModulesClient(final String strategy, + final String wsdlAddress, + final int threadPoolSize, + final int invocations) throws Exception { + File javaFile = new File (System.getProperty("java.home") + FS + "bin" + FS + "java"); + String javaCmd = javaFile.exists() ? javaFile.getCanonicalPath() : "java"; + + final String jbh = System.getProperty("jboss.home"); + final String jbm = jbh + FS + "modules"; + final String jbmjar = jbh + FS + "jboss-modules.jar"; + + final File f = new File(JBossWSTestHelper.getTestArchiveDir(), CLIENT_JAR); + + //java -jar $JBOSS_HOME/jboss-modules.jar -mp $JBOSS_HOME/modules -jar client.jar + String props = " -Djavax.xml.ws.spi.Provider=" + ProviderImpl.class.getName() + " -Dlog4j.output.dir=" + System.getProperty("log4j.output.dir") + + " -D" + Constants.JBWS_CXF_JAXWS_CLIENT_BUS_STRATEGY + "=" + strategy + " -jar " + jbmjar + " -mp " + jbm; + final String command = javaCmd + props + " -jar " + f.getAbsolutePath() + " " + wsdlAddress + " " + threadPoolSize + " " + invocations; + ByteArrayOutputStream bout = new ByteArrayOutputStream(); + executeCommand(command, bout); + StringTokenizer st = new StringTokenizer(readFirstLine(bout), " "); + List<Integer> list = new LinkedList<Integer>(); + while (st.hasMoreTokens()) { + list.add(Integer.parseInt(st.nextToken())); + } + return list; + } + + private static String readFirstLine(ByteArrayOutputStream bout) throws IOException { + bout.flush(); + final byte[] bytes = bout.toByteArray(); + if (bytes != null) { + BufferedReader reader = new BufferedReader(new java.io.StringReader(new String(bytes))); + return reader.readLine(); + } else { + return null; + } + } +} Property changes on: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientBusStrategyTestCase.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Deleted: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientBusStrategyTests.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientBusStrategyTests.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientBusStrategyTests.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -1,90 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2013, 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.jaxws.cxf.jbws3713; - -import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.util.LinkedList; -import java.util.List; -import java.util.StringTokenizer; - -import org.jboss.wsf.stack.cxf.client.Constants; -import org.jboss.wsf.stack.cxf.client.ProviderImpl; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; - -public class ClientBusStrategyTests extends JBossWSTest //*Tests does not match the configured surefire filter on test classes' names -{ - public final String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3713/HelloService"; - private final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows - - /** - * Verifies jaxws client bus selection strategy controlled by system properties; in order for checking that, - * starting a new process is required, as the system property is read once and cached in JBossWS. - * - * @param strategy - * @param wsdlAddress - * @param threadPoolSize - * @param invocations - * @return - * @throws Exception - */ - protected List<Integer> runJBossModulesClient(final String strategy, - final String wsdlAddress, - final int threadPoolSize, - final int invocations) throws Exception { - File javaFile = new File (System.getProperty("java.home") + FS + "bin" + FS + "java"); - String javaCmd = javaFile.exists() ? javaFile.getCanonicalPath() : "java"; - - final String jbh = System.getProperty("jboss.home"); - final String jbm = jbh + FS + "modules"; - final String jbmjar = jbh + FS + "jboss-modules.jar"; - - final File f = new File(JBossWSTestHelper.getTestArchiveDir(), DeploymentArchives.CLIENT_JAR); - - //java -jar $JBOSS_HOME/jboss-modules.jar -mp $JBOSS_HOME/modules -jar client.jar - String props = " -Djavax.xml.ws.spi.Provider=" + ProviderImpl.class.getName() + " -Dlog4j.output.dir=" + System.getProperty("log4j.output.dir") + - " -D" + Constants.JBWS_CXF_JAXWS_CLIENT_BUS_STRATEGY + "=" + strategy + " -jar " + jbmjar + " -mp " + jbm; - final String command = javaCmd + props + " -jar " + f.getAbsolutePath() + " " + wsdlAddress + " " + threadPoolSize + " " + invocations; - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - executeCommand(command, bout); - StringTokenizer st = new StringTokenizer(readFirstLine(bout), " "); - List<Integer> list = new LinkedList<Integer>(); - while (st.hasMoreTokens()) { - list.add(Integer.parseInt(st.nextToken())); - } - return list; - } - - private static String readFirstLine(ByteArrayOutputStream bout) throws IOException { - bout.flush(); - final byte[] bytes = bout.toByteArray(); - if (bytes != null) { - BufferedReader reader = new BufferedReader(new java.io.StringReader(new String(bytes))); - return reader.readLine(); - } else { - return null; - } - } -} Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientServlet.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientServlet.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientServlet.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -42,9 +42,9 @@ String strategy = req.getParameter("strategy"); if (strategy == null || strategy.length() == 0) throw new ServletException("strategy not specified!"); - String host = req.getParameter("host"); - if (host == null || host.length() == 0) - throw new ServletException("host not specified!"); + String path = req.getParameter("path"); + if (path == null || path.length() == 0) + throw new ServletException("path not specified!"); String threads = req.getParameter("threads"); if (threads == null || threads.length() == 0) throw new ServletException("threads not specified!"); @@ -53,7 +53,7 @@ throw new ServletException("calls not specified!"); PrintWriter w = res.getWriter(); - final URL wsdlURL = new URL("http://" + host + ":8080/jaxws-cxf-jbws3713/HelloService?wsdl"); + final URL wsdlURL = new URL("http://" + req.getLocalAddr() + ":" + req.getLocalPort() + path + "?wsdl"); Helper helper = new Helper(); w.write(helper.run(wsdlURL, strategy, Integer.parseInt(threads), Integer.parseInt(calls)).toString()); } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientServletUsignThreadLocal.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientServletUsignThreadLocal.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientServletUsignThreadLocal.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -42,9 +42,9 @@ String strategy = req.getParameter("strategy"); if (strategy == null || strategy.length() == 0) throw new ServletException("strategy not specified!"); - String host = req.getParameter("host"); - if (host == null || host.length() == 0) - throw new ServletException("host not specified!"); + String path = req.getParameter("path"); + if (path == null || path.length() == 0) + throw new ServletException("path not specified!"); String threads = req.getParameter("threads"); if (threads == null || threads.length() == 0) throw new ServletException("threads not specified!"); @@ -53,7 +53,7 @@ throw new ServletException("calls not specified!"); PrintWriter w = res.getWriter(); - final URL wsdlURL = new URL("http://" + host + ":8080/jaxws-cxf-jbws3713/HelloService?wsdl"); + final URL wsdlURL = new URL("http://" + req.getLocalAddr() + ":" + req.getLocalPort() + path + "?wsdl"); HelperUsignThreadLocal helper = new HelperUsignThreadLocal(); w.write(helper.run(wsdlURL, strategy, Integer.parseInt(threads), Integer.parseInt(calls)).toString()); } Deleted: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/DeploymentArchives.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/DeploymentArchives.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/DeploymentArchives.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -1,77 +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.jaxws.cxf.jbws3713; - -import java.io.File; - -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.wsf.test.JBossWSTestHelper; - -public final class DeploymentArchives -{ - public static final String SERVER = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3713.war") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloRequest.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloResponse.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloWSImpl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloWs.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello.wsdl"), "wsdl/Hello.wsdl") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema1.xsd"), "wsdl/Hello_schema1.xsd") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema2.xsd"), "wsdl/Hello_schema2.xsd") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema3.xsd"), "wsdl/Hello_schema3.xsd") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema4.xsd"), "wsdl/Hello_schema4.xsd") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema5.xsd"), "wsdl/Hello_schema5.xsd"); - } - }); - - public static final String CLIENT_JAR = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jbws3713-client.jar") { { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Main-Class: org.jboss.test.ws.jaxws.cxf.jbws3713.TestClient\n" - + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl,org.jboss.ws.jaxws-client\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.BusCounter.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloRequest.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloResponse.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloWs.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.Helper.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelperUsignThreadLocal.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.TestClient.class); - } - }); - - public static final String CLIENT_WAR = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3713-client.war") { { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.BusCounter.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.ClientServlet.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.ClientServletUsignThreadLocal.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloRequest.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloResponse.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloWs.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.Helper.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelperUsignThreadLocal.class); - } - }); - -} Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/InContainerClientBusStrategyTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/InContainerClientBusStrategyTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/InContainerClientBusStrategyTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -21,30 +21,76 @@ */ package org.jboss.test.ws.jaxws.cxf.jbws3713; +import java.io.File; import java.net.URL; import javax.xml.namespace.QName; import javax.xml.ws.Service; -import junit.framework.Test; - +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.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.stack.cxf.client.Constants; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Test; +import org.junit.runner.RunWith; +(a)RunWith(Arquillian.class) public class InContainerClientBusStrategyTestCase extends JBossWSTest { - public final String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3713/HelloService"; + private static final String DEP = "jaxws-cxf-jbws3713-ict"; + private static final String CLIENT_DEP = "jaxws-cxf-jbws3713-client"; - public static Test suite() - { - return new JBossWSTestSetup(InContainerClientBusStrategyTestCase.class, DeploymentArchives.SERVER + "," + DeploymentArchives.CLIENT_WAR); + @ArquillianResource + private URL baseURL; + + @Deployment(name = DEP, testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, DEP + ".war"); + archive.addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloRequest.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloWSImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloWs.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello.wsdl"), "wsdl/Hello.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema1.xsd"), "wsdl/Hello_schema1.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema2.xsd"), "wsdl/Hello_schema2.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema3.xsd"), "wsdl/Hello_schema3.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema4.xsd"), "wsdl/Hello_schema4.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema5.xsd"), "wsdl/Hello_schema5.xsd"); + return archive; } + + @Deployment(name = CLIENT_DEP, testable = false) + public static WebArchive createDeployment2() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_DEP + ".war"); + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.BusCounter.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.ClientServlet.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.ClientServletUsignThreadLocal.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloRequest.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloWs.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.Helper.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelperUsignThreadLocal.class); + return archive; + } + @Test + @RunAsClient + @OperateOnDeployment(DEP) public void testEndpoint() throws Exception { - HelloWs port = getPort(endpointAddress); + HelloWs port = getPort(baseURL + "/HelloService"); HelloRequest request = new HelloRequest(); request.setInput("hello"); HelloResponse response = port.doHello(request); @@ -53,6 +99,9 @@ assertTrue(response.getMultiHello().contains("world")); } + @Test + @RunAsClient + @OperateOnDeployment(CLIENT_DEP) public void testClientWithNewBusStrategy() throws Exception { final int threadPoolSize = 10; @@ -64,6 +113,9 @@ assertEquals(invocations, busCount); } + @Test + @RunAsClient + @OperateOnDeployment(CLIENT_DEP) public void testClientWithThreadBusStrategy() throws Exception { final int threadPoolSize = 10; @@ -75,6 +127,9 @@ assertEquals(threadPoolSize, busCount); } + @Test + @RunAsClient + @OperateOnDeployment(CLIENT_DEP) public void testClientWithTCCLBusStrategy() throws Exception { final int threadPoolSize = 10; @@ -86,9 +141,9 @@ assertEquals(1, busCount); } - private static int callServlet(String pattern, String strategy, int threads, int calls) throws Exception { - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3713-client/" + pattern + "?strategy=" - + strategy + "&host=" + getServerHost() + "&threads=" + threads + "&calls=" + calls); + private int callServlet(String pattern, String strategy, int threads, int calls) throws Exception { + URL url = new URL(baseURL + pattern + "?strategy=" + + strategy + "&path=/jaxws-cxf-jbws3713-ict/HelloService&threads=" + threads + "&calls=" + calls); return Integer.parseInt(IOUtils.readAndCloseStream(url.openStream())); } Deleted: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseNewBusStrategyTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseNewBusStrategyTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseNewBusStrategyTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -1,46 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2013, 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.jaxws.cxf.jbws3713; - -import java.util.List; - -import junit.framework.Test; - -import org.jboss.wsf.stack.cxf.client.Constants; -import org.jboss.wsf.test.JBossWSTestSetup; - -public class UseNewBusStrategyTestCase extends ClientBusStrategyTests -{ - public static Test suite() - { - return new JBossWSTestSetup(UseNewBusStrategyTestCase.class, DeploymentArchives.SERVER); - } - - public void testClientWithNewBusStrategy() throws Exception - { - final int threadPoolSize = 4; - final int invocations = 5; - List<Integer> list = runJBossModulesClient(Constants.NEW_BUS_STRATEGY, endpointAddress + "?wsdl", threadPoolSize, invocations); - assertEquals(threadPoolSize, list.get(0).intValue()); - assertEquals(invocations, list.get(1).intValue()); - } -} Deleted: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseTCCLBusStrategyTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseTCCLBusStrategyTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseTCCLBusStrategyTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -1,46 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2013, 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.jaxws.cxf.jbws3713; - -import java.util.List; - -import junit.framework.Test; - -import org.jboss.wsf.stack.cxf.client.Constants; -import org.jboss.wsf.test.JBossWSTestSetup; - -public class UseTCCLBusStrategyTestCase extends ClientBusStrategyTests -{ - public static Test suite() - { - return new JBossWSTestSetup(UseTCCLBusStrategyTestCase.class, DeploymentArchives.SERVER); - } - - public void testClientWithTCCLBusStrategy() throws Exception - { - final int threadPoolSize = 4; - final int invocations = 5; - List<Integer> list = runJBossModulesClient(Constants.TCCL_BUS_STRATEGY, endpointAddress + "?wsdl", threadPoolSize, invocations); - assertEquals(1, list.get(0).intValue()); - assertEquals(1, list.get(1).intValue()); - } -} Deleted: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseThreadBusStrategyTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseThreadBusStrategyTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseThreadBusStrategyTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -1,46 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2013, 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.jaxws.cxf.jbws3713; - -import java.util.List; - -import junit.framework.Test; - -import org.jboss.wsf.stack.cxf.client.Constants; -import org.jboss.wsf.test.JBossWSTestSetup; - -public class UseThreadBusStrategyTestCase extends ClientBusStrategyTests -{ - public static Test suite() - { - return new JBossWSTestSetup(UseThreadBusStrategyTestCase.class, DeploymentArchives.SERVER); - } - - public void testClientWithThreadBusStrategy() throws Exception - { - final int threadPoolSize = 4; - final int invocations = 5; - List<Integer> list = runJBossModulesClient(Constants.THREAD_BUS_STRATEGY, endpointAddress + "?wsdl", threadPoolSize, invocations); - assertEquals(threadPoolSize, list.get(0).intValue()); - assertEquals(threadPoolSize, list.get(1).intValue()); - } -} Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/JBWS3773TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/JBWS3773TestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/JBWS3773TestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -22,8 +22,6 @@ package org.jboss.test.ws.jaxws.cxf.jbws3773; import java.net.URL; -import java.util.LinkedList; -import java.util.List; import java.util.Map; import javax.xml.namespace.QName; @@ -31,38 +29,39 @@ import javax.xml.ws.Service; import javax.xml.ws.soap.AddressingFeature; -import junit.framework.Test; - import org.apache.cxf.ws.addressing.AddressingProperties; import org.apache.cxf.ws.addressing.AttributedURIType; import org.apache.cxf.ws.addressing.EndpointReferenceType; import org.apache.cxf.ws.addressing.JAXWSAConstants; +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.spec.WebArchive; 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; +import org.junit.Test; +import org.junit.runner.RunWith; +(a)RunWith(Arquillian.class) public class JBWS3773TestCase extends JBossWSTest { - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3773.war") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3773.Greeter.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3773.GreeterImpl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3773.TargetServlet.class); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-jbws3773.war"); + archive.addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3773.Greeter.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3773.GreeterImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3773.TargetServlet.class); + return archive; } - public static Test suite() - { - return new JBossWSTestSetup(JBWS3773TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testServletRequestAvailability() throws Exception { Greeter greeter = initPort(); @@ -71,7 +70,7 @@ EndpointReferenceType replyTo = new EndpointReferenceType(); AttributedURIType replyToURI = new AttributedURIType(); - replyToURI.setValue("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3773/target/replyTo"); + replyToURI.setValue(baseURL + "/target/replyTo"); replyTo.setAddress(replyToURI); addrProperties.setReplyTo(replyTo); @@ -88,7 +87,7 @@ private Greeter initPort() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3773/SOAPService?wsdl"); + URL wsdlURL = new URL(baseURL + "/SOAPService?wsdl"); QName qname = new QName("http://jboss.org/hello_world", "SOAPService"); Service service = Service.create(wsdlURL, qname); Greeter greeter = service.getPort(Greeter.class, new AddressingFeature()); @@ -97,7 +96,7 @@ private String getTargetServletResult() throws Exception { - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3773/target/result"); + URL url = new URL(baseURL + "/target/result"); return IOUtils.readAndCloseStream(url.openStream()); } } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -21,87 +21,84 @@ */ package org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl; -import junit.framework.Test; +import java.io.File; +import java.net.URL; +import java.util.Iterator; + +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.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.shrinkwrap.api.ArchivePaths; +import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.FileAsset; 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; -import org.jboss.wsf.test.JBossWSTestSetup; +import org.junit.Test; +import org.junit.runner.RunWith; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import java.io.File; -import java.net.URL; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; - /** * Test that a external wsdl declared by a valid URL in a wsdlLocation * property of a WebService annotation is supported. + * + * @author rsearls(a)redhat.com */ +(a)RunWith(Arquillian.class) public class JBWS3792WsImplTestCase extends JBossWSTest { - public static JBossWSTestHelper.BaseDeployment<?>[] createDeployments() { - List<JBossWSTestHelper.BaseDeployment<?>> list = new LinkedList<JBossWSTestHelper.BaseDeployment<?>>(); - list.add( - - new JBossWSTestHelper.WarDeployment("jbws3792-external-wsdl.war") { { - archive - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.externalWsdl.JBWS3792WS.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() - + "/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/web.xml"), "web.xml") - .add(new FileAsset(new File(JBossWSTestHelper.getTestResourcesDir() - + "/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl")), ArchivePaths.root().get() + "jbws3792.wsdl") - .add(new FileAsset(new File(JBossWSTestHelper.getTestResourcesDir() - + "/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/import.wsdl")), "/import.wsdl") - - ; - } - } - ); - list.add( new JBossWSTestHelper.WarDeployment("jbws3792-ws-impl.war") { { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.Hello.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.HelloResponse.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WS.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WSImpl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WSService.class) - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() - + "/jaxws/cxf/jbws3792/wsImpl/WEB-INF/web.xml")) - ; - } - } - ); - return list.toArray(new JBossWSTestHelper.BaseDeployment<?>[list.size()]); + private static final String DEP_EXT = "jbws3792-external-wsdl"; + private static final String DEP = "jbws3792-ws-impl"; + + @ArquillianResource + private URL baseURL; + + @Deployment(name = DEP_EXT, testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, DEP_EXT + ".war"); + archive + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.externalWsdl.JBWS3792WS.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/web.xml"), "web.xml") + .add(new FileAsset(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl")), ArchivePaths.root().get() + "jbws3792.wsdl") + .add(new FileAsset(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/import.wsdl")), "/import.wsdl"); + return archive; } - - public static Test suite() - { - return new JBossWSTestSetup(JBWS3792WsImplTestCase.class, - JBossWSTestHelper.writeToFile(createDeployments()) - ); + @Deployment(name = DEP, testable = false) + public static WebArchive createDeployment2() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, DEP + ".war"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.Hello.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.HelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WS.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WSImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WSService.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3792/wsImpl/WEB-INF/web.xml")); + return archive; } + @Test + @RunAsClient + @OperateOnDeployment(DEP) public void test() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() - + ":8080/jbws3792-ws-impl/JBWS3792WSService?wsdl"); + URL wsdlURL = new URL(baseURL + "/JBWS3792WSService?wsdl"); QName qname = new QName("http://test.jbws3792/", "JBWS3792WSService"); Service service = Service.create(wsdlURL, qname); Iterator<QName> it = service.getPorts(); int cnt = 0; - while (it.hasNext()){ + while (it.hasNext()) { cnt++; QName qn = (QName)it.next(); - assertTrue("qname: " + qn.toString(), - "{http://test.jbws3792/}JBWS3792WSPort".equals(qn.toString())); + assertTrue("qname: " + qn.toString(), "{http://test.jbws3792/}JBWS3792WSPort".equals(qn.toString())); } assertTrue("Expected cnt to be 1 but cnt is " + cnt, cnt == 1); } Added: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/JBWS3792AlphaTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/JBWS3792AlphaTestCase.java (rev 0) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/JBWS3792AlphaTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -0,0 +1,85 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.jaxws.cxf.jbws3792.wsdlImportAlpha; + +import java.io.File; +import java.net.URL; +import java.util.Iterator; + +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.WebArchive; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * Test standard configuration, where all wsdls and schema files are + * located in the same directory. + * + * @author rsearls(a)redhat.com + */ +(a)RunWith(Arquillian.class) +public class JBWS3792AlphaTestCase extends JBossWSTest { + + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jbws3792-wsdlImportAlpha.war"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportAlpha.GreetingsWsImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportAlpha.GreetingsWs.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Greeting_Simplest.wsdl"), "wsdl/Greeting_Simplest.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl"), "wsdl/Hello.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello_schema2.xsd"), "wsdl/Hello_schema2.xsd"); + return archive; + } + + @Test + @RunAsClient + public void testImportSimplest() throws Exception + { + URL wsdlURL = new URL(baseURL + "/GreetingsService?wsdl"); + QName qname = new QName("http://hello/test", "HelloService"); + Service service = Service.create(wsdlURL, qname); + Iterator<QName> it = service.getPorts(); + int cnt = 0; + while (it.hasNext()) + { + cnt++; + QName qn = (QName) it.next(); + assertTrue("qname: " + qn.toString(), "{http://hello/test}HelloServicePort".equals(qn.toString())); + } + assertTrue("Expected cnt to be 1 but cnt is " + cnt, cnt == 1); + } +} Property changes on: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/JBWS3792AlphaTestCase.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Deleted: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/JWBS3792AlphaTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/JWBS3792AlphaTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/JWBS3792AlphaTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -1,92 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2013, 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.jaxws.cxf.jbws3792.wsdlImportAlpha; - -import junit.framework.Test; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestSetup; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import java.io.File; -import java.net.URL; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; - -/** - * Test standard configuration, where all wsdls and schema files are - * located in the same directory. - */ -public class JWBS3792AlphaTestCase extends JBossWSTest { - - public static JBossWSTestHelper.BaseDeployment<?>[] createDeployments () { - List<JBossWSTestHelper.BaseDeployment<?>> list = new LinkedList<JBossWSTestHelper.BaseDeployment<?>>(); - - list.add( - new JBossWSTestHelper.WarDeployment("jbws3792-wsdlImportAlpha.war") { - { archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportAlpha.GreetingsWsImpl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportAlpha.GreetingsWs.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() - + "/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Greeting_Simplest.wsdl"), - "wsdl/Greeting_Simplest.wsdl") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() - + "/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl"), - "wsdl/Hello.wsdl") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() - + "/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello_schema2.xsd"), - "wsdl/Hello_schema2.xsd") - ; - - } - }); - - return list.toArray(new JBossWSTestHelper.BaseDeployment<?>[list.size()]); - } - - public static Test suite() - { - return new JBossWSTestSetup(JWBS3792AlphaTestCase.class, - JBossWSTestHelper.writeToFile(createDeployments())); - } - - public void testImportSimplest() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() - + ":8080/jbws3792-wsdlImportAlpha/GreetingsService?wsdl"); - QName qname = new QName("http://hello/test", "HelloService"); - Service service = Service.create(wsdlURL, qname); - Iterator<QName> it = service.getPorts(); - int cnt = 0; - while (it.hasNext()){ - cnt++; - QName qn = (QName)it.next(); - assertTrue("qname: " + qn.toString(), - "{http://hello/test}HelloServicePort".equals(qn.toString())); - } - assertTrue("Expected cnt to be 1 but cnt is " + cnt, cnt == 1); - } -} Added: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/JBWS3792BetaTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/JBWS3792BetaTestCase.java (rev 0) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/JBWS3792BetaTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -0,0 +1,85 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.jaxws.cxf.jbws3792.wsdlImportBeta; + +import java.io.File; +import java.net.URL; +import java.util.Iterator; + +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.WebArchive; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * Test the schema is NOT co-located with the referencing imported wsdl. + * The imported wsdl and the importing wsdl are located in the same directory. + * + * @author rsearls(a)redhat.com + */ +(a)RunWith(Arquillian.class) +public class JBWS3792BetaTestCase extends JBossWSTest { + + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jbws3792-wsdlImportBeta.war"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportBeta.GreetingsWsImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportBeta.GreetingsWs.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Greeting_Simplest.wsdl"), "wsdl/Greeting_Simplest.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl"), "wsdl/Hello.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/A/b/Hello_schema2.xsd"), "wsdl/A/b/Hello_schema2.xsd"); + return archive; + } + + @Test + @RunAsClient + public void testImportSimplest() throws Exception + { + URL wsdlURL = new URL(baseURL + "/GreetingsService?wsdl"); + QName qname = new QName("http://hello/test", "HelloService"); + Service service = Service.create(wsdlURL, qname); + Iterator<QName> it = service.getPorts(); + int cnt = 0; + while (it.hasNext()) + { + cnt++; + QName qn = (QName) it.next(); + assertTrue("{http://hello/test}HelloServicePort".equals(qn.toString())); + } + assertTrue("Expected cnt to be 1 but cnt is " + cnt, cnt == 1); + } +} Property changes on: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/JBWS3792BetaTestCase.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Deleted: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/JWBS3792BetaTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/JWBS3792BetaTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/JWBS3792BetaTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -1,92 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2013, 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.jaxws.cxf.jbws3792.wsdlImportBeta; - -import junit.framework.Test; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestSetup; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import java.io.File; -import java.net.URL; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; - -/** - * Test the schema is NOT co-located with the referencing imported wsdl. - * The imported wsdl and the importing wsdl are located in the same directory. - */ -public class JWBS3792BetaTestCase extends JBossWSTest { - - public static JBossWSTestHelper.BaseDeployment<?>[] createDeployments () { - List<JBossWSTestHelper.BaseDeployment<?>> list = new LinkedList<JBossWSTestHelper.BaseDeployment<?>>(); - - list.add( - new JBossWSTestHelper.WarDeployment("jbws3792-wsdlImportBeta.war") { - { archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportBeta.GreetingsWsImpl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportBeta.GreetingsWs.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() - + "/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Greeting_Simplest.wsdl"), - "wsdl/Greeting_Simplest.wsdl") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() - + "/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl"), - "wsdl/Hello.wsdl") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() - + "/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/A/b/Hello_schema2.xsd"), - "wsdl/A/b/Hello_schema2.xsd") - ; - - } - }); - - return list.toArray(new JBossWSTestHelper.BaseDeployment<?>[list.size()]); - } - - public static Test suite() - { - return new JBossWSTestSetup(JWBS3792BetaTestCase.class, - JBossWSTestHelper.writeToFile(createDeployments())); - } - - - public void testImportSimplest() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() - + ":8080/jbws3792-wsdlImportBeta/GreetingsService?wsdl"); - QName qname = new QName("http://hello/test", "HelloService"); - Service service = Service.create(wsdlURL, qname); - Iterator<QName> it = service.getPorts(); - int cnt = 0; - while (it.hasNext()){ - cnt++; - QName qn = (QName)it.next(); - assertTrue("{http://hello/test}HelloServicePort".equals(qn.toString())); - } - assertTrue("Expected cnt to be 1 but cnt is " + cnt, cnt == 1); - } -} Added: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/JBWS3792DeltaTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/JBWS3792DeltaTestCase.java (rev 0) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/JBWS3792DeltaTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -0,0 +1,86 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.jaxws.cxf.jbws3792.wsdlImportDelta; + +import java.io.File; +import java.net.URL; +import java.util.Iterator; + +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.WebArchive; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * Test imported wsdl is NOT co-located with the importing wsdl + * and schema is NOT co-located with the referencing imported wsdl. + * + * @author rsearls(a)redhat.com + */ +(a)RunWith(Arquillian.class) +public class JBWS3792DeltaTestCase extends JBossWSTest { + + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jbws3792-wsdlImportDelta.war"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportDelta.GreetingsWsImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportDelta.GreetingsWs.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/Greeting_Simplest.wsdl"), "wsdl/Greeting_Simplest.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/Hello.wsdl"), "wsdl/A/b/Hello.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/schema/Hello_schema2.xsd"), "schema/Hello_schema2.xsd"); + return archive; + } + + @Test + @RunAsClient + public void testImportSimplest() throws Exception + { + + URL wsdlURL = new URL(baseURL + "/GreetingsService?wsdl"); + QName qname = new QName("http://hello/test", "HelloService"); + Service service = Service.create(wsdlURL, qname); + Iterator<QName> it = service.getPorts(); + int cnt = 0; + while (it.hasNext()) + { + cnt++; + QName qn = (QName) it.next(); + assertTrue("{http://hello/test}HelloServicePort".equals(qn.toString())); + } + assertTrue("Expected cnt to be 1 but cnt is " + cnt, cnt == 1); + } +} Property changes on: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/JBWS3792DeltaTestCase.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Deleted: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/JWBS3792DeltaTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/JWBS3792DeltaTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/JWBS3792DeltaTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -1,93 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2013, 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.jaxws.cxf.jbws3792.wsdlImportDelta; - -import junit.framework.Test; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestSetup; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import java.io.File; -import java.net.URL; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; - -/** - * Test imported wsdl is NOT co-located with the importing wsdl - * and schema is NOT co-located with the referencing imported wsdl. - */ -public class JWBS3792DeltaTestCase extends JBossWSTest { - - public static JBossWSTestHelper.BaseDeployment<?>[] createDeployments () { - List<JBossWSTestHelper.BaseDeployment<?>> list = new LinkedList<JBossWSTestHelper.BaseDeployment<?>>(); - - list.add( - new JBossWSTestHelper.WarDeployment("jbws3792-wsdlImportDelta.war") { - { archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportDelta.GreetingsWsImpl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportDelta.GreetingsWs.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() - + "/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/Greeting_Simplest.wsdl"), - "wsdl/Greeting_Simplest.wsdl") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() - + "/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/Hello.wsdl"), - "wsdl/A/b/Hello.wsdl") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() - + "/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/schema/Hello_schema2.xsd"), - "schema/Hello_schema2.xsd") - ; - - } - }); - - return list.toArray(new JBossWSTestHelper.BaseDeployment<?>[list.size()]); - } - - public static Test suite() - { - return new JBossWSTestSetup(JWBS3792DeltaTestCase.class, - JBossWSTestHelper.writeToFile(createDeployments())); - } - - - public void testImportSimplest() throws Exception { - - URL wsdlURL = new URL("http://" + getServerHost() - + ":8080/jbws3792-wsdlImportDelta/GreetingsService?wsdl"); - QName qname = new QName("http://hello/test", "HelloService"); - Service service = Service.create(wsdlURL, qname); - Iterator<QName> it = service.getPorts(); - int cnt = 0; - while (it.hasNext()){ - cnt++; - QName qn = (QName)it.next(); - assertTrue("{http://hello/test}HelloServicePort".equals(qn.toString())); - } - assertTrue("Expected cnt to be 1 but cnt is " + cnt, cnt == 1); - } -} Added: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/JBWS3792EpsilonTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/JBWS3792EpsilonTestCase.java (rev 0) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/JBWS3792EpsilonTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -0,0 +1,99 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.jaxws.cxf.jbws3792.wsdlImportEpsilon; + +import java.io.File; +import java.net.URL; + +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.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.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.test.ws.jaxws.cxf.jbws3792.HelloRequest; +import org.jboss.test.ws.jaxws.cxf.jbws3792.HelloResponse; +import org.jboss.test.ws.jaxws.cxf.jbws3792.HelloWs; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * Test imported wsdl identified by URL of deployed app. + * + * @author rsearls(a)redhat.com + */ +(a)RunWith(Arquillian.class) +public class JBWS3792EpsilonTestCase extends JBossWSTest { + + private static final String DEP1 = "jbws3792-hello"; + private static final String DEP2 = "jbws3792-wsdlImportEpsilon"; + + @ArquillianResource + private URL baseURL; + + @Deployment(name = DEP1, testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, DEP1 + ".war"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.HelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.HelloRequest.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.HelloWSImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.HelloWs.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello.wsdl"), "wsdl/Hello.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello_schema2.xsd"), "wsdl/Hello_schema2.xsd"); + return archive; + } + + @Deployment(name = DEP2, testable = false) + public static WebArchive createDeployment2() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, DEP2 + ".war"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportEpsilon.GreetingsWsImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportEpsilon.GreetingsWs.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl"), "wsdl/Greeting_Simplest.wsdl"); + return archive; + } + + @Test + @RunAsClient + @OperateOnDeployment(DEP2) + public void testImportSimplest() throws Exception + { + URL wsdlURL = new URL(baseURL + "/GreetingsService?wsdl"); + QName qname = new QName("http://hello/test", "HelloService"); + Service service = Service.create(wsdlURL, qname); + HelloWs hello = (HelloWs) service.getPort(HelloWs.class); + HelloRequest hReq = new HelloRequest(); + hReq.setInput("Joe"); + HelloResponse hRep = hello.doHello(hReq); + assertEquals("Joe", hRep.getMultiHello().get(0)); + } +} Property changes on: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/JBWS3792EpsilonTestCase.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Deleted: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/JWBS3792EpsilonTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/JWBS3792EpsilonTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/JWBS3792EpsilonTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -1,103 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2013, 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.jaxws.cxf.jbws3792.wsdlImportEpsilon; - -import junit.framework.Test; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.test.ws.jaxws.cxf.jbws3792.HelloRequest; -import org.jboss.test.ws.jaxws.cxf.jbws3792.HelloResponse; -import org.jboss.test.ws.jaxws.cxf.jbws3792.HelloWs; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestSetup; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import java.io.File; -import java.net.URL; -import java.util.LinkedList; -import java.util.List; - -/** - * Test imported wsdl identified by URL of deployed app. - */ -public class JWBS3792EpsilonTestCase extends JBossWSTest { - - public static JBossWSTestHelper.BaseDeployment<?>[] createDeployments () { - List<JBossWSTestHelper.BaseDeployment<?>> list = new LinkedList<JBossWSTestHelper.BaseDeployment<?>>(); - - list.add( - new JBossWSTestHelper.WarDeployment("jbws3792-hello.war") { - { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.HelloResponse.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.HelloRequest.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.HelloWSImpl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.HelloWs.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() - + "/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello.wsdl"), - "wsdl/Hello.wsdl") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() - + "/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello_schema2.xsd"), - "wsdl/Hello_schema2.xsd") - ; - } - }); - - list.add( - new JBossWSTestHelper.WarDeployment("jbws3792-wsdlImportEpsilon.war") { - { archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportEpsilon.GreetingsWsImpl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportEpsilon.GreetingsWs.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() - + "/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl"), - "wsdl/Greeting_Simplest.wsdl") - ; - } - }); - - return list.toArray(new JBossWSTestHelper.BaseDeployment<?>[list.size()]); - } - - public static Test suite() - { - return new JBossWSTestSetup(JWBS3792EpsilonTestCase.class, - JBossWSTestHelper.writeToFile(createDeployments())); - } - - - public void testImportSimplest() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() - + ":8080/jbws3792-wsdlImportEpsilon/GreetingsService?wsdl"); - QName qname = new QName("http://hello/test", "HelloService"); - Service service = Service.create(wsdlURL, qname); - HelloWs hello = (HelloWs)service.getPort(HelloWs.class); - HelloRequest hReq = new HelloRequest(); - hReq.setInput("Joe"); - HelloResponse hRep = hello.doHello(hReq); - assertEquals("Joe", hRep.getMultiHello().get(0)); - } -} Added: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/JBWS3792GammaTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/JBWS3792GammaTestCase.java (rev 0) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/JBWS3792GammaTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -0,0 +1,86 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.jaxws.cxf.jbws3792.wsdlImportGamma; + +import java.io.File; +import java.net.URL; +import java.util.Iterator; + +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.WebArchive; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * Test imported wsdl and its referenced schema is NOT co-located with the + * importing wsdl. The imported wsdl and its referenced schema are located + * in the same directory as the importing wsdl. + * + * @author rsearls(a)redhat.com + */ +(a)RunWith(Arquillian.class) +public class JBWS3792GammaTestCase extends JBossWSTest { + + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jbws3792-wsdlImportGamma.war"); + archive .setManifest( new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportGamma.GreetingsWsImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportGamma.GreetingsWs.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/Greeting_Simplest.wsdl"), "wsdl/Greeting_Simplest.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello.wsdl"), "wsdl/A/b/Hello.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello_schema2.xsd"), "wsdl/A/b/Hello_schema2.xsd"); + return archive; + } + + @Test + @RunAsClient + public void testImportSimplest() throws Exception + { + URL wsdlURL = new URL(baseURL + "/GreetingsService?wsdl"); + QName qname = new QName("http://hello/test", "HelloService"); + Service service = Service.create(wsdlURL, qname); + Iterator<QName> it = service.getPorts(); + int cnt = 0; + while (it.hasNext()) + { + cnt++; + QName qn = (QName) it.next(); + assertTrue("{http://hello/test}HelloServicePort".equals(qn.toString())); + } + assertTrue("Expected cnt to be 1 but cnt is " + cnt, cnt == 1); + } +} Property changes on: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/JBWS3792GammaTestCase.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Deleted: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/JWBS3792GammaTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/JWBS3792GammaTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/JWBS3792GammaTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -1,91 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2013, 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.jaxws.cxf.jbws3792.wsdlImportGamma; - -import junit.framework.Test; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestSetup; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import java.io.File; -import java.net.URL; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; - -/** - * Test imported wsdl and its referenced schema is NOT co-located with the - * importing wsdl. The imported wsdl and its referenced schema are located - * in the same directory as the importing wsdl. - */ -public class JWBS3792GammaTestCase extends JBossWSTest { - - public static JBossWSTestHelper.BaseDeployment<?>[] createDeployments () { - List<JBossWSTestHelper.BaseDeployment<?>> list = new LinkedList<JBossWSTestHelper.BaseDeployment<?>>(); - - list.add( - new JBossWSTestHelper.WarDeployment("jbws3792-wsdlImportGamma.war") { - { archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportGamma.GreetingsWsImpl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportGamma.GreetingsWs.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() - + "/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/Greeting_Simplest.wsdl"), - "wsdl/Greeting_Simplest.wsdl") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() - + "/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello.wsdl"), "wsdl/A/b/Hello.wsdl") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() - + "/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello_schema2.xsd"), "wsdl/A/b/Hello_schema2.xsd") - ; - - } - }); - - return list.toArray(new JBossWSTestHelper.BaseDeployment<?>[list.size()]); - } - - public static Test suite() - { - return new JBossWSTestSetup(JWBS3792GammaTestCase.class, - JBossWSTestHelper.writeToFile(createDeployments())); - } - - - public void testImportSimplest() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() - + ":8080/jbws3792-wsdlImportGamma/GreetingsService?wsdl"); - QName qname = new QName("http://hello/test", "HelloService"); - Service service = Service.create(wsdlURL, qname); - Iterator<QName> it = service.getPorts(); - int cnt = 0; - while (it.hasNext()){ - cnt++; - QName qn = (QName)it.next(); - assertTrue("{http://hello/test}HelloServicePort".equals(qn.toString())); - } - assertTrue("Expected cnt to be 1 but cnt is " + cnt, cnt == 1); - } -} Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3805/JBWS3805TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3805/JBWS3805TestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3805/JBWS3805TestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -26,45 +26,44 @@ import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; -import java.util.LinkedList; -import java.util.List; -import junit.framework.Test; - +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; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; -import org.jboss.wsf.test.JBossWSTestSetup; +import org.junit.Test; +import org.junit.runner.RunWith; /** * [JBWS-3805] Allow overriding soap:address rewrite options in jboss-webservices.xml * */ +(a)RunWith(Arquillian.class) public class JBWS3805TestCase extends JBossWSTest { - public static BaseDeployment<?>[] createDeployments() - { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3805.war") { - { - archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + "Dependencies: org.jboss.ws.common\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3805.EndpointOne.class).addClass(org.jboss.test.ws.jaxws.cxf.jbws3805.EndpointOneImpl.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3805/WEB-INF/jboss-webservices.xml"), "jboss-webservices.xml") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3805/WEB-INF/web.xml")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-jbws3805.war"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + "Dependencies: org.jboss.ws.common\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3805.EndpointOne.class).addClass(org.jboss.test.ws.jaxws.cxf.jbws3805.EndpointOneImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3805/WEB-INF/jboss-webservices.xml"), "jboss-webservices.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3805/WEB-INF/web.xml")); + return archive; } - public static Test suite() - { - return new JBossWSTestSetup(JBWS3805TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testWsdlSoapAddress() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3805/HelloService?wsdl"); + URL wsdlURL = new URL(baseURL + "/HelloService?wsdl"); HttpURLConnection connection = (HttpURLConnection)wsdlURL.openConnection(); try { Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/JBWS3809TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/JBWS3809TestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3809/JBWS3809TestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -21,65 +21,59 @@ */ package org.jboss.test.ws.jaxws.cxf.jbws3809; -import junit.framework.Test; +import java.io.File; +import java.net.URL; + +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.FileAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestSetup; +import org.junit.Test; +import org.junit.runner.RunWith; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import java.io.File; -import java.net.URL; -import java.util.LinkedList; -import java.util.List; - /** + * [JBWS-3809] AbstractDeployment#addEndpoint's check on urlPattern performed on wrong data + * * User: rsearls * Date: 7/25/14 */ +(a)RunWith(Arquillian.class) public class JBWS3809TestCase extends JBossWSTest { - private final String WEB_CONTEXT = "jaxws-cxf-jbws3809"; - - public static JBossWSTestHelper.BaseDeployment<?>[] createDeployments() { - - List<JBossWSTestHelper.BaseDeployment<?>> list = new LinkedList<JBossWSTestHelper.BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jbws3809.jar") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3809.BasicEjb.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3809.EjbPortComponentUri.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3809.EjbWebContext.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3809.EjbWebServiceNoServicename.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3809.dups.EjbWebServiceNoServicename.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3809.EjbWebServiceServicename.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3809.EjbWebServiceDupServicename.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3809.EjbWebServiceProvider.class) - .add(new FileAsset(new File(JBossWSTestHelper.getTestResourcesDir() + - "/jaxws/cxf/jbws3809/META-INF/jboss-webservices.xml")), - "META-INF/jboss-webservices.xml") - .add(new FileAsset(new File(JBossWSTestHelper.getTestResourcesDir() + - "/jaxws/cxf/jbws3809/META-INF/ejb-jar.xml")), - "META-INF/ejb-jar.xml") - ; - } - }); - - return list.toArray(new JBossWSTestHelper.BaseDeployment<?>[list.size()]); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static JavaArchive createDeployment() { + JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-cxf-jbws3809.jar"); + archive.addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3809.BasicEjb.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3809.EjbPortComponentUri.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3809.EjbWebContext.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3809.EjbWebServiceNoServicename.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3809.dups.EjbWebServiceNoServicename.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3809.EjbWebServiceServicename.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3809.EjbWebServiceDupServicename.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3809.EjbWebServiceProvider.class) + .add(new FileAsset(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3809/META-INF/jboss-webservices.xml")), "META-INF/jboss-webservices.xml") + .add(new FileAsset(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3809/META-INF/ejb-jar.xml")), "META-INF/ejb-jar.xml"); + return archive; } - public static Test suite() - { - return new JBossWSTestSetup(JBWS3809TestCase.class, - JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testEjbPortComponentUri() throws Exception { QName serviceName = new QName("http://org.jboss.ws.test", "EjbPortComponentUriService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" - + WEB_CONTEXT + "/MyEjbPortComponentUri?wsdl"); + URL wsdlURL = new URL(baseURL + "/jaxws-cxf-jbws3809/MyEjbPortComponentUri?wsdl"); Service service = Service.create(wsdlURL, serviceName); BasicEjb proxy = (BasicEjb)service.getPort(BasicEjb.class); @@ -87,11 +81,12 @@ assertEquals("EjbPortComponentUri: confirmed", proxy.getStr("confirmed")); } + @Test + @RunAsClient public void testEjbWebContext() throws Exception { QName serviceName = new QName("http://org.jboss.ws.test", "EjbWebContextService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" - + WEB_CONTEXT + "/MyEjbWebContext?wsdl"); + URL wsdlURL = new URL(baseURL + "/jaxws-cxf-jbws3809/MyEjbWebContext?wsdl"); Service service = Service.create(wsdlURL, serviceName); BasicEjb proxy = (BasicEjb)service.getPort(BasicEjb.class); @@ -99,11 +94,12 @@ assertEquals("EjbWebContext: confirmed", proxy.getStr("confirmed")); } + @Test + @RunAsClient public void testEjbWebServiceNoServicename() throws Exception { QName serviceName = new QName("http://org.jboss.ws.test", "EjbWebServiceNoServicenameService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" - + WEB_CONTEXT + "/MyEjbWebServiceNoServicenameService?wsdl"); + URL wsdlURL = new URL(baseURL + "/jaxws-cxf-jbws3809/MyEjbWebServiceNoServicenameService?wsdl"); Service service = Service.create(wsdlURL, serviceName); BasicEjb proxy = (BasicEjb)service.getPort(BasicEjb.class); @@ -111,11 +107,12 @@ assertEquals("EjbWebServiceNoServicename: confirmed", proxy.getStr("confirmed")); } + @Test + @RunAsClient public void testDupEjbWebServiceNoServicename() throws Exception { QName serviceName = new QName("http://org.jboss.ws.test", "EjbWebServiceNoServicenameService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" - + WEB_CONTEXT + "/MyDupEjbWebServiceNoServicenameService?wsdl"); + URL wsdlURL = new URL(baseURL + "/jaxws-cxf-jbws3809/MyDupEjbWebServiceNoServicenameService?wsdl"); Service service = Service.create(wsdlURL, serviceName); BasicEjb proxy = (BasicEjb)service.getPort(BasicEjb.class); @@ -123,11 +120,12 @@ assertEquals("DupEjbWebServiceNoServicename: confirmed", proxy.getStr("confirmed")); } + @Test + @RunAsClient public void testEjbWebServiceServicename() throws Exception { QName serviceName = new QName("http://org.jboss.ws.test", "ServicenameEjbWebService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" - + WEB_CONTEXT + "/ServicenameEjbWebService/EjbWebServiceServicename?wsdl"); + URL wsdlURL = new URL(baseURL + "/jaxws-cxf-jbws3809/ServicenameEjbWebService/EjbWebServiceServicename?wsdl"); Service service = Service.create(wsdlURL, serviceName); BasicEjb proxy = (BasicEjb)service.getPort(BasicEjb.class); @@ -135,11 +133,12 @@ assertEquals("EjbWebServiceServicename: confirmed", proxy.getStr("confirmed")); } + @Test + @RunAsClient public void testEjbWebServiceDupServicename() throws Exception { QName serviceName = new QName("http://org.jboss.ws.test", "ServicenameEjbWebService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" - + WEB_CONTEXT + "/ServicenameEjbWebService/EjbWebServiceDupServicename?wsdl"); + URL wsdlURL = new URL(baseURL + "/jaxws-cxf-jbws3809/ServicenameEjbWebService/EjbWebServiceDupServicename?wsdl"); Service service = Service.create(wsdlURL, serviceName); BasicEjb proxy = (BasicEjb)service.getPort(BasicEjb.class); @@ -148,11 +147,12 @@ } + @Test + @RunAsClient public void testEjbWebServiceProvider() throws Exception { QName serviceName = new QName("http://org.jboss.ws.test", "MyEjbWebServiceProvider"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" - + WEB_CONTEXT + "/EjbWebServiceProvider?wsdl"); + URL wsdlURL = new URL(baseURL + "/jaxws-cxf-jbws3809/EjbWebServiceProvider?wsdl"); Service service = Service.create(wsdlURL, serviceName); BasicEjb proxy = (BasicEjb)service.getPort(BasicEjb.class); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3813/JBWS3813AnnotationTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3813/JBWS3813AnnotationTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3813/JBWS3813AnnotationTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -16,48 +16,51 @@ */ package org.jboss.test.ws.jaxws.cxf.jbws3813; -import junit.framework.Test; +import java.io.File; +import java.net.URL; + +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.FileAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestSetup; +import org.junit.Test; +import org.junit.runner.RunWith; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import java.io.File; -import java.net.URL; -import java.util.LinkedList; -import java.util.List; - +/** + * [JBWS-3813] Add exception name to faultstring/detail/stackTrace + * + * @author rsearls(a)redhat.com + */ +(a)RunWith(Arquillian.class) public class JBWS3813AnnotationTestCase extends JBossWSTest { - public static JBossWSTestHelper.BaseDeployment<?>[] createDeployments() { - List<JBossWSTestHelper.BaseDeployment<?>> list = new LinkedList<JBossWSTestHelper.BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3813-two.war") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3813.EndpointOne.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3813.EndpointTwoImpl.class) - .add(new FileAsset(new File(JBossWSTestHelper.getTestResourcesDir() + - "/jaxws/cxf/jbws3813/WEB-INF/jaxws-endpoint-config.xml")), - "jaxws-endpoint-config.xml") - .add(new FileAsset(new File(JBossWSTestHelper.getTestResourcesDir() + - "/jaxws/cxf/jbws3813/WEB-INF/webTwo.xml")), - "WEB-INF/web.xml"); - } - }); - return list.toArray(new JBossWSTestHelper.BaseDeployment<?>[list.size()]); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-jbws3813-two.war"); + archive.addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3813.EndpointOne.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3813.EndpointTwoImpl.class) + .add(new FileAsset(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3813/WEB-INF/jaxws-endpoint-config.xml")), "jaxws-endpoint-config.xml") + .add(new FileAsset(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3813/WEB-INF/webTwo.xml")), "WEB-INF/web.xml"); + return archive; } - public static Test suite() - { - return new JBossWSTestSetup(JBWS3813AnnotationTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testExceptionFlags() throws Exception { - String endPtAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3813-two/ServiceTwo"; QName serviceName = new QName("http://org.jboss.ws.jaxws.cxf/jbws3813", "ServiceTwo"); - URL wsdlURL = new URL(endPtAddress + "?wsdl"); + URL wsdlURL = new URL(baseURL + "/ServiceTwo?wsdl"); Service service = Service.create(wsdlURL, serviceName); EndpointOne proxy = service.getPort(EndpointOne.class); try Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3813/JBWS3813TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3813/JBWS3813TestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3813/JBWS3813TestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -18,48 +18,49 @@ import java.io.File; import java.net.URL; -import java.util.LinkedList; -import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; -import junit.framework.Test; - +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.FileAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; 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; +import org.junit.Test; +import org.junit.runner.RunWith; +/** + * [JBWS-3813] Add exception name to faultstring/detail/stackTrace + * + * @author rsearls(a)redhat.com + */ +(a)RunWith(Arquillian.class) public class JBWS3813TestCase extends JBossWSTest { - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3813.war") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3813.EndpointOne.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3813.EndpointOneImpl.class) - .add(new FileAsset(new File(JBossWSTestHelper.getTestResourcesDir() + - "/jaxws/cxf/jbws3813/WEB-INF/jaxws-endpoint-config.xml")), - "jaxws-endpoint-config.xml") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3813/WEB-INF/web.xml")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-jbws3813.war"); + archive.addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3813.EndpointOne.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3813.EndpointOneImpl.class) + .add(new FileAsset(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3813/WEB-INF/jaxws-endpoint-config.xml")), "jaxws-endpoint-config.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3813/WEB-INF/web.xml")); + return archive; } - public static Test suite() - { - return new JBossWSTestSetup(JBWS3813TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testExceptionFlags() throws Exception { - String endPtAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3813/ServiceOne"; QName serviceName = new QName("http://org.jboss.ws.jaxws.cxf/jbws3813", "ServiceOne"); - URL wsdlURL = new URL(endPtAddress + "?wsdl"); - Service service = Service.create(wsdlURL, serviceName); + Service service = Service.create(new URL(baseURL + "/ServiceOne?wsdl"), serviceName); EndpointOne proxy = service.getPort(EndpointOne.class); try { Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -25,23 +25,24 @@ import java.io.OutputStream; import java.io.PrintWriter; import java.net.URL; -import java.util.LinkedList; -import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; -import junit.framework.Test; - import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.interceptor.LoggingInInterceptor; +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.stack.cxf.client.UseThreadBusFeature; -import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.junit.Test; +import org.junit.runner.RunWith; /** * Tests configuration of message exchange logging using API @@ -49,58 +50,55 @@ * @author alessio.soldano(a)jboss.com * @since 08-Jul-2010 */ +(a)RunWith(Arquillian.class) public class MessageLoggingTestCase extends JBossWSTest { - private String loggingFeatureEndpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-logging/LoggingFeatureService/LoggingFeatureEndpoint"; - private String loggingInterceptorsEndpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-logging/LoggingInterceptorsService/LoggingInterceptorsEndpoint"; - - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.JarDeployment("jaxws-cxf-logging.jar") { { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.logging.CustomInInterceptor.class) - .addClass(org.jboss.test.ws.jaxws.cxf.logging.LoggingFeatureEndpointImpl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.logging.LoggingInterceptorsEndpointImpl.class); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static JavaArchive createDeployment() { + JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-cxf-logging.jar"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.logging.CustomInInterceptor.class) + .addClass(org.jboss.test.ws.jaxws.cxf.logging.LoggingFeatureEndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.logging.LoggingInterceptorsEndpointImpl.class); + return archive; } - private LoggingEndpoint port; - - public static Test suite() - { - return new JBossWSCXFTestSetup(MessageLoggingTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testLoggingFeature() throws Exception { - URL wsdlURL = new URL(loggingFeatureEndpointURL + "?wsdl"); + URL wsdlURL = new URL(baseURL + "/jaxws-cxf-logging/LoggingFeatureService/LoggingFeatureEndpoint?wsdl"); QName serviceName = new QName("http://logging.cxf.jaxws.ws.test.jboss.org/", "LoggingFeatureService"); Service service = Service.create(wsdlURL, serviceName); QName portQName = new QName("http://logging.cxf.jaxws.ws.test.jboss.org/", "LoggingFeatureEndpointPort"); - port = (LoggingEndpoint)service.getPort(portQName, LoggingEndpoint.class); + LoggingEndpoint port = (LoggingEndpoint)service.getPort(portQName, LoggingEndpoint.class); //This is actually just a sample, the test does not actually assert the logs are written on server side for the exchanges message //The CXF @Feature on the endpoint ensures exchanged messages are written to the server log assertEquals("foo", port.echo("foo")); } + @Test + @RunAsClient public void testLoggingWithCustomInterceptors() throws Exception { - URL wsdlURL = new URL(loggingInterceptorsEndpointURL + "?wsdl"); + URL wsdlURL = new URL(baseURL + "/jaxws-cxf-logging/LoggingInterceptorsService/LoggingInterceptorsEndpoint?wsdl"); QName serviceName = new QName("http://logging.cxf.jaxws.ws.test.jboss.org/", "LoggingInterceptorsService"); Service service = Service.create(wsdlURL, serviceName); QName portQName = new QName("http://logging.cxf.jaxws.ws.test.jboss.org/", "LoggingInterceptorsEndpointPort"); - port = (LoggingEndpoint)service.getPort(portQName, LoggingEndpoint.class); + LoggingEndpoint port = (LoggingEndpoint)service.getPort(portQName, LoggingEndpoint.class); assertEquals("foo", port.echo("foo")); } + @Test + @RunAsClient public void testClientLogging() throws Exception { - URL wsdlURL = new URL(loggingFeatureEndpointURL + "?wsdl"); + URL wsdlURL = new URL(baseURL + "/jaxws-cxf-logging/LoggingFeatureService/LoggingFeatureEndpoint?wsdl"); QName serviceName = new QName("http://logging.cxf.jaxws.ws.test.jboss.org/", "LoggingFeatureService"); Bus bus = BusFactory.newInstance().createBus(); @@ -115,7 +113,7 @@ Service service = Service.create(wsdlURL, serviceName, new UseThreadBusFeature()); QName portQName = new QName("http://logging.cxf.jaxws.ws.test.jboss.org/", "LoggingFeatureEndpointPort"); - port = (LoggingEndpoint)service.getPort(portQName, LoggingEndpoint.class); + LoggingEndpoint port = (LoggingEndpoint)service.getPort(portQName, LoggingEndpoint.class); String content = "foo"; port.echo(content); String s = out.toString(); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/CXFManagementTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/CXFManagementTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/CXFManagementTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -1,41 +1,38 @@ package org.jboss.test.ws.jaxws.cxf.management; import java.io.File; -import java.util.LinkedList; -import java.util.List; import java.util.Set; import javax.management.MBeanServerConnection; import javax.management.ObjectName; -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSCXFTestSetup; +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.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.junit.Test; +import org.junit.runner.RunWith; +(a)RunWith(Arquillian.class) public class CXFManagementTestCase extends JBossWSTest { - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-management.war") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.management.HelloWorld.class) - .addClass(org.jboss.test.ws.jaxws.cxf.management.HelloWorldImpl.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/management/WEB-INF/jboss-webservices.xml"), "jboss-webservices.xml") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/management/WEB-INF/web.xml")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-management.war"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.management.HelloWorld.class) + .addClass(org.jboss.test.ws.jaxws.cxf.management.HelloWorldImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/management/WEB-INF/jboss-webservices.xml"), "jboss-webservices.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/management/WEB-INF/web.xml")); + return archive; } - public static Test suite() - { - return new JBossWSCXFTestSetup(CXFManagementTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testJMXBean() throws Exception { MBeanServerConnection server = getServer(); ObjectName name = new ObjectName("org.apache.cxf:*"); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -23,47 +23,47 @@ import java.io.File; import java.net.URL; -import java.util.LinkedList; -import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSCXFTestSetup; +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.spec.WebArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.junit.Test; +import org.junit.runner.RunWith; +(a)RunWith(Arquillian.class) public class MixedTypeTestCase extends JBossWSTest { private final String targetNS = "http://org.jboss.ws.jaxws.cxf/mixtype"; - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-mixtype.war") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOne.class) - .addClass(org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneEJB3Impl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneImpl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.mixtype.EndpointTwoImpl.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/mixtype/WEB-INF/jboss-web.xml"), "jboss-web.xml") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/mixtype/WEB-INF/web.xml")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-mixtype.war"); + archive.addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOne.class) + .addClass(org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneEJB3Impl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.mixtype.EndpointTwoImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/mixtype/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/mixtype/WEB-INF/web.xml")); + return archive; } - public static Test suite() - { - return new JBossWSCXFTestSetup(MixedTypeTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testEndpoint() throws Exception { - URL wsdlOneURL = new URL("http://" + getServerHost() + ":8080/mixtype/ServiceOne/EndpointOne?wsdl"); + URL wsdlOneURL = new URL(baseURL + "/ServiceOne/EndpointOne?wsdl"); QName serviceOneName = new QName(targetNS, "ServiceOne"); Service service = Service.create(wsdlOneURL, serviceOneName); EndpointOne endpoint = (EndpointOne)service.getPort(new QName(targetNS, "EndpointOnePort"), EndpointOne.class); @@ -72,9 +72,11 @@ assertEquals(1, endpoint.getCount() - initialCount); } + @Test + @RunAsClient public void testEJBEndpoint() throws Exception { - URL wsdlOneURL = new URL("http://" + getServerHost() + ":8080/mixtype/EJBServiceOne/EndpointOneEJB3Impl?wsdl"); + URL wsdlOneURL = new URL(baseURL + "/EJBServiceOne/EndpointOneEJB3Impl?wsdl"); QName serviceOneName = new QName(targetNS, "EJBServiceOne"); Service service = Service.create(wsdlOneURL, serviceOneName); EndpointOne endpoint = (EndpointOne)service.getPort(new QName(targetNS, "EJBEndpointOnePort"), EndpointOne.class); @@ -83,10 +85,12 @@ assertEquals(5, endpoint.getCount() - initialCount); } + @Test + @RunAsClient public void testEndpoint2() throws Exception { //verify everything works with an endpoint extending another one impl - URL wsdlOneURL = new URL("http://" + getServerHost() + ":8080/mixtype/ServiceOne/EndpointTwo?wsdl"); + URL wsdlOneURL = new URL(baseURL + "/ServiceOne/EndpointTwo?wsdl"); QName serviceOneName = new QName(targetNS, "ServiceOne"); Service service = Service.create(wsdlOneURL, serviceOneName); EndpointOne endpoint = (EndpointOne)service.getPort(new QName(targetNS, "EndpointTwoPort"), EndpointOne.class); @@ -95,10 +99,12 @@ assertEquals(1, endpoint.getCount() - initialCount); } + @Test + @RunAsClient public void testEndpoint2WithAnotherURLPattern() throws Exception { //verify everything works with an endpoint extending another one impl - URL wsdlOneURL = new URL("http://" + getServerHost() + ":8080/mixtype/ServiceOne/AnotherEndpointTwo?wsdl"); + URL wsdlOneURL = new URL(baseURL + "/ServiceOne/AnotherEndpointTwo?wsdl"); QName serviceOneName = new QName(targetNS, "ServiceOne"); Service service = Service.create(wsdlOneURL, serviceOneName); EndpointOne endpoint = (EndpointOne)service.getPort(new QName(targetNS, "EndpointTwoPort"), EndpointOne.class); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -22,13 +22,19 @@ package org.jboss.test.ws.jaxws.cxf.noIntegration; import java.io.File; -import java.util.LinkedList; -import java.util.List; +import org.jboss.arquillian.container.test.api.Deployer; +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; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.junit.Test; +import org.junit.runner.RunWith; /** * [AS7-537] Filter Apache CXF and dependencies @@ -38,52 +44,55 @@ * @author alessio.soldano(a)jboss.com * @since 15-Apr-2013 */ +(a)RunWith(Arquillian.class) public class AS7537TestCase extends JBossWSTest { - public static BaseDeployment<?>[] createDeployments() { + private static final String DEP = "jaxws-cxf-embedded-fail"; + @ArquillianResource + Deployer deployer; + + @Deployment(name = DEP, testable = false, managed = false) + public static WebArchive createDeployment() { final File springDir = new File(new File(JBossWSTestHelper.getTestResourcesDir()).getParentFile(), "spring"); final File embeddedCXFDir = new File(new File(JBossWSTestHelper.getTestResourcesDir()).getParentFile(), "cxf-embedded"); - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-embedded-fail.war") { { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: javax.wsdl4j.api,org.apache.ws.xmlschema,org.apache.neethi,org.codehaus.woodstox\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.noIntegration.EchoImpl.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/noIntegration/embedded/WEB-INF/beans.xml"), "beans.xml") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/noIntegration/embedded/WEB-INF/web.xml")) - .addAsLibrary(new File(springDir, "spring-aop-3.0.3.RELEASE.jar")) - .addAsLibrary(new File(springDir, "spring-asm-3.0.3.RELEASE.jar")) - .addAsLibrary(new File(springDir, "spring-beans-3.0.3.RELEASE.jar")) - .addAsLibrary(new File(springDir, "spring-context-3.0.3.RELEASE.jar")) - .addAsLibrary(new File(springDir, "spring-core-3.0.3.RELEASE.jar")) - .addAsLibrary(new File(springDir, "spring-expression-3.0.3.RELEASE.jar")) - .addAsLibrary(new File(springDir, "spring-web-3.0.3.RELEASE.jar")) - .addAsLibrary(new File(embeddedCXFDir, "cxf-api-2.6.6.jar")) - .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-bindings-soap-2.6.6.jar")) - .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-core-2.6.6.jar")) - .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-databinding-jaxb-2.6.6.jar")) - .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-frontend-jaxws-2.6.6.jar")) - .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-frontend-simple-2.6.6.jar")) - .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-transports-http-2.6.6.jar")) - .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-ws-policy-2.6.6.jar")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + WebArchive archive = ShrinkWrap.create(WebArchive.class, DEP + ".war"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: javax.wsdl4j.api,org.apache.ws.xmlschema,org.apache.neethi,org.codehaus.woodstox\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.noIntegration.EchoImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/noIntegration/embedded/WEB-INF/beans.xml"), "beans.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/noIntegration/embedded/WEB-INF/web.xml")) + .addAsLibrary(new File(springDir, "spring-aop-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-asm-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-beans-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-context-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-core-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-expression-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-web-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-api-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-bindings-soap-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-core-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-databinding-jaxb-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-frontend-jaxws-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-frontend-simple-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-transports-http-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-ws-policy-2.6.6.jar")); + return archive; } + @Test + @RunAsClient public void testFailureWithoutJBossDeploymentStructure() throws Exception { boolean undeploy = true; - final String deploymentName = JBossWSTestHelper.writeToFile(createDeployments()); try { - JBossWSTestHelper.deploy(deploymentName); + deployer.deploy(DEP); fail("Deployment failure expected"); } catch (Exception e) { undeploy = false; - assertTrue(e.getMessage().contains("JBAS015599") || e.getMessage().contains("WFLYWS0059")); + assertTrue(e.getCause().getMessage().contains("JBAS015599") || e.getCause().getMessage().contains("WFLYWS0059")); } finally { if (undeploy) { try { - JBossWSTestHelper.undeploy(deploymentName); + deployer.undeploy(DEP); } catch (Exception e) { //ignore } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/DisabledWSSubsystemTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/DisabledWSSubsystemTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/DisabledWSSubsystemTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -26,18 +26,20 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.URL; -import java.util.LinkedList; -import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSCXFTestSetup; +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.spec.WebArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.junit.Test; +import org.junit.runner.RunWith; /** * Verifies a plain Apache CXF ws endpoint war can be deployed on @@ -55,38 +57,38 @@ * @author alessio.soldano(a)jboss.com * @since 15-Apr-2013 */ +(a)RunWith(Arquillian.class) public class DisabledWSSubsystemTestCase extends JBossWSTest { - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-disabledWSSubsystem.war") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.noIntegration.CXFEndpointServlet.class) - .addClass(org.jboss.test.ws.jaxws.cxf.noIntegration.EchoImpl.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/noIntegration/moduleImports/WEB-INF/jboss-deployment-structure.xml"), "jboss-deployment-structure.xml") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/noIntegration/moduleImports/WEB-INF/web.xml")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-disabledWSSubsystem.war"); + archive.addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.noIntegration.CXFEndpointServlet.class) + .addClass(org.jboss.test.ws.jaxws.cxf.noIntegration.EchoImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/noIntegration/moduleImports/WEB-INF/jboss-deployment-structure.xml"), "jboss-deployment-structure.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/noIntegration/moduleImports/WEB-INF/web.xml")); + return archive; } - public static Test suite() - { - return new JBossWSCXFTestSetup(DisabledWSSubsystemTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testEndpointInvocation() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-disabledWSSubsystem/services/Echo1?wsdl"); + URL wsdlURL = new URL(baseURL + "/services/Echo1?wsdl"); Service service = Service.create(wsdlURL, new QName("http://org.jboss.ws.jaxws.cxf/noIntegration", "EchoService")); Echo echo = service.getPort(new QName("http://org.jboss.ws.jaxws.cxf/noIntegration", "EchoEndpointPort"), Echo.class); assertEquals("Foo", echo.echo("Foo")); } + @Test + @RunAsClient public void testServicesPage() throws Exception { - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-disabledWSSubsystem/services"); + URL url = new URL(baseURL + "/services"); InputStream is = url.openStream(); assertNotNull(is); BufferedReader reader = new BufferedReader(new InputStreamReader(is)); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/EmbeddedCXFTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/EmbeddedCXFTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/EmbeddedCXFTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -26,18 +26,20 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.URL; -import java.util.LinkedList; -import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSCXFTestSetup; +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.spec.WebArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.junit.Test; +import org.junit.runner.RunWith; /** * Verifies a plain Apache CXF ws endpoint war can be deployed on @@ -53,55 +55,55 @@ * @author alessio.soldano(a)jboss.com * @since 15-Apr-2013 */ +(a)RunWith(Arquillian.class) public class EmbeddedCXFTestCase extends JBossWSTest { - public static BaseDeployment<?>[] createDeployments() { + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { final File springDir = new File(new File(JBossWSTestHelper.getTestResourcesDir()).getParentFile(), "spring"); final File embeddedCXFDir = new File(new File(JBossWSTestHelper.getTestResourcesDir()).getParentFile(), "cxf-embedded"); - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-embedded.war") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.noIntegration.EchoImpl.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/noIntegration/embedded/WEB-INF/beans.xml"), "beans.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/noIntegration/embedded/WEB-INF/jboss-deployment-structure.xml"), "jboss-deployment-structure.xml") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/noIntegration/embedded/WEB-INF/web.xml")) - .addAsLibrary(new File(springDir, "spring-aop-3.0.3.RELEASE.jar")) - .addAsLibrary(new File(springDir, "spring-asm-3.0.3.RELEASE.jar")) - .addAsLibrary(new File(springDir, "spring-beans-3.0.3.RELEASE.jar")) - .addAsLibrary(new File(springDir, "spring-context-3.0.3.RELEASE.jar")) - .addAsLibrary(new File(springDir, "spring-core-3.0.3.RELEASE.jar")) - .addAsLibrary(new File(springDir, "spring-expression-3.0.3.RELEASE.jar")) - .addAsLibrary(new File(springDir, "spring-web-3.0.3.RELEASE.jar")) - .addAsLibrary(new File(embeddedCXFDir, "cxf-api-2.6.6.jar")) - .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-bindings-soap-2.6.6.jar")) - .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-core-2.6.6.jar")) - .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-databinding-jaxb-2.6.6.jar")) - .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-frontend-jaxws-2.6.6.jar")) - .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-frontend-simple-2.6.6.jar")) - .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-transports-http-2.6.6.jar")) - .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-ws-policy-2.6.6.jar")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-embedded.war"); + archive.addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.noIntegration.EchoImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/noIntegration/embedded/WEB-INF/beans.xml"), "beans.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/noIntegration/embedded/WEB-INF/jboss-deployment-structure.xml"), "jboss-deployment-structure.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/noIntegration/embedded/WEB-INF/web.xml")) + .addAsLibrary(new File(springDir, "spring-aop-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-asm-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-beans-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-context-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-core-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-expression-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-web-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-api-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-bindings-soap-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-core-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-databinding-jaxb-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-frontend-jaxws-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-frontend-simple-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-transports-http-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-ws-policy-2.6.6.jar")); + return archive; } - public static Test suite() - { - return new JBossWSCXFTestSetup(EmbeddedCXFTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testEndpointInvocation() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-embedded/services/Echo1?wsdl"); + URL wsdlURL = new URL(baseURL + "/services/Echo1?wsdl"); Service service = Service.create(wsdlURL, new QName("http://org.jboss.ws.jaxws.cxf/noIntegration", "EchoService")); Echo echo = service.getPort(new QName("http://org.jboss.ws.jaxws.cxf/noIntegration", "EchoEndpointPort"), Echo.class); assertEquals("Foo", echo.echo("Foo")); } + @Test + @RunAsClient public void testServicesPage() throws Exception { - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-embedded/services"); + URL url = new URL(baseURL + "/services"); InputStream is = url.openStream(); assertNotNull(is); BufferedReader reader = new BufferedReader(new InputStreamReader(is)); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/policy/PolicyInterceptorProviderTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/policy/PolicyInterceptorProviderTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/policy/PolicyInterceptorProviderTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -23,57 +23,55 @@ import java.io.File; import java.net.URL; -import java.util.LinkedList; -import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; -import junit.framework.Test; - import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.ws.policy.IgnorablePolicyInterceptorProvider; import org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry; +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.stack.cxf.client.UseThreadBusFeature; -import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.junit.Test; +import org.junit.runner.RunWith; /** * @author alessio.soldano(a)jboss.com * @since 16-Oct-2012 */ +(a)RunWith(Arquillian.class) public class PolicyInterceptorProviderTestCase extends JBossWSTest { - private String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-policy/PIPService/PIPEndpoint"; - - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.JarDeployment("jaxws-cxf-policy.jar") { { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.apache.cxf.impl\n")) //cxf impl required due to custom interceptor using cxf-rt-ws-policy in deployment - .addClass(org.jboss.test.ws.jaxws.cxf.policy.PIPEndpointImpl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.policy.PolicyInterceptorProviderInstallerInterceptor.class) - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/policy/META-INF/unknown-policy.xml"), "unknown-policy.xml"); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static JavaArchive createDeployment() { + JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-cxf-policy.jar"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.apache.cxf.impl\n")) //cxf impl required due to custom interceptor using cxf-rt-ws-policy in deployment + .addClass(org.jboss.test.ws.jaxws.cxf.policy.PIPEndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.policy.PolicyInterceptorProviderInstallerInterceptor.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/policy/META-INF/unknown-policy.xml"), "unknown-policy.xml"); + return archive; } - public static Test suite() - { - return new JBossWSCXFTestSetup(PolicyInterceptorProviderTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - /** * Verifies the policy-enabled client can be configured to ignore a given policy in the wsdl contract * * @throws Exception */ + @Test + @RunAsClient public void testUnsupportedPolicy() throws Exception { Bus bus = BusFactory.newInstance().createBus(); @@ -84,7 +82,7 @@ PolicyInterceptorProviderRegistry reg = bus.getExtension(PolicyInterceptorProviderRegistry.class); reg.register(new IgnorablePolicyInterceptorProvider(new QName("http://my.custom.org/policy", "MyPolicy"))); - URL wsdlURL = new URL(endpointAddress + "?wsdl"); + URL wsdlURL = new URL(baseURL + "/jaxws-cxf-policy/PIPService/PIPEndpoint?wsdl"); QName serviceName = new QName("http://policy.cxf.jaxws.ws.test.jboss.org/", "PIPService"); Service service = Service.create(wsdlURL, serviceName, new UseThreadBusFeature()); QName portQName = new QName("http://policy.cxf.jaxws.ws.test.jboss.org/", "PIPEndpointPort"); @@ -98,6 +96,8 @@ } } + @Test + @RunAsClient public void testUnsupportedPolicyFail() throws Exception { Bus bus = BusFactory.newInstance().createBus(); @@ -105,7 +105,7 @@ { BusFactory.setThreadDefaultBus(bus); - URL wsdlURL = new URL(endpointAddress + "?wsdl"); + URL wsdlURL = new URL(baseURL + "/jaxws-cxf-policy/PIPService/PIPEndpoint?wsdl"); QName serviceName = new QName("http://policy.cxf.jaxws.ws.test.jboss.org/", "PIPService"); Service service = Service.create(wsdlURL, serviceName, new UseThreadBusFeature()); QName portQName = new QName("http://policy.cxf.jaxws.ws.test.jboss.org/", "PIPEndpointPort"); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx/ServletCtxTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx/ServletCtxTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx/ServletCtxTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -24,7 +24,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; -import java.util.LinkedList; import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; @@ -34,47 +33,46 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; -import junit.framework.Test; - +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.wsf.test.JBossWSCXFTestSetup; +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.junit.Test; +import org.junit.runner.RunWith; /** * * @author alessio.soldano(a)jboss.com * @since 09-Jul-2013 */ +(a)RunWith(Arquillian.class) public class ServletCtxTestCase extends JBossWSTest { - private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-servletCtx/ServiceOne"; - - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-servletCtx.war") { { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.logging\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.servletCtx.EndpointOne.class) - .addClass(org.jboss.test.ws.jaxws.cxf.servletCtx.EndpointOneImpl.class); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-servletCtx.war"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.servletCtx.EndpointOne.class) + .addClass(org.jboss.test.ws.jaxws.cxf.servletCtx.EndpointOneImpl.class); + return archive; } - public static Test suite() - { - return new JBossWSCXFTestSetup(ServletCtxTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } + private final String targetNS = "http://org.jboss.ws.jaxws.cxf/servletCtx"; - private String targetNS = "http://org.jboss.ws.jaxws.cxf/servletCtx"; - private EndpointOne portOne; - protected int defaultSize = 30; + private final int defaultSize = 30; + @Test + @RunAsClient public void testAccess() throws Exception { initPort(); @@ -92,11 +90,15 @@ assertEquals(1, portOne.getCount2() - count2); } + @Test + @RunAsClient public void testConcurrentInvocations() throws Exception { runConcurrentTests(false); } + @Test + @RunAsClient public void testConcurrentOneWayInvocations() throws Exception { runConcurrentTests(true); @@ -129,7 +131,7 @@ private void initPort() throws MalformedURLException { - URL wsdlOneURL = new URL(endpointOneURL + "?wsdl"); + URL wsdlOneURL = new URL(baseURL + "/ServiceOne?wsdl"); QName serviceOneName = new QName(targetNS, "ServiceOne"); Service serviceOne = Service.create(wsdlOneURL, serviceOneName); portOne = (EndpointOne) serviceOne.getPort(EndpointOne.class); @@ -165,5 +167,4 @@ } } } - -} +} \ No newline at end of file Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -21,13 +21,22 @@ */ package org.jboss.test.ws.jaxws.cxf.spring; +import java.io.File; import java.net.URL; -import junit.framework.Test; - +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.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.ws.common.IOUtils; -import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Test; +import org.junit.runner.RunWith; /** * An application embedding Spring jars acts as a client to an existing WS endpoint. @@ -36,28 +45,75 @@ * @author alessio.soldano(a)jboss.com * @since 02-Apr-2012 */ +(a)RunWith(Arquillian.class) public final class ClientSpringAppTestCase extends JBossWSTest { - public static Test suite() + private static final String DEP = "jaxws-cxf-spring"; + private static final String CLIENT_DEP = "jaxws-cxf-spring-client"; + + @ArquillianResource + private URL baseURL; + + @Deployment(name = DEP, testable = false) + public static WebArchive createDeployment() { - return new JBossWSCXFTestSetup(ClientSpringAppTestCase.class, DeploymentArchives.SERVER + ", " + DeploymentArchives.CLIENT); + WebArchive archive = ShrinkWrap.create(WebArchive.class, DEP + ".war"); + archive.addManifest().addClass(org.jboss.test.ws.jaxws.cxf.spring.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.cxf.spring.EndpointImpl.class); + return archive; } - + + @Deployment(name = CLIENT_DEP, testable = false) + public static WebArchive createDeployment2() + { + final File SPRING_DIR = new File(new File(JBossWSTestHelper.getTestResourcesDir()).getParentFile(), "spring"); + WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_DEP + ".war"); + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client services\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.spring.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.cxf.spring.Foo.class) + .addClass(org.jboss.test.ws.jaxws.cxf.spring.Helper.class) + .addClass(org.jboss.wsf.test.ClientHelper.class) + .addClass(org.jboss.wsf.test.TestServlet.class) + .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/spring/my-cxf.xml"), "my-cxf.xml") + .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/spring/spring-dd.xml"), "spring-dd.xml") + .addAsLibrary(new File(SPRING_DIR, "spring-aop-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(SPRING_DIR, "spring-asm-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(SPRING_DIR, "spring-beans-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(SPRING_DIR, "spring-context-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(SPRING_DIR, "spring-core-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(SPRING_DIR, "spring-expression-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(SPRING_DIR, "spring-web-3.0.3.RELEASE.jar")); + return archive; + } + + @Test + @RunAsClient + @OperateOnDeployment(CLIENT_DEP) public void testSpringAvailability() throws Exception { assertEquals("1", runTestInContainer("testSpringAvailability", Helper.class.getName())); } + @Test + @RunAsClient + @OperateOnDeployment(CLIENT_DEP) public void testJBossWSCXFSpringBus() throws Exception { assertEquals("1", runTestInContainer("testJBossWSCXFSpringBus", Helper.class.getName())); } + @Test + @RunAsClient + @OperateOnDeployment(CLIENT_DEP) public void testJAXWSClient() throws Exception { assertEquals("1", runTestInContainer("testJAXWSClient", Helper.class.getName())); } + @Test + @RunAsClient + @OperateOnDeployment(CLIENT_DEP) public void testSpringFunctionalities() throws Exception { assertEquals("1", runTestInContainer("testSpringFunctionalities", Helper.class.getName())); @@ -65,7 +121,7 @@ private String runTestInContainer(String test, String helper) throws Exception { - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-spring-client?path=/jaxws-cxf-spring/EndpointService&method=" + URL url = new URL(baseURL + "?path=/jaxws-cxf-spring/EndpointService&method=" + test + "&helper=" + helper); return IOUtils.readAndCloseStream(url.openStream()); } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCaseForked.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCaseForked.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCaseForked.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -21,28 +21,78 @@ */ package org.jboss.test.ws.jaxws.cxf.spring; +import java.io.File; import java.net.URL; -import junit.framework.Test; - +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.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.ws.common.IOUtils; -import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Test; +import org.junit.runner.RunWith; /** * This test is an addition to the org.jboss.test.ws.jaxws.cxf.spring.ClientSpringAppTestCase that runs * in forked mode as it requires setting sys props during test and hence can't be executed concurrently. * + * WARN: this test uses the same deployment names of org.jboss.test.ws.jaxws.cxf.spring.ClientSpringAppTestCase; + * this is not a problem only because this is a -Forked testcase, hence the two tests can't run at the same time. + * * @author alessio.soldano(a)jboss.com * @since 21-Jun-2013 */ +(a)RunWith(Arquillian.class) public final class ClientSpringAppTestCaseForked extends JBossWSTest { - public static Test suite() + private static final String DEP = "jaxws-cxf-spring"; + private static final String CLIENT_DEP = "jaxws-cxf-spring-client"; + + @ArquillianResource + private URL baseURL; + + @Deployment(name = DEP, testable = false) + public static WebArchive createDeployment() { - return new JBossWSCXFTestSetup(ClientSpringAppTestCaseForked.class, DeploymentArchives.SERVER + ", " + DeploymentArchives.CLIENT); + WebArchive archive = ShrinkWrap.create(WebArchive.class, DEP + ".war"); + archive.addManifest().addClass(org.jboss.test.ws.jaxws.cxf.spring.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.cxf.spring.EndpointImpl.class); + return archive; } - + + @Deployment(name = CLIENT_DEP, testable = false) + public static WebArchive createDeployment2() + { + final File SPRING_DIR = new File(new File(JBossWSTestHelper.getTestResourcesDir()).getParentFile(), "spring"); + WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_DEP + ".war"); + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client services\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.spring.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.cxf.spring.Foo.class) + .addClass(org.jboss.test.ws.jaxws.cxf.spring.Helper.class) + .addClass(org.jboss.wsf.test.ClientHelper.class) + .addClass(org.jboss.wsf.test.TestServlet.class) + .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/spring/my-cxf.xml"), "my-cxf.xml") + .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/spring/spring-dd.xml"), "spring-dd.xml") + .addAsLibrary(new File(SPRING_DIR, "spring-aop-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(SPRING_DIR, "spring-asm-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(SPRING_DIR, "spring-beans-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(SPRING_DIR, "spring-context-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(SPRING_DIR, "spring-core-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(SPRING_DIR, "spring-expression-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(SPRING_DIR, "spring-web-3.0.3.RELEASE.jar")); + return archive; + } + + @Test + @RunAsClient + @OperateOnDeployment(CLIENT_DEP) public void testJBossWSCXFBus() throws Exception { assertEquals("1", runTestInContainer("testJBossWSCXFBus", Helper.class.getName())); @@ -50,7 +100,7 @@ private String runTestInContainer(String test, String helper) throws Exception { - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-spring-client?path=/jaxws-cxf-spring/EndpointService&method=" + URL url = new URL(baseURL + "?path=/jaxws-cxf-spring/EndpointService&method=" + test + "&helper=" + helper); return IOUtils.readAndCloseStream(url.openStream()); } Deleted: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/DeploymentArchives.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/DeploymentArchives.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/DeploymentArchives.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -1,65 +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.jaxws.cxf.spring; - -import java.io.File; - -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.wsf.test.JBossWSTestHelper; - -public final class DeploymentArchives -{ - private static final File SPRING_DIR = new File(new File(JBossWSTestHelper.getTestResourcesDir()).getParentFile(), "spring"); - - public static final String SERVER = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-cxf-spring.war") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.spring.Endpoint.class) - .addClass(org.jboss.test.ws.jaxws.cxf.spring.EndpointImpl.class); - } - }); - - public static final String CLIENT = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-cxf-spring-client.war") { { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client services\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.spring.Endpoint.class) - .addClass(org.jboss.test.ws.jaxws.cxf.spring.Foo.class) - .addClass(org.jboss.test.ws.jaxws.cxf.spring.Helper.class) - .addClass(org.jboss.wsf.test.ClientHelper.class) - .addClass(org.jboss.wsf.test.TestServlet.class) - .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/spring/my-cxf.xml"), "my-cxf.xml") - .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/spring/spring-dd.xml"), "spring-dd.xml") - .addAsLibrary(new File(SPRING_DIR, "spring-aop-3.0.3.RELEASE.jar")) - .addAsLibrary(new File(SPRING_DIR, "spring-asm-3.0.3.RELEASE.jar")) - .addAsLibrary(new File(SPRING_DIR, "spring-beans-3.0.3.RELEASE.jar")) - .addAsLibrary(new File(SPRING_DIR, "spring-context-3.0.3.RELEASE.jar")) - .addAsLibrary(new File(SPRING_DIR, "spring-core-3.0.3.RELEASE.jar")) - .addAsLibrary(new File(SPRING_DIR, "spring-expression-3.0.3.RELEASE.jar")) - .addAsLibrary(new File(SPRING_DIR, "spring-web-3.0.3.RELEASE.jar")); - } - }); - - private DeploymentArchives() { - //NOOP - } -} Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -27,23 +27,26 @@ import java.net.NetworkInterface; import java.net.URL; import java.util.Enumeration; -import java.util.LinkedList; -import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Endpoint; import javax.xml.ws.Service; -import junit.framework.Test; - import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; +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.ws.common.IOUtils; -import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.jboss.wsf.test.WrapThreadContextClassLoader; +import org.junit.Test; +import org.junit.runner.RunWith; /** * Test case for publishing a UDP (SOAP-over-UDP 1.1) endpoint through API @@ -51,40 +54,45 @@ * @author alessio.soldano(a)jboss.com * @since 6-May-2013 */ +(a)RunWith(Arquillian.class) public final class UDPEndpointAPITestCase extends JBossWSTest { - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.JarDeployment("jaxws-cxf-udp-api-client.jar") { { + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-udp-api.war"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.common,org.jboss.ws.cxf.jbossws-cxf-client services\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.udp.HelloWorld.class) + .addClass(org.jboss.test.ws.jaxws.cxf.udp.HelloWorldImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.udp.TestServlet.class) + .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/udp/META-INF/wsdl/HelloWorldService.wsdl"), "META-INF/wsdl/HelloWorldService.wsdl"); + return archive; + } + + @Override + protected String getClientJarPaths() { + return JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-cxf-udp-api-client.jar") { { archive .addManifest() .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/udp/META-INF/wsdl/HelloWorldService.wsdl"), "wsdl/HelloWorldService.wsdl"); } }); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-udp-api.war") { { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.common,org.jboss.ws.cxf.jbossws-cxf-client services\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.udp.HelloWorld.class) - .addClass(org.jboss.test.ws.jaxws.cxf.udp.HelloWorldImpl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.udp.TestServlet.class) - .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/udp/META-INF/wsdl/HelloWorldService.wsdl"), "META-INF/wsdl/HelloWorldService.wsdl"); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); } - public static Test suite() - { - return new JBossWSCXFTestSetup(UDPEndpointAPITestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testServerSide() throws Exception { URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-udp-api"); assertEquals("true", IOUtils.readAndCloseStream(url.openStream())); } + @Test + @RunAsClient + @WrapThreadContextClassLoader public void testClientSide() throws Exception { if (!isProperNetworkSetup()) { Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsmex/WSMexTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsmex/WSMexTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsmex/WSMexTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -21,20 +21,22 @@ */ package org.jboss.test.ws.jaxws.cxf.wsmex; -import java.util.LinkedList; -import java.util.List; +import java.net.URL; -import junit.framework.Test; - import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; import org.apache.cxf.ws.mex.MetadataExchange; import org.apache.cxf.ws.mex.model._2004_09.Metadata; import org.apache.cxf.ws.mex.model._2004_09.MetadataSection; +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.spec.JavaArchive; import org.jboss.ws.common.DOMWriter; -import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.junit.Test; +import org.junit.runner.RunWith; import org.w3c.dom.Node; /** @@ -43,31 +45,27 @@ * @author alessio.soldano(a)jboss.com * @since 10-May-2012 */ +(a)RunWith(Arquillian.class) public class WSMexTestCase extends JBossWSTest { - private String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-wsmex/EndpointService"; - - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.JarDeployment("jaxws-cxf-wsmex.jar") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.wsmex.Endpoint.class) - .addClass(org.jboss.test.ws.jaxws.cxf.wsmex.EndpointBean.class); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static JavaArchive createDeployment() { + JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-cxf-wsmex.jar"); + archive.addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.wsmex.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.cxf.wsmex.EndpointBean.class); + return archive; } - public static Test suite() - { - return new JBossWSCXFTestSetup(WSMexTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testEndpoint() throws Exception { JaxWsProxyFactoryBean proxyFac = new JaxWsProxyFactoryBean(); - proxyFac.setAddress(endpointAddress); + proxyFac.setAddress(baseURL + "/jaxws-cxf-wsmex/EndpointService"); MetadataExchange exc = proxyFac.create(MetadataExchange.class); Metadata metadata = exc.get2004(); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/JBWS3084CxfTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/JBWS3084CxfTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/JBWS3084CxfTestCase.java 2014-12-02 12:09:52 UTC (rev 19119) @@ -24,8 +24,6 @@ import java.io.File; import java.net.URL; import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; import javax.xml.namespace.QName; import javax.xml.soap.MessageFactory; @@ -34,43 +32,45 @@ import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPMessage; -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSCXFTestSetup; +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.spec.WebArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.junit.Test; +import org.junit.runner.RunWith; /** * [JBWS-3084] Enable control of chunked encoding when using SOAPConnection. * * @author sberyozk(a)redhat.com */ +(a)RunWith(Arquillian.class) public class JBWS3084CxfTestCase extends JBossWSTest { - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("cxf-saaj-soap-connection.war") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.saaj.jbws3084.InputStreamDataSource.class) - .addClass(org.jboss.test.ws.saaj.jbws3084.ServiceIface.class) - .addClass(org.jboss.test.ws.saaj.jbws3084.ServiceImpl.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl"), "wsdl/SaajService.wsdl") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/saaj/jbws3084/WEB-INF/web.xml")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "cxf-saaj-soap-connection.war"); + archive.addManifest() + .addClass(org.jboss.test.ws.saaj.jbws3084.InputStreamDataSource.class) + .addClass(org.jboss.test.ws.saaj.jbws3084.ServiceIface.class) + .addClass(org.jboss.test.ws.saaj.jbws3084.ServiceImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl"), "wsdl/SaajService.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/saaj/jbws3084/WEB-INF/web.xml")); + return archive; } - public static Test suite() - { - return new JBossWSCXFTestSetup(JBWS3084CxfTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testSoapConnectionGet() throws Exception { - final String serviceURL = "http://" + getServerHost() + ":8080/cxf-saaj-soap-connection/greetMe"; + final String serviceURL = baseURL + "/greetMe"; SOAPConnectionFactory conFac = SOAPConnectionFactory.newInstance(); SOAPConnection con = conFac.createConnection();

9 years, 5 months

1
0
0 / 0

JBossWS SVN: r19118 - in stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf: jbws3679 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-12-01 16:18:19 -0500 (Mon, 01 Dec 2014) New Revision: 19118 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/EarSchemaImportTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/JBWS3679TestCase.java Log: More tests converted... Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/EarSchemaImportTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/EarSchemaImportTestCase.java 2014-12-01 11:23:50 UTC (rev 19117) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/EarSchemaImportTestCase.java 2014-12-01 21:18:19 UTC (rev 19118) @@ -27,52 +27,59 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; -import junit.framework.Test; - +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.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestSetup; +import org.junit.Test; +import org.junit.runner.RunWith; +(a)RunWith(Arquillian.class) public class EarSchemaImportTestCase extends JBossWSTest { - public final String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3655/HelloService"; - - static { - JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jbws3655-ejb.jar") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloWSEJBImpl.class); - } - }); - JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jbws3655-jaxws.jar") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloRequest.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloResponse.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloWs.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloWsImpl.class) - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3655/META-INF/wsdl/Hello.wsdl"), "wsdl/Hello.wsdl") - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3655/META-INF/wsdl/Hello_schema1.xsd"), "wsdl/Hello_schema1.xsd"); - } - }); - JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jbws3655.ear") { { - archive - .addManifest() - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3655/META-INF/application.xml")) - .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-cxf-jbws3655-jaxws.jar"), "lib/jaxws-cxf-jbws3655-jaxws.jar") - .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-cxf-jbws3655-ejb.jar")); - } - }); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static JavaArchive createDeployment3() { + JavaArchive archive1 = ShrinkWrap.create(JavaArchive.class, "jaxws-cxf-jbws3655-ejb.jar"); + archive1.addManifest().addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloWSEJBImpl.class); + writeToDisk(archive1); + + JavaArchive archive2 = ShrinkWrap.create(JavaArchive.class, "jaxws-cxf-jbws3655-jaxws.jar"); + archive2.addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloRequest.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloWs.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloWsImpl.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3655/META-INF/wsdl/Hello.wsdl"), "wsdl/Hello.wsdl") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3655/META-INF/wsdl/Hello_schema1.xsd"), "wsdl/Hello_schema1.xsd"); + writeToDisk(archive2); + + JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-cxf-jbws3655.ear"); + archive.addManifest() + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3655/META-INF/application.xml")) + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-cxf-jbws3655-jaxws.jar"), "lib/jaxws-cxf-jbws3655-jaxws.jar") + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-cxf-jbws3655-ejb.jar")); + return archive; } - - public static Test suite() + + public static void writeToDisk(JavaArchive archive) { - return new JBossWSTestSetup(EarSchemaImportTestCase.class, "jaxws-cxf-jbws3655.ear"); + File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName()); + archive.as(ZipExporter.class).exportTo(file, true); } + @Test + @RunAsClient public void testSchemaImport() throws Exception { - HelloWs port = getPort(endpointAddress); + HelloWs port = getPort(baseURL + "/jaxws-cxf-jbws3655/HelloService"); HelloRequest request = new HelloRequest(); request.setInput("hello"); HelloResponse response = port.doHello(request); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/JBWS3679TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/JBWS3679TestCase.java 2014-12-01 11:23:50 UTC (rev 19117) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/JBWS3679TestCase.java 2014-12-01 21:18:19 UTC (rev 19118) @@ -18,52 +18,52 @@ import java.io.File; import java.net.URL; -import java.util.LinkedList; -import java.util.List; -import junit.framework.Test; - +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.spec.WebArchive; 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; +import org.junit.Test; +import org.junit.runner.RunWith; +(a)RunWith(Arquillian.class) public class JBWS3679TestCase extends JBossWSTest { - public final String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3679/ServletClient"; - - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3679.war") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3679.CDIBeanClient.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3679.EndpointOne.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3679.EndpointOneImpl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3679.EndpointOneService.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3679.ServletClient.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3679/WEB-INF/beans.xml"), "beans.xml") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3679/WEB-INF/web.xml")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-jbws3679.war"); + archive.addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3679.CDIBeanClient.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3679.EndpointOne.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3679.EndpointOneImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3679.EndpointOneService.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3679.ServletClient.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3679/WEB-INF/beans.xml"), "beans.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3679/WEB-INF/web.xml")); + return archive; } - public static Test suite() - { - return new JBossWSTestSetup(JBWS3679TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testServletClient() throws Exception { - URL url = new URL(endpointAddress); + URL url = new URL(baseURL + "/ServletClient"); assertEquals("Echoded with:input", IOUtils.readAndCloseStream(url.openStream())); } + @Test + @RunAsClient public void testCDIClient() throws Exception { - URL url = new URL(endpointAddress + "?client=CDI"); + URL url = new URL(baseURL + "/ServletClient?client=CDI"); assertEquals("Echoded with:cdiInput", IOUtils.readAndCloseStream(url.openStream())); } }

9 years, 5 months

1
0
0 / 0

JBossWS SVN: r19117 - in stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test: java/org/jboss/test/ws/jaxws/cxf/jbws3060 and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-12-01 06:23:50 -0500 (Mon, 01 Dec 2014) New Revision: 19117 Removed: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/DeploymentArchives.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroServletTestCase.java Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060EJB3TestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3516/JBWS3516TestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/JBWS3593TestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/JBWS3628TestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentWSDLTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default.groovy Log: More tests conversion... Deleted: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/DeploymentArchives.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/DeploymentArchives.java 2014-11-27 17:40:48 UTC (rev 19116) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/DeploymentArchives.java 2014-12-01 11:23:50 UTC (rev 19117) @@ -1,59 +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.jaxws.cxf.jaxbintros; - -import java.io.File; - -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.wsf.test.JBossWSTestHelper; - -public final class DeploymentArchives -{ - public static final String SERVER = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jaxbintros.jar") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.Endpoint.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.EndpointBean.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.UserType.class) - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jaxbintros/META-INF/jaxb-intros.xml"), "jaxb-intros.xml"); - } - }); - - public static final String CLIENT = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jaxbintros-client.war") { { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client services\n")) - .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jaxbintros/META-INF/jaxb-intros.xml"), "jaxb-intros.xml") - .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.AnnotatedUserEndpoint.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.AnnotatedUserType.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.Endpoint.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.Helper.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.UserType.class) - .addClass(org.jboss.wsf.test.ClientHelper.class) - .addClass(org.jboss.wsf.test.TestServlet.class); - } - }); - - private DeploymentArchives() { - //NOOP - } -} Deleted: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroServletTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroServletTestCase.java 2014-11-27 17:40:48 UTC (rev 19116) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroServletTestCase.java 2014-12-01 11:23:50 UTC (rev 19117) @@ -1,75 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, 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.jaxws.cxf.jaxbintros; - -import java.net.URL; - -import junit.framework.Test; - -import org.jboss.ws.common.IOUtils; -import org.jboss.wsf.test.JBossWSCXFTestSetup; -import org.jboss.wsf.test.JBossWSTest; - -/** - * Test the JAXBIntroduction features. - * - * jaxb-intros.xml can reside under META-INF or WEB-INF and should be - * picked up by JAXBIntroduction deployment aspect on server side. - * - * @author alessio.soldano(a)jboss.com - */ -public class JAXBIntroServletTestCase extends JBossWSTest -{ - - public static Test suite() - { - return new JBossWSCXFTestSetup(JAXBIntroServletTestCase.class, DeploymentArchives.SERVER + ", " + DeploymentArchives.CLIENT); - } - - /** - * Both client and server side use plain UserType class but have jaxbintros in place to deal with customizations - * - * @throws Exception - */ - public void testEndpoint() throws Exception - { - assertEquals("1", runTestInContainer("testEndpoint")); - } - - /** - * Client side uses the annotated user type class, server side uses the plain one but has jaxbintros in place - * - * @throws Exception - */ - public void testAnnotatedUserEndpoint() throws Exception - { - assertEquals("1", runTestInContainer("testAnnotatedUserEndpoint")); - } - - private String runTestInContainer(String test) throws Exception - { - URL url = new URL("http://" + getServerHost() - + ":8080/jaxws-cxf-jaxbintros-client?path=/jaxws-cxf-jaxbintros/EndpointService&method=" + test - + "&helper=" + Helper.class.getName()); - return IOUtils.readAndCloseStream(url.openStream()); - } -} Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java 2014-11-27 17:40:48 UTC (rev 19116) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java 2014-12-01 11:23:50 UTC (rev 19117) @@ -21,17 +21,28 @@ */ package org.jboss.test.ws.jaxws.cxf.jaxbintros; +import java.io.File; import java.net.MalformedURLException; import java.net.URL; import java.util.Iterator; import javax.xml.namespace.QName; -import junit.framework.Test; - +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.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.ws.common.DOMUtils; -import org.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Test; +import org.junit.runner.RunWith; import org.w3c.dom.Element; /** @@ -42,20 +53,52 @@ * * @author alessio.soldano(a)jboss.com */ +(a)RunWith(Arquillian.class) public class JAXBIntroTestCase extends JBossWSTest { - - private String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-jaxbintros/EndpointService"; + private static final String DEP = "jaxws-cxf-jaxbintros"; + private static final String CLIENT_DEP = "jaxws-cxf-jaxbintros-client"; + private Helper helper; - public static Test suite() - { - return new JBossWSCXFTestSetup(JAXBIntroTestCase.class, DeploymentArchives.SERVER); + @ArquillianResource + private URL baseURL; + + @Deployment(name = DEP, testable = false) + public static JavaArchive createDeployment() { + JavaArchive archive = ShrinkWrap.create(JavaArchive.class, DEP + ".jar"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.EndpointBean.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.UserType.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jaxbintros/META-INF/jaxb-intros.xml"), "jaxb-intros.xml"); + return archive; } + @Deployment(name = CLIENT_DEP, testable = false) + public static WebArchive createDeployment2() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_DEP + ".war"); + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client services\n")) + .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jaxbintros/META-INF/jaxb-intros.xml"), "jaxb-intros.xml") + .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.AnnotatedUserEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.AnnotatedUserType.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.Helper.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.UserType.class) + .addClass(org.jboss.wsf.test.ClientHelper.class) + .addClass(org.jboss.wsf.test.TestServlet.class); + return archive; + } + + @Test + @RunAsClient + @OperateOnDeployment(DEP) public void testWSDLAccess() throws Exception { - URL wsdlURL = new URL(endpointAddress + "?wsdl"); + URL wsdlURL = new URL(baseURL + "/jaxws-cxf-jaxbintros/EndpointService?wsdl"); Element wsdl = DOMUtils.parse(wsdlURL.openStream()); assertNotNull(wsdl); Iterator<Element> it = DOMUtils.getChildElements(wsdl, new QName("http://www.w3.org/2001/XMLSchema","attribute"), true); @@ -75,7 +118,7 @@ { if (helper == null) { - helper = new Helper(endpointAddress); + helper = new Helper(baseURL + "/jaxws-cxf-jaxbintros/EndpointService"); helper.setJAXBIntroURL(getResourceURL("jaxws/cxf/jaxbintros/META-INF/jaxb-intros.xml")); } return helper; @@ -86,6 +129,9 @@ * * @throws Exception */ + @Test + @RunAsClient + @OperateOnDeployment(DEP) public void testEndpoint() throws Exception { assertTrue(getHelper().testEndpoint()); @@ -96,8 +142,44 @@ * * @throws Exception */ + @Test + @RunAsClient + @OperateOnDeployment(DEP) public void testAnnotatedUserEndpoint() throws Exception { assertTrue(getHelper().testAnnotatedUserEndpoint()); } + + /** + * Both client and server side use plain UserType class but have jaxbintros in place to deal with customizations + * + * @throws Exception + */ + @Test + @RunAsClient + @OperateOnDeployment(CLIENT_DEP) + public void testEndpointInContainer() throws Exception + { + assertEquals("1", runTestInContainer("testEndpoint")); + } + + /** + * Client side uses the annotated user type class, server side uses the plain one but has jaxbintros in place + * + * @throws Exception + */ + @Test + @RunAsClient + @OperateOnDeployment(CLIENT_DEP) + public void testAnnotatedUserEndpointInContainer() throws Exception + { + assertEquals("1", runTestInContainer("testAnnotatedUserEndpoint")); + } + + private String runTestInContainer(String test) throws Exception + { + URL url = new URL(baseURL + "?path=/jaxws-cxf-jaxbintros/EndpointService&method=" + test + + "&helper=" + Helper.class.getName()); + return IOUtils.readAndCloseStream(url.openStream()); + } } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060EJB3TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060EJB3TestCase.java 2014-11-27 17:40:48 UTC (rev 19116) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060EJB3TestCase.java 2014-12-01 11:23:50 UTC (rev 19117) @@ -21,54 +21,47 @@ */ package org.jboss.test.ws.jaxws.cxf.jbws3060; -import java.util.LinkedList; -import java.util.List; +import java.net.URL; -import junit.framework.Test; - +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.wsf.test.JBossWSCXFTestSetup; -import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.runner.RunWith; /** * * @author alessio.soldano(a)jboss.com * @since 11-Jun-2010 */ +(a)RunWith(Arquillian.class) public class JBWS3060EJB3TestCase extends JBWS3060Tests { - private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/ServiceOne/EndpointOne"; - private String endpointTwoURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/ServiceTwo/EndpointTwo"; + @ArquillianResource + private URL baseURL; - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jbws3060.jar") { { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.logging\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3060.EndpointOneEJB3Impl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3060.EndpointTwoEJB3Impl.class); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @Deployment(testable = false) + public static JavaArchive createDeployment() { + JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-cxf-jbws3060.jar"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3060.EndpointOneEJB3Impl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3060.EndpointTwoEJB3Impl.class); + return archive; } - - public static Test suite() - { - return new JBossWSCXFTestSetup(JBWS3060EJB3TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Override protected String getEndpointOneURL() { - return endpointOneURL; + return baseURL + "/jaxws-cxf-jbws3060/ServiceOne/EndpointOne"; } @Override protected String getEndpointTwoURL() { - return endpointTwoURL; + return baseURL + "/jaxws-cxf-jbws3060/ServiceTwo/EndpointTwo"; } } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java 2014-11-27 17:40:48 UTC (rev 19116) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java 2014-12-01 11:23:50 UTC (rev 19117) @@ -22,55 +22,49 @@ package org.jboss.test.ws.jaxws.cxf.jbws3060; import java.io.File; -import java.util.LinkedList; -import java.util.List; +import java.net.URL; -import junit.framework.Test; - +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.wsf.test.JBossWSCXFTestSetup; +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.junit.runner.RunWith; /** * * @author alessio.soldano(a)jboss.com * @since 11-Jun-2010 */ +(a)RunWith(Arquillian.class) public class JBWS3060ServletTestCase extends JBWS3060Tests { - private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060-jse/ServiceOne/EndpointOne"; - private String endpointTwoURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060-jse/ServiceTwo/EndpointTwo"; + @ArquillianResource + private URL baseURL; - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3060-jse.war") { { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.logging\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3060.EndpointOneImpl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3060.EndpointTwoImpl.class) - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3060/WEB-INF/web.xml")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @Deployment(testable = false) + public static WebArchive createDeploymentJse() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-jbws3060-jse.war"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3060.EndpointOneImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3060.EndpointTwoImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3060/WEB-INF/web.xml")); + return archive; } - public static Test suite() - { - return new JBossWSCXFTestSetup(JBWS3060ServletTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - @Override protected String getEndpointOneURL() { - return endpointOneURL; + return baseURL + "/ServiceOne/EndpointOne"; } @Override protected String getEndpointTwoURL() { - return endpointTwoURL; + return baseURL + "/ServiceTwo/EndpointTwo"; } } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java 2014-11-27 17:40:48 UTC (rev 19116) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060Tests.java 2014-12-01 11:23:50 UTC (rev 19117) @@ -33,7 +33,9 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; +import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.wsf.test.JBossWSTest; +import org.junit.Test; /** * @@ -53,6 +55,8 @@ protected abstract String getEndpointTwoURL(); + @Test + @RunAsClient public void testAccess() throws Exception { initPorts(); @@ -66,11 +70,15 @@ assertEquals(1, portTwo.getCount() - count2); } + @Test + @RunAsClient public void testConcurrentInvocations() throws Exception { runConcurrentTests(false); } + @Test + @RunAsClient public void testConcurrentOneWayInvocations() throws Exception { runConcurrentTests(true); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java 2014-11-27 17:40:48 UTC (rev 19116) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java 2014-12-01 11:23:50 UTC (rev 19117) @@ -23,25 +23,27 @@ import java.io.File; import java.net.URL; -import java.util.LinkedList; -import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; -import junit.framework.Test; - import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.endpoint.Client; import org.apache.cxf.endpoint.ClientLifeCycleListener; import org.apache.cxf.endpoint.ClientLifeCycleManager; import org.apache.cxf.endpoint.ServerLifeCycleManager; +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.spec.WebArchive; import org.jboss.wsf.stack.cxf.client.UseThreadBusFeature; -import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.junit.Test; +import org.junit.runner.RunWith; /** * Verifies the Bus is properly configured with Client/Server LifeCycleManager instances @@ -49,28 +51,23 @@ * @author alessio.soldano(a)jboss.com * @since 08-Aug-2010 */ +(a)RunWith(Arquillian.class) public class ClientServerLifeCycleTestCase extends JBossWSTest { - private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3098/ServiceOne/EndpointOne"; - private String targetNS = "http://org.jboss.ws.jaxws.cxf/jbws3098"; - - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3098.war") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3098.EndpointOneImpl.class) - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3098/WEB-INF/web.xml")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-jbws3098.war"); + archive.addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3098.EndpointOneImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3098/WEB-INF/web.xml")); + return archive; } - public static Test suite() - { - return new JBossWSCXFTestSetup(ClientServerLifeCycleTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testClientLifeCycleManager() { Bus bus = BusFactory.newInstance().createBus(); @@ -81,6 +78,8 @@ } } + @Test + @RunAsClient public void testServerLifeCycleManager() { Bus bus = BusFactory.newInstance().createBus(); @@ -91,13 +90,15 @@ } } + @Test + @RunAsClient public void testCustomClientLifeCycleListener() throws Exception { Bus bus = BusFactory.newInstance().createBus(); BusFactory.setThreadDefaultBus(bus); try { - URL wsdlOneURL = new URL(endpointOneURL + "?wsdl"); - QName serviceOneName = new QName(targetNS, "ServiceOne"); + URL wsdlOneURL = new URL(baseURL + "/ServiceOne/EndpointOne?wsdl"); + QName serviceOneName = new QName("http://org.jboss.ws.jaxws.cxf/jbws3098", "ServiceOne"); Service serviceOne = Service.create(wsdlOneURL, serviceOneName, new UseThreadBusFeature()); CustomClientLifeCycleListener listener = new CustomClientLifeCycleListener(); ClientLifeCycleManager mgr = bus.getExtension(ClientLifeCycleManager.class); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java 2014-11-27 17:40:48 UTC (rev 19116) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java 2014-12-01 11:23:50 UTC (rev 19117) @@ -25,7 +25,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; -import java.util.LinkedList; import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; @@ -35,13 +34,17 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; -import junit.framework.Test; - +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.wsf.test.JBossWSCXFTestSetup; +import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.junit.Test; +import org.junit.runner.RunWith; /** * [JBWS-3497] Add ability to configure the queue depth on the asynchronous (@Oneway) work queue. @@ -49,31 +52,29 @@ * @author alessio.soldano(a)jboss.com * */ +(a)RunWith(Arquillian.class) public class JBWS3497TestCase extends JBossWSTest { private EndpointOne portOne; protected int defaultSize = 200; - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jbws3497.jar") { { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.apache.cxf,org.jboss.ws.cxf.jbossws-cxf-server\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3497.EndpointOne.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3497.EndpointOneImpl.class) - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3497/META-INF/jboss-webservices.xml"), "jboss-webservices.xml"); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static JavaArchive createDeployment() { + JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-cxf-jbws3497.jar"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.apache.cxf,org.jboss.ws.cxf.jbossws-cxf-server\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3497.EndpointOne.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3497.EndpointOneImpl.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3497/META-INF/jboss-webservices.xml"), "jboss-webservices.xml"); + return archive; } - public static Test suite() - { - return new JBossWSCXFTestSetup(JBWS3497TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testAccess() throws Exception { initPorts(); @@ -115,7 +116,7 @@ private void initPorts() throws MalformedURLException { - URL wsdlOneURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3497/ServiceOne/EndpointOne?wsdl"); + URL wsdlOneURL = new URL(baseURL + "/jaxws-cxf-jbws3497/ServiceOne/EndpointOne?wsdl"); QName serviceOneName = new QName("http://org.jboss.ws.jaxws.cxf/jbws3497", "ServiceOne"); Service serviceOne = Service.create(wsdlOneURL, serviceOneName); portOne = (EndpointOne)serviceOne.getPort(EndpointOne.class); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3516/JBWS3516TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3516/JBWS3516TestCase.java 2014-11-27 17:40:48 UTC (rev 19116) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3516/JBWS3516TestCase.java 2014-12-01 11:23:50 UTC (rev 19117) @@ -23,8 +23,6 @@ import java.io.File; import java.net.URL; -import java.util.LinkedList; -import java.util.List; import java.util.Map; import javax.xml.namespace.QName; @@ -32,49 +30,49 @@ import javax.xml.ws.Service; import javax.xml.ws.soap.AddressingFeature; -import junit.framework.Test; - import org.apache.cxf.ws.addressing.AddressingProperties; import org.apache.cxf.ws.addressing.AttributedURIType; import org.apache.cxf.ws.addressing.EndpointReferenceType; import org.apache.cxf.ws.addressing.JAXWSAConstants; +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.ArchivePath; import org.jboss.shrinkwrap.api.Filter; +import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; 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; +import org.junit.Test; +import org.junit.runner.RunWith; +(a)RunWith(Arquillian.class) public class JBWS3516TestCase extends JBossWSTest { - public final String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3516/helloworld"; - - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3516.war") { { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.apache.cxf.impl\n")) - .addPackages(false, new Filter<ArchivePath>() { - @Override - public boolean include(ArchivePath object) - { - return !object.get().contains("TestCase"); - }}, "org.jboss.test.ws.jaxws.cxf.jbws3516") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3516/WEB-INF/wsdl/hello_world.wsdl"), "wsdl/hello_world.wsdl") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3516/WEB-INF/web.xml")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-jbws3516.war"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.apache.cxf.impl\n")) + .addPackages(false, new Filter<ArchivePath>() { + @Override + public boolean include(ArchivePath object) + { + return !object.get().contains("TestCase"); + }}, "org.jboss.test.ws.jaxws.cxf.jbws3516") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3516/WEB-INF/wsdl/hello_world.wsdl"), "wsdl/hello_world.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3516/WEB-INF/web.xml")); + return archive; } - public static Test suite() - { - return new JBossWSTestSetup(JBWS3516TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testOneWayFaultTo() throws Exception { Greeter greeter = initPort(); @@ -103,6 +101,8 @@ } + @Test + @RunAsClient public void testRequestResponseFaultTo() throws Exception { Greeter greeter = initPort(); @@ -140,7 +140,7 @@ private Greeter initPort() throws Exception { - URL wsdlURL = new URL(endpointAddress + "?wsdl"); + URL wsdlURL = new URL(baseURL + "/helloworld?wsdl"); QName qname = new QName("http://jboss.org/hello_world", "SOAPService"); Service service = Service.create(wsdlURL, qname); Greeter greeter = service.getPort(Greeter.class, new AddressingFeature()); @@ -149,7 +149,7 @@ private String getTargetServletResult() throws Exception { - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3516/target/result"); + URL url = new URL(baseURL + "/target/result"); return IOUtils.readAndCloseStream(url.openStream()); } } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/JBWS3593TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/JBWS3593TestCase.java 2014-11-27 17:40:48 UTC (rev 19116) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/JBWS3593TestCase.java 2014-12-01 11:23:50 UTC (rev 19117) @@ -37,44 +37,43 @@ import javax.xml.ws.handler.Handler; import javax.xml.ws.soap.SOAPBinding; -import junit.framework.Test; - +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; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; -import org.jboss.wsf.test.JBossWSTestSetup; +import org.junit.Test; +import org.junit.runner.RunWith; /** * * @author alessio.soldano(a)jboss.com * @since 18-Jun-2013 */ +(a)RunWith(Arquillian.class) public class JBWS3593TestCase extends JBossWSTest { - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3593/EndpointBean"; - - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3593.war") { { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.apache.cxf\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3593.EndpointBean.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3593.MTOMOutInterceptor.class); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-jbws3593.war"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.apache.cxf\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3593.EndpointBean.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3593.MTOMOutInterceptor.class); + return archive; } - public static Test suite() - { - return new JBossWSTestSetup(JBWS3593TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testMTOMAccess() throws Exception { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + URL wsdlURL = new URL(baseURL + "/EndpointBean?wsdl"); QName qname = new QName("http://org.jboss.ws/jaxws/jbws3593", "EndpointBeanService"); Service service = Service.create(wsdlURL, qname); Endpoint port = service.getPort(Endpoint.class); @@ -88,9 +87,11 @@ assertEquals("Hello Jimbo", messg); } + @Test + @RunAsClient public void testTextXmlAccess() throws Exception { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + URL wsdlURL = new URL(baseURL + "/EndpointBean?wsdl"); QName qname = new QName("http://org.jboss.ws/jaxws/jbws3593", "EndpointBeanService"); Service service = Service.create(wsdlURL, qname); Endpoint port = service.getPort(Endpoint.class); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/JBWS3628TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/JBWS3628TestCase.java 2014-11-27 17:40:48 UTC (rev 19116) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/JBWS3628TestCase.java 2014-12-01 11:23:50 UTC (rev 19117) @@ -23,21 +23,22 @@ import java.io.File; import java.net.URL; -import java.util.LinkedList; -import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; -import junit.extensions.TestSetup; -import junit.framework.Test; - +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.ws.common.IOUtils; -import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.junit.Test; +import org.junit.runner.RunWith; /** * Testcase for system property expansion support in WSDL documents. @@ -45,54 +46,36 @@ * @author alessio.soldano(a)jboss.com * @since 21-Jul-2014 */ +(a)RunWith(Arquillian.class) public class JBWS3628TestCase extends JBossWSTest { private static final String POLICY_NAME = "WS-Addressing_policy"; - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3628.war") { { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.apache.cxf\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3628.EndpointOneImpl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3628.CheckInterceptor.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3628/WEB-INF/wsdl/service.wsdl"), "wsdl/service.wsdl"); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-jbws3628.war"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.apache.cxf\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3628.EndpointOneImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3628.CheckInterceptor.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3628/WEB-INF/wsdl/service.wsdl"), "wsdl/service.wsdl"); + return archive; } - public static Test suite() - { - TestSetup setup = new JBossWSCXFTestSetup(JBWS3628TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())) { - - private static final String PROPERTY_NAME = "org.jboss.wsf.test.JBWS3628TestCase.policy"; - private String formerValue; - - @Override - public void setUp() throws Exception { - formerValue = JBossWSTestHelper.setSystemProperty(PROPERTY_NAME, POLICY_NAME); - super.setUp(); - } - - @Override - public void tearDown() throws Exception { - super.tearDown(); - JBossWSTestHelper.setSystemProperty(PROPERTY_NAME, formerValue); - formerValue = null; - } - }; - return setup; - } - + @Test + @RunAsClient public void testWSDL() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3628/ServiceOne" + "?wsdl"); + URL wsdlURL = new URL(baseURL + "/ServiceOne" + "?wsdl"); checkPolicyReference(wsdlURL, POLICY_NAME); } + @Test + @RunAsClient public void testInvocation() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3628/ServiceOne" + "?wsdl"); + URL wsdlURL = new URL(baseURL + "/ServiceOne" + "?wsdl"); Service service = Service.create(wsdlURL, new QName("http://org.jboss.ws.jaxws.cxf/jbws3628", "ServiceOne")); EndpointOne port = service.getPort(new QName("http://org.jboss.ws.jaxws.cxf/jbws3628", "EndpointOnePort"), EndpointOne.class); assertEquals("Foo", port.echo("Foo")); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java 2014-11-27 17:40:48 UTC (rev 19116) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java 2014-12-01 11:23:50 UTC (rev 19117) @@ -25,27 +25,30 @@ import java.io.File; import java.io.PrintWriter; import java.net.URL; -import java.util.LinkedList; -import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; -import junit.framework.Test; - import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.interceptor.LoggingInInterceptor; import org.apache.cxf.message.Message; import org.apache.cxf.ws.security.SecurityConstants; +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.stack.cxf.client.UseThreadBusFeature; import org.jboss.wsf.test.CryptoHelper; -import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.jboss.wsf.test.WrapThreadContextClassLoader; +import org.junit.Test; +import org.junit.runner.RunWith; /** * @@ -53,42 +56,45 @@ * @author alessio.soldano(a)jboss.com * @since 13-Jun-2013 */ +(a)RunWith(Arquillian.class) public class PolicyAttachmentTestCase extends JBossWSTest { - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3648-b.war") { { + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-jbws3648-b.war"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client, org.apache.ws.security\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointFour.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointFourImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointThree.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointThreeImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.KeystorePasswordCallback.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3648-b/WEB-INF/bob.jks"), "classes/bob.jks") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3648-b/WEB-INF/bob.properties"), "classes/bob.properties") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3648-b/policies/My-WSSE-conf-BINDING.xml"), + "classes/META-INF/policies/My-WSSE-conf-BINDING.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3648-b/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore"), + "classes/META-INF/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore"); + return archive; + } + + @Override + protected String getClientJarPaths() { + return JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jbws3648-b-client.jar") { { archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client, org.apache.ws.security\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointFour.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointFourImpl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointThree.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointThreeImpl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.KeystorePasswordCallback.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3648-b/WEB-INF/bob.jks"), "classes/bob.jks") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3648-b/WEB-INF/bob.properties"), "classes/bob.properties") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3648-b/policies/My-WSSE-conf-BINDING.xml"), - "classes/META-INF/policies/My-WSSE-conf-BINDING.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3648-b/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore"), - "classes/META-INF/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore"); - } - }); - list.add(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jbws3648-b-client.jar") { { - archive .addManifest() .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3648-b/META-INF/alice.jks"), "alice.jks") .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3648-b/META-INF/alice.properties"), "alice.properties"); } }); - return list.toArray(new BaseDeployment<?>[list.size()]); } - public static Test suite() - { - return new JBossWSCXFTestSetup(PolicyAttachmentTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient + @WrapThreadContextClassLoader public void testEndpointWithWSSEAndWSA() throws Exception { Bus bus = BusFactory.newInstance().createBus(); BusFactory.setThreadDefaultBus(bus); @@ -97,7 +103,7 @@ try { bus.getInInterceptors().add(new LoggingInInterceptor(pw)); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3648-b/ServiceThree" + "?wsdl"); + URL wsdlURL = new URL(baseURL + "/ServiceThree?wsdl"); QName serviceName = new QName("http://org.jboss.ws.jaxws.cxf/jbws3648", "ServiceThree"); Service service = Service.create(wsdlURL, serviceName, new UseThreadBusFeature()); EndpointThree proxy = (EndpointThree)service.getPort(EndpointThree.class); @@ -114,6 +120,9 @@ } } + @Test + @RunAsClient + @WrapThreadContextClassLoader public void testEndpointWithCustomWSSEAndWSA() throws Exception { Bus bus = BusFactory.newInstance().createBus(); BusFactory.setThreadDefaultBus(bus); @@ -122,7 +131,7 @@ try { bus.getInInterceptors().add(new LoggingInInterceptor(pw)); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3648-b/ServiceFour" + "?wsdl"); + URL wsdlURL = new URL(baseURL + "/ServiceFour?wsdl"); QName serviceName = new QName("http://org.jboss.ws.jaxws.cxf/jbws3648", "ServiceFour"); Service service = Service.create(wsdlURL, serviceName, new UseThreadBusFeature()); EndpointFour proxy = (EndpointFour)service.getPort(EndpointFour.class); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentWSDLTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentWSDLTestCase.java 2014-11-27 17:40:48 UTC (rev 19116) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentWSDLTestCase.java 2014-12-01 11:23:50 UTC (rev 19117) @@ -22,17 +22,18 @@ package org.jboss.test.ws.jaxws.cxf.jbws3648; import java.net.URL; -import java.util.LinkedList; -import java.util.List; -import junit.framework.Test; - +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.ws.common.IOUtils; -import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.junit.Test; +import org.junit.runner.RunWith; /** * @@ -40,29 +41,27 @@ * @author alessio.soldano(a)jboss.com * @since 06-Jun-2013 */ +(a)RunWith(Arquillian.class) public class PolicyAttachmentWSDLTestCase extends JBossWSTest { - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3648.war") { { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointOneImpl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointTwo.class) - .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointTwoImpl.class); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-jbws3648.war"); + archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointOneImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointTwo.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointTwoImpl.class); + return archive; } - public static Test suite() - { - return new JBossWSCXFTestSetup(PolicyAttachmentWSDLTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - } - + @Test + @RunAsClient public void testEndpointOneWSDL() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3648/ServiceOne" + "?wsdl"); + URL wsdlURL = new URL(baseURL + "/ServiceOne?wsdl"); checkPolicyAttachments(wsdlURL, new String[]{"WS-RM_Policy_spec_example", "WS-SP-EX223_binding_policy", "WS-SP-EX223_Binding_Operation_Input_Policy", @@ -70,9 +69,11 @@ "WS-Addressing_binding_policy"}); } + @Test + @RunAsClient public void testEndpointTwoWSDL() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3648/ServiceTwo" + "?wsdl"); + URL wsdlURL = new URL(baseURL + "/ServiceTwo?wsdl"); checkPolicyAttachments(wsdlURL, new String[]{"WS-RM_Policy_spec_example", "WS-SP-EX223_binding_policy", "WS-SP-EX223_Binding_Operation_Input_Policy", Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default.groovy =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default.groovy 2014-11-27 17:40:48 UTC (rev 19116) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jbws-testsuite-default.groovy 2014-12-01 11:23:50 UTC (rev 19117) @@ -197,6 +197,14 @@ /** + * + * Add a system property for JBWS-3628 testcase + */ +root.children().add(1, new Node(null, 'system-properties', null)) //add system-properties node after the extensions +def systemProperties = root.'system-properties'[0] +systemProperties.appendNode('property', ['name':'org.jboss.wsf.test.JBWS3628TestCase.policy','value':'WS-Addressing_policy']) + +/** * Save the configuration to a new file */

9 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits December 2014