Author: thomas.diesler(a)jboss.com Date: 2007-05-26 07:44:22 -0400 (Sat, 26 May 2007) New Revision: 3267 Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java Removed: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt Modified: trunk/build/ant-import/build-testsuite.xml trunk/build/build.xml trunk/integration/native/ant-import/build-testsuite.xml trunk/integration/native/src/main/etc/bindist-build.xml trunk/integration/sunri/ant-import/build-testsuite.xml trunk/integration/sunri/src/main/etc/bindist-build.xml trunk/integration/xfire/ant-import/build-testsuite.xml trunk/integration/xfire/src/main/etc/bindist-build.xml trunk/jbossws-core/ant-import-tests/build-testsuite.xml Log: Include testsuite jaxws samples in core testsuite Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/build/ant-import/build-testsuite.xml 2007-05-26 11:44:22 UTC (rev 3267) @@ -10,14 +10,13 @@ <project> - <property name="tests.etc.dir" value="${tests.dir}/etc"/> - <property name="tests.java.dir" value="${tests.dir}/java"/> - <property name="tests.resources.dir" value="${tests.dir}/resources"/> - <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> + <!-- Verify required properties that must be set before this file is imported --> + <fail message="Tests output dir not set." unless="tests.output.dir"/> + <!-- Use -Ddebug=true for remote debugging --> <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"> <isset property="debug"/> @@ -71,13 +70,10 @@ <isset property="jboss.home"/> </condition> - <fail message="Excludes file not set. Run tests-jboss50 or tests-jboss42" unless="excludesfile"/> - <echo/> <echo message="-----------------------------------------------"/> <echo message="jboss.home = ${jboss.home}"/> <echo message="java.home = ${java.home}"/> - <echo message="excludesfile = ${excludesfile}"/> <echo message="-----------------------------------------------"/> <tstamp> @@ -163,11 +159,13 @@ <!-- ================================================================== --> <macrodef name="macro-compile-classes"> + <attribute name="excludesfile"/> <attribute name="srcdir"/> <sequential> <mkdir dir="${tests.output.dir}/classes"/> + <echo message="excludesfile = @{excludesfile}"/> <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" - failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> + failonerror="${javac.fail.onerror}" excludesfile="@{excludesfile}"> <src path="@{srcdir}"/> <classpath refid="tests.javac.classpath"/> </javac> @@ -186,6 +184,7 @@ <copy todir="${tests.output.dir}/classes"> <fileset dir="@{srcdir}/etc"> <include name="jndi.properties"/> + <include name="tst.policy"/> <include name="log4j.xml"/> </fileset> </copy> @@ -250,7 +249,7 @@ <!-- Run a collection of unit tests. - ant -Dtest=tools test + ant -Dtest=jaxws/samples/provider test --> <target name="test" depends="tests-init" if="test" description="Run all unit tests in a given directory"> <antcall target="tests-run-internal"> @@ -270,12 +269,12 @@ <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/> - <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/> + <sysproperty key="java.security.policy" value="${tests.output.dir}/classes/tst.policy"/> <sysproperty key="jboss.home" value="${jboss.home}"/> <sysproperty key="jbosstest.host.name" value="${node0}"/> <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> - <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/> - <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.truststore"/> + <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/> + <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/> <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/> @@ -287,14 +286,14 @@ <formatter type="plain" usefile="true"/> <formatter type="xml" usefile="true"/> <batchtest todir="${tests.output.dir}/reports" fork="true"> - <fileset dir="${tests.output.dir}/classes" includes="${include.wildcard}" excludes="${exclude.wildcard}" excludesfile="${excludesfile}"/> + <fileset dir="${tests.output.dir}/classes" includes="${include.wildcard}" excludes="${exclude.wildcard}"/> </batchtest> </junit> </target> <!-- Run a single unit test. - ant -Dtest=org.jboss.test.ws.jaxrpc.samples.jsr109pojo.RpcJSETestCase one-test + ant -Dtest=org.jboss.test.ws.jaxws.samples.provider.ProviderPayloadTestCase one-test --> <target name="one-test" depends="tests-init" if="test" description="Run a single unit test"> <mkdir dir="${tests.output.dir}/reports"/> @@ -306,14 +305,14 @@ <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/> - <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/> + <sysproperty key="java.security.policy" value="${tests.output.dir}/classes/tst.policy"/> <sysproperty key="jboss.home" value="${jboss.home}"/> <sysproperty key="jbosstest.host.name" value="${node0}"/> <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> <!-- http://jira.jboss.com/jira/browse/JBWS-917 - <sysproperty key="javax.net.ssl.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/> - <sysproperty key="javax.net.ssl.trustStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.truststore"/> + <sysproperty key="javax.net.ssl.keyStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/> + <sysproperty key="javax.net.ssl.trustStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/> <sysproperty key="javax.net.ssl.keyStorePassword" value="jbossws"/> <sysproperty key="javax.net.ssl.trustStorePassword" value="jbossws"/> <sysproperty key="javax.net.ssl.keyStoreType" value="jks"/> @@ -321,8 +320,8 @@ --> <!-- HTTPS hostname wrong: should be <localhost> --> <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/> - <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/> - <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.truststore"/> + <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/> + <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/> <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/> Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/build/build.xml 2007-05-26 11:44:22 UTC (rev 3267) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- $Id$ --> + <!-- ====================================================================== --> <!-- --> <!-- JBoss, the OpenSource J2EE webOS --> @@ -9,8 +11,93 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id$ --> +<!-- + The JBossWS project is organised like this + + +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~+ + Target Container: | AS-5.0 | | AS-4.2 | | | + +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | | + +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | | + Container Integration: | jbossws-jboss50 | | jbossws-jboss42 | | | + +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | | + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ | | + WS SPI: | jbossws-spi | | | + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ | | + +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | | + WS Stack Integration: | jbossws-native | | jbossws-sunri | | jbossws-xfire | | | + +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | | + +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | | + WS Stack: | jbossws-core | | Sun JAXWS | | Codehaus XFire | | | + +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | | + WS-* Extensions: +~+ +~+ +~+ +~+ +~+ +~+ | | + | | | | | | | | | | | | | | + | | | | | | | | | | | | | | + | | | | | | | | | | | | | | + | | | | | | | | | | | | | | + | | | | | | | | | | | | | | + +~+ +~+ +~+ +~+ +~+ +~+ +~~~~+ + JAXWS Testsuite + + + Typically you would build, deploy, test one of the WS stacks against one of the supported target containers. + Here we explain first the manual procedure. Further down you find instruction on how to do this using our + automated Hudson QA environment. + + Working with the Integration layers + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + To run the general JAXWS samples against our native WS stack on JBoss-5.0 you would run the sequence below. + This is also the required sequence before any SVN commit. If one of the tests fails, please complain loudly. + + cd integration/native + ant deploy-jboss50 + ant tests-samples + To run the collection of provider sample tests, you would run + + ant -Dtest=jaxws/samples/provider test + + To run a single specific test, you would run + + ant -Dtest=org.jboss.test.ws.jaxws.samples.provider.ProviderPayloadTestCase one-test + + This can be done in debug mode as well + + ant -Ddebug=true -Dtest=org.jboss.test.ws.jaxws.samples.provider.ProviderPayloadTestCase one-test + + Working with JBossWS Core + ~~~~~~~~~~~~~~~~~~~~~~~~~ + + The jbossws-core testssuite is a superset of the general JAXWS testsuite. It tests our native stack, jaxrpc, the tools layer, etc + This shows how to run the full core testsuite against JBoss-5.0 + + cd jbossws-core + ant deploy-jboss50 + ant tests + + Working with the Hudson QA environment + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + The Hudson QA environment helps you to test any supported stack against any supported target container. + To setup Hudson on your local box, you would run + + cd build + ant hudson-setup + ant hudson-start + + When you hit http://localhost:8180/hudson you should be able to + + 1. login + 2. build a target container + 3. run a testsuite against the target container + + Publicly, Hudson is available at http://jbws.dyndns.org:8180/hudson/ + + + Have fun + good luck + The JBossWS Team +--> + <project default="main" basedir=".." name="JBossWS-Build"> <import file="${basedir}/build/ant-import/build-setup.xml"/> Modified: trunk/integration/native/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/native/ant-import/build-testsuite.xml 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/integration/native/ant-import/build-testsuite.xml 2007-05-26 11:44:22 UTC (rev 3267) @@ -10,11 +10,9 @@ <project> - <property name="tests.dir" value="${testsuite.dir}/src"/> <property name="tests.output.dir" value="${int.native.dir}/output-tests"/> - <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> - + <!-- Define excludesfile --> <condition property="excludesfile" value="${int.native.dir}/src/test/resources/excludes-jboss50.txt"> <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> @@ -22,7 +20,7 @@ <condition property="excludesfile" value="${int.native.dir}/src/test/resources/excludes-jboss42.txt"> <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> </condition> - + <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> @@ -48,7 +46,7 @@ <!-- ================================================================== --> <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.java.dir}"/> + <macro-compile-classes srcdir="${tests.java.dir}" excludesfile="${excludesfile}"/> </target> </project> Modified: trunk/integration/native/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/native/src/main/etc/bindist-build.xml 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/integration/native/src/main/etc/bindist-build.xml 2007-05-26 11:44:22 UTC (rev 3267) @@ -99,7 +99,7 @@ <!-- ================================================================== --> <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.dir}/java"/> + <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> </target> <!-- ================================================================== --> Modified: trunk/integration/sunri/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-26 11:44:22 UTC (rev 3267) @@ -10,11 +10,9 @@ <project> - <property name="tests.dir" value="${testsuite.dir}/src"/> <property name="tests.output.dir" value="${int.sunri.dir}/output-tests"/> - <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> - + <!-- Define excludesfile --> <condition property="excludesfile" value="${int.sunri.dir}/src/test/resources/excludes-jboss50.txt"> <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> @@ -22,7 +20,7 @@ <condition property="excludesfile" value="${int.sunri.dir}/src/test/resources/excludes-jboss42.txt"> <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> </condition> - + <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> @@ -57,7 +55,7 @@ <!-- ================================================================== --> <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.java.dir}"/> + <macro-compile-classes srcdir="${tests.java.dir}" excludesfile="${excludesfile}"/> </target> </project> Modified: trunk/integration/sunri/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-26 11:44:22 UTC (rev 3267) @@ -108,7 +108,7 @@ <!-- ================================================================== --> <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.dir}/java"/> + <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> </target> <!-- ================================================================== --> Modified: trunk/integration/xfire/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-26 11:44:22 UTC (rev 3267) @@ -10,11 +10,9 @@ <project> - <property name="tests.dir" value="${testsuite.dir}/src"/> <property name="tests.output.dir" value="${int.xfire.dir}/output-tests"/> - <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> - + <!-- Define excludesfile --> <condition property="excludesfile" value="${int.xfire.dir}/src/test/resources/excludes-jboss50.txt"> <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> @@ -22,7 +20,7 @@ <condition property="excludesfile" value="${int.xfire.dir}/src/test/resources/excludes-jboss42.txt"> <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> </condition> - + <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> @@ -77,7 +75,7 @@ <!-- ================================================================== --> <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.java.dir}"/> + <macro-compile-classes srcdir="${tests.java.dir}" excludesfile="${excludesfile}"/> </target> </project> Modified: trunk/integration/xfire/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-05-26 11:44:22 UTC (rev 3267) @@ -127,7 +127,7 @@ <!-- ================================================================== --> <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.dir}/java"/> + <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> </target> <!-- ================================================================== --> Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-26 11:44:22 UTC (rev 3267) @@ -11,16 +11,14 @@ <project> <property name="tests.dir" value="${core.dir}/src/test"/> + <property name="tests.resources.dir" value="${tests.dir}/resources"/> <property name="tests.output.dir" value="${core.dir}/output-tests"/> <import file="${build.dir}/ant-import/build-testsuite.xml"/> - <!-- Available integration target --> - <property name="integration.target.${jbossws.integration.target}" value="true"/> - <!-- Define excluded tests --> <property name="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"/> - <property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/> + <property name="excludesfile" value="${core.dir}/src/test/resources/${excludes-short-name}"/> <!-- Init the various classpaths @@ -184,8 +182,8 @@ <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean"/> </target> - <target name="tests-generate-resources" depends="servicegen,wstools,wsprovide"> - <macro-compile-classes srcdir="${tests.output.dir}/wstools/java"/> + <target name="tests-compile-generated-resources" depends="servicegen,wstools,wsprovide"> + <macro-compile-classes srcdir="${tests.output.dir}/wstools/java" excludesfile="${excludesfile}"/> </target> <!-- ================================================================== --> @@ -193,8 +191,9 @@ <!-- ================================================================== --> <target name="tests-compile" depends="wsconsume,tests-classpath" description="Compile sources"> - <macro-compile-classes srcdir="${tests.output.dir}/wsconsume/java"/> - <macro-compile-classes srcdir="${tests.java.dir}"/> + <macro-compile-classes srcdir="${tests.output.dir}/wsconsume/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${testsuite.dir}/src/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${core.dir}/src/test/java" excludesfile="${excludesfile}"/> </target> <!-- ================================================================== --> @@ -203,14 +202,16 @@ <!-- Copy resources --> <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> + <macro-copy-resources srcdir="${testsuite.dir}/src"/> <macro-copy-resources srcdir="${tests.dir}"/> </target> - <target name="tests-jars" depends="wsconsume,tests-compile,tests-copy-resources,tests-generate-resources" description="Build the deployments."> + <target name="tests-jars" depends="wsconsume,tests-compile,tests-copy-resources,tests-compile-generated-resources" description="Build the deployments."> <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxrpc.xml" target="build-jars-jaxrpc"/> <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/> <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/> <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/> + <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> </target> <target name="tests-main" depends="tests-jars" description="Build the deployments."/> Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java (from rev 3266, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java) =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2007-05-26 11:44:22 UTC (rev 3267) @@ -0,0 +1,277 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.complex; + +// $Id$ + +import java.io.File; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; + +/** + * A complex JAX-WS test + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @author Thomas.Diesler(a)jboss.com + */ +public class ComplexTestCase extends JBossWSTest +{ + private Registration port; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(ComplexTestCase.class, "jaxws-complex.war"); + } + + protected void setUp() throws Exception + { + super.setUp(); + URL wsdlURL = new File("resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl").toURL(); + QName serviceName = new QName("http://complex.jaxws.ws.test.jboss.org/";, "RegistrationService"); + Service service = Service.create(wsdlURL, serviceName); + port = (Registration)service.getPort(Registration.class); + } + + public void testRegistration() throws Exception + { + Customer customer = getFredJackson(); + customer.getReferredCustomers().add(getJohnDoe()); + customer.getReferredCustomers().add(getAlCapone()); + + XMLGregorianCalendar cal = getCalendar(); + + port.register(customer, cal); + + customer = getAlCapone(); + try + { + port.register(customer, cal); + fail("Expected AlreadyRegisteredFault"); + } + catch (AlreadyRegisteredFault_Exception e) + { + assertEquals(456, e.getFaultInfo().getExistingId()); + } + } + + public void testInvoiceRegistration() throws Exception + { + InvoiceCustomer customer = getInvoiceFredJackson(); + customer.getReferredCustomers().add(getJohnDoe()); + customer.getReferredCustomers().add(getAlCapone()); + + assertTrue(port.registerForInvoice(customer)); + } + + public void testOtherPackage() throws Exception + { + Statistics stats = port.getStatistics(getFredJackson()); + + System.out.println(stats.getActivationTime()); + assertEquals(10, stats.getHits()); + } + + public void testBulkRegistration() throws Exception + { + List<Customer> customers = new ArrayList<Customer>(); + customers.add(getFredJackson()); + customers.add(getJohnDoe()); + + List<Long> result = port.bulkRegister(customers, getCalendar()); + + assertEquals(123, result.get(0).longValue()); + assertEquals(124, result.get(1).longValue()); + + customers.clear(); + customers.add(getFredJackson()); + customers.add(getInvalid(754)); + customers.add(getInvalid(753)); + customers.add(getJohnDoe()); + customers.add(getInvalid(752)); + + try + { + port.bulkRegister(customers, getCalendar()); + } + catch (ValidationFault_Exception e) + { + List<Long> failedCustomers = e.getFaultInfo().getFailedCustomers(); + assertEquals(754, failedCustomers.get(0).longValue()); + assertEquals(753, failedCustomers.get(1).longValue()); + assertEquals(752, failedCustomers.get(2).longValue()); + } + } + + private Customer getFredJackson() + { + Name name = new Name(); + name.setFirstName("Fred"); + name.setMiddleName("Jones"); + name.setLastName("Jackson"); + + Address address = new Address(); + address.setCity("Atlanta"); + address.setState("Georgia"); + address.setZip("53717"); + address.setStreet("Yet Another Peach Tree St."); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("123"); + number1.setExchange("456"); + number1.setLine("7890"); + + PhoneNumber number2 = new PhoneNumber(); + number1.setAreaCode("333"); + number1.setExchange("222"); + number1.setLine("1234"); + + Customer customer = new Customer(); + customer.setId(123); + customer.setName(name); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.getContactNumbers().add(number2); + return customer; + } + + private InvoiceCustomer getInvoiceFredJackson() + { + Name name = new Name(); + name.setFirstName("Fred"); + name.setMiddleName("Jones"); + name.setLastName("Jackson"); + + Address address = new Address(); + address.setCity("Atlanta"); + address.setState("Georgia"); + address.setZip("53717"); + address.setStreet("Yet Another Peach Tree St."); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("123"); + number1.setExchange("456"); + number1.setLine("7890"); + + PhoneNumber number2 = new PhoneNumber(); + number1.setAreaCode("333"); + number1.setExchange("222"); + number1.setLine("1234"); + + InvoiceCustomer customer = new InvoiceCustomer(); + customer.setId(123); + customer.setName(name); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.getContactNumbers().add(number2); + customer.setCycleDay(10); + return customer; + } + + private Customer getJohnDoe() + { + Name name = new Name(); + name.setFirstName("John"); + name.setLastName("Doe"); + + Address address = new Address(); + address.setCity("New York"); + address.setState("New York"); + address.setZip("10010"); + address.setStreet("Park Street"); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("555"); + number1.setExchange("867"); + number1.setLine("5309"); + + Customer customer = new Customer(); + customer.setName(name); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.setId(124); + return customer; + } + + private Customer getInvalid(long id) + { + Address address = new Address(); + address.setCity("New York"); + address.setState("New York"); + address.setZip("10010"); + address.setStreet("Park Street"); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("555"); + number1.setExchange("867"); + number1.setLine("5309"); + + Customer customer = new Customer(); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.setId(id); + return customer; + } + + private Customer getAlCapone() + { + Name name = new Name(); + name.setFirstName("Al"); + name.setLastName("Capone"); + + Address address = new Address(); + address.setCity("Chicago"); + address.setState("Illinois"); + address.setZip("60619"); + address.setStreet("7244 South Prairie Avenue."); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("888"); + number1.setExchange("722"); + number1.setLine("7322"); + + Customer customer = new Customer(); + customer.setName(name); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.setId(125); + return customer; + } + + private XMLGregorianCalendar getCalendar() throws DatatypeConfigurationException + { + DatatypeFactory calFactory = DatatypeFactory.newInstance(); + XMLGregorianCalendar cal = calFactory.newXMLGregorianCalendar(2002, 4, 5, 0, 0, 0, 0, 0); + return cal; + } +} \ No newline at end of file Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java 2007-05-26 11:44:22 UTC (rev 3267) @@ -1,277 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.complex; - -// $Id$ - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.datatype.DatatypeConfigurationException; -import javax.xml.datatype.DatatypeFactory; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * A complex JAX-WS test - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @author Thomas.Diesler(a)jboss.com - */ -public class JSR181ComplexTestCase extends JBossWSTest -{ - private Registration port; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(JSR181ComplexTestCase.class, "jaxws-complex.war"); - } - - protected void setUp() throws Exception - { - super.setUp(); - URL wsdlURL = new File("resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl").toURL(); - QName serviceName = new QName("http://complex.jaxws.ws.test.jboss.org/";, "RegistrationService"); - Service service = Service.create(wsdlURL, serviceName); - port = (Registration)service.getPort(Registration.class); - } - - public void testRegistration() throws Exception - { - Customer customer = getFredJackson(); - customer.getReferredCustomers().add(getJohnDoe()); - customer.getReferredCustomers().add(getAlCapone()); - - XMLGregorianCalendar cal = getCalendar(); - - port.register(customer, cal); - - customer = getAlCapone(); - try - { - port.register(customer, cal); - fail("Expected AlreadyRegisteredFault"); - } - catch (AlreadyRegisteredFault_Exception e) - { - assertEquals(456, e.getFaultInfo().getExistingId()); - } - } - - public void testInvoiceRegistration() throws Exception - { - InvoiceCustomer customer = getInvoiceFredJackson(); - customer.getReferredCustomers().add(getJohnDoe()); - customer.getReferredCustomers().add(getAlCapone()); - - assertTrue(port.registerForInvoice(customer)); - } - - public void testOtherPackage() throws Exception - { - Statistics stats = port.getStatistics(getFredJackson()); - - System.out.println(stats.getActivationTime()); - assertEquals(10, stats.getHits()); - } - - public void testBulkRegistration() throws Exception - { - List<Customer> customers = new ArrayList<Customer>(); - customers.add(getFredJackson()); - customers.add(getJohnDoe()); - - List<Long> result = port.bulkRegister(customers, getCalendar()); - - assertEquals(123, result.get(0).longValue()); - assertEquals(124, result.get(1).longValue()); - - customers.clear(); - customers.add(getFredJackson()); - customers.add(getInvalid(754)); - customers.add(getInvalid(753)); - customers.add(getJohnDoe()); - customers.add(getInvalid(752)); - - try - { - port.bulkRegister(customers, getCalendar()); - } - catch (ValidationFault_Exception e) - { - List<Long> failedCustomers = e.getFaultInfo().getFailedCustomers(); - assertEquals(754, failedCustomers.get(0).longValue()); - assertEquals(753, failedCustomers.get(1).longValue()); - assertEquals(752, failedCustomers.get(2).longValue()); - } - } - - private Customer getFredJackson() - { - Name name = new Name(); - name.setFirstName("Fred"); - name.setMiddleName("Jones"); - name.setLastName("Jackson"); - - Address address = new Address(); - address.setCity("Atlanta"); - address.setState("Georgia"); - address.setZip("53717"); - address.setStreet("Yet Another Peach Tree St."); - - PhoneNumber number1 = new PhoneNumber(); - number1.setAreaCode("123"); - number1.setExchange("456"); - number1.setLine("7890"); - - PhoneNumber number2 = new PhoneNumber(); - number1.setAreaCode("333"); - number1.setExchange("222"); - number1.setLine("1234"); - - Customer customer = new Customer(); - customer.setId(123); - customer.setName(name); - customer.setAddress(address); - customer.getContactNumbers().add(number1); - customer.getContactNumbers().add(number2); - return customer; - } - - private InvoiceCustomer getInvoiceFredJackson() - { - Name name = new Name(); - name.setFirstName("Fred"); - name.setMiddleName("Jones"); - name.setLastName("Jackson"); - - Address address = new Address(); - address.setCity("Atlanta"); - address.setState("Georgia"); - address.setZip("53717"); - address.setStreet("Yet Another Peach Tree St."); - - PhoneNumber number1 = new PhoneNumber(); - number1.setAreaCode("123"); - number1.setExchange("456"); - number1.setLine("7890"); - - PhoneNumber number2 = new PhoneNumber(); - number1.setAreaCode("333"); - number1.setExchange("222"); - number1.setLine("1234"); - - InvoiceCustomer customer = new InvoiceCustomer(); - customer.setId(123); - customer.setName(name); - customer.setAddress(address); - customer.getContactNumbers().add(number1); - customer.getContactNumbers().add(number2); - customer.setCycleDay(10); - return customer; - } - - private Customer getJohnDoe() - { - Name name = new Name(); - name.setFirstName("John"); - name.setLastName("Doe"); - - Address address = new Address(); - address.setCity("New York"); - address.setState("New York"); - address.setZip("10010"); - address.setStreet("Park Street"); - - PhoneNumber number1 = new PhoneNumber(); - number1.setAreaCode("555"); - number1.setExchange("867"); - number1.setLine("5309"); - - Customer customer = new Customer(); - customer.setName(name); - customer.setAddress(address); - customer.getContactNumbers().add(number1); - customer.setId(124); - return customer; - } - - private Customer getInvalid(long id) - { - Address address = new Address(); - address.setCity("New York"); - address.setState("New York"); - address.setZip("10010"); - address.setStreet("Park Street"); - - PhoneNumber number1 = new PhoneNumber(); - number1.setAreaCode("555"); - number1.setExchange("867"); - number1.setLine("5309"); - - Customer customer = new Customer(); - customer.setAddress(address); - customer.getContactNumbers().add(number1); - customer.setId(id); - return customer; - } - - private Customer getAlCapone() - { - Name name = new Name(); - name.setFirstName("Al"); - name.setLastName("Capone"); - - Address address = new Address(); - address.setCity("Chicago"); - address.setState("Illinois"); - address.setZip("60619"); - address.setStreet("7244 South Prairie Avenue."); - - PhoneNumber number1 = new PhoneNumber(); - number1.setAreaCode("888"); - number1.setExchange("722"); - number1.setLine("7322"); - - Customer customer = new Customer(); - customer.setName(name); - customer.setAddress(address); - customer.getContactNumbers().add(number1); - customer.setId(125); - return customer; - } - - private XMLGregorianCalendar getCalendar() throws DatatypeConfigurationException - { - DatatypeFactory calFactory = DatatypeFactory.newInstance(); - XMLGregorianCalendar cal = calFactory.newXMLGregorianCalendar(2002, 4, 5, 0, 0, 0, 0, 0); - return cal; - } -} \ No newline at end of file Deleted: trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt =================================================================== --- trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt 2007-05-25 17:29:47 UTC (rev 3266) +++ trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt 2007-05-26 11:44:22 UTC (rev 3267) @@ -1,17 +0,0 @@ -# Always excludes -org/jboss/test/ws/interop/** -org/jboss/test/ws/benchmark/** - -# JBossAS-4.2 excludes -org/jboss/test/ws/jaxrpc/jbws723/** - -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/endpoint/** -org/jboss/test/ws/jaxws/jbws1581/** -org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase* -org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/serviceref/** - -org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* -org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*