Author: richard.opalka(a)jboss.com Date: 2009-05-19 05:03:30 -0400 (Tue, 19 May 2009) New Revision: 10050 Added: framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase1-sar/ framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase1-sar/META-INF/ framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase1-sar/META-INF/application.xml framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase2-sar/ framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase2-sar/META-INF/ framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase2-sar/META-INF/application.xml framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase3-sar/ framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase3-sar/META-INF/ framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase3-sar/META-INF/application.xml framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase4-sar/ framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase4-sar/META-INF/ framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase4-sar/META-INF/application.xml Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java Log: [JBWS-2074] extending test case Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-05-18 11:20:46 UTC (rev 10049) +++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-05-19 09:03:30 UTC (rev 10050) @@ -560,6 +560,38 @@ <include name="ejb-jar.xml"/> </metainf> </jar> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase1.sar"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxws-jbws2074-usecase1.war"/> + </fileset> + <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase1-sar/META-INF"> + <include name="application.xml"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase2.sar"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxws-jbws2074-usecase2.jar"/> + </fileset> + <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase2-sar/META-INF"> + <include name="application.xml"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase3.sar"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxws-jbws2074-usecase3.war"/> + </fileset> + <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase3-sar/META-INF"> + <include name="application.xml"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase4.sar"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxws-jbws2074-usecase4.jar"/> + </fileset> + <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase4-sar/META-INF"> + <include name="application.xml"/> + </metainf> + </jar> <!-- jaxws-jbws2150 --> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2150.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2150/WEB-INF/web.xml"> Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2009-05-18 11:20:46 UTC (rev 10049) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2009-05-19 09:03:30 UTC (rev 10050) @@ -41,10 +41,10 @@ { public static Test suite() { - return new JBossWSTestSetup(JBWS2074TestCase.class, "jaxws-jbws2074-usecase1.war"); + return new JBossWSTestSetup(JBWS2074TestCase.class, ""); } - public void testUsecase1() throws Exception + public void executeTest() throws Exception { String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws2074-usecase1/Service"; QName serviceName = new QName("http://ws.jboss.org/jbws2074";, "POJOService"); @@ -62,4 +62,30 @@ assertEquals(expStr.toString(), retStr); } + public void testUsecase1WithoutSar() throws Exception + { + try + { + deploy("jaxws-jbws2074-usecase1.war"); + executeTest(); + } + finally + { + undeploy("jaxws-jbws2074-usecase1.war"); + } + } + + public void testUsecase1WithSar() throws Exception + { + try + { + deploy("jaxws-jbws2074-usecase1.sar"); + executeTest(); + } + finally + { + undeploy("jaxws-jbws2074-usecase1.sar"); + } + } + } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java 2009-05-18 11:20:46 UTC (rev 10049) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java 2009-05-19 09:03:30 UTC (rev 10050) @@ -41,10 +41,10 @@ { public static Test suite() { - return new JBossWSTestSetup(JBWS2074TestCase.class, "jaxws-jbws2074-usecase2.jar"); + return new JBossWSTestSetup(JBWS2074TestCase.class, ""); } - public void testUsecase1() throws Exception + public void executeTest() throws Exception { String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws2074-usecase2/Service"; QName serviceName = new QName("http://ws.jboss.org/jbws2074";, "EJB3Service"); @@ -58,4 +58,30 @@ assertEquals(expStr.toString(), retStr); } + public void testUsecase2WithoutSar() throws Exception + { + try + { + deploy("jaxws-jbws2074-usecase2.jar"); + executeTest(); + } + finally + { + undeploy("jaxws-jbws2074-usecase2.jar"); + } + } + + public void testUsecase2WithSar() throws Exception + { + try + { + deploy("jaxws-jbws2074-usecase2.sar"); + executeTest(); + } + finally + { + undeploy("jaxws-jbws2074-usecase2.sar"); + } + } + } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java 2009-05-18 11:20:46 UTC (rev 10049) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java 2009-05-19 09:03:30 UTC (rev 10050) @@ -41,10 +41,10 @@ { public static Test suite() { - return new JBossWSTestSetup(JBWS2074TestCase.class, "jaxws-jbws2074-usecase3.war"); + return new JBossWSTestSetup(JBWS2074TestCase.class, ""); } - public void testUsecase1() throws Exception + public void executeTest() throws Exception { String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws2074-usecase3/Service"; QName serviceName = new QName("http://ws.jboss.org/jbws2074";, "POJOService"); @@ -58,4 +58,30 @@ assertEquals(expStr.toString(), retStr); } + public void testUsecase3WithoutSar() throws Exception + { + try + { + deploy("jaxws-jbws2074-usecase3.war"); + executeTest(); + } + finally + { + undeploy("jaxws-jbws2074-usecase3.war"); + } + } + + public void testUsecase3WithSar() throws Exception + { + try + { + deploy("jaxws-jbws2074-usecase3.sar"); + executeTest(); + } + finally + { + undeploy("jaxws-jbws2074-usecase3.sar"); + } + } + } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java 2009-05-18 11:20:46 UTC (rev 10049) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java 2009-05-19 09:03:30 UTC (rev 10050) @@ -42,10 +42,10 @@ public static Test suite() { - return new JBossWSTestSetup(JBWS2074TestCase.class, "jaxws-jbws2074-usecase4.jar"); + return new JBossWSTestSetup(JBWS2074TestCase.class, ""); } - public void testUsecase1() throws Exception + public void executeTest() throws Exception { String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws2074-usecase4/Service"; QName serviceName = new QName("http://ws.jboss.org/jbws2074";, "EJB3Service"); @@ -63,4 +63,30 @@ assertEquals(expStr.toString(), retStr); } + public void testUsecase4WithoutSar() throws Exception + { + try + { + deploy("jaxws-jbws2074-usecase4.jar"); + executeTest(); + } + finally + { + undeploy("jaxws-jbws2074-usecase4.jar"); + } + } + + public void testUsecase4WithSar() throws Exception + { + try + { + deploy("jaxws-jbws2074-usecase4.sar"); + executeTest(); + } + finally + { + undeploy("jaxws-jbws2074-usecase4.sar"); + } + } + } Added: framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase1-sar/META-INF/application.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase1-sar/META-INF/application.xml (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase1-sar/META-INF/application.xml 2009-05-19 09:03:30 UTC (rev 10050) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<application + version="1.4" + xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"> + <display-name>jbws2074 issue</display-name> + <module> + <web> + <web-uri>jaxws-jbws2074-usecase1.war</web-uri> + <context-root>/jaxws-jbws2074-usecase1</context-root> + </web> + </module> +</application> Added: framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase2-sar/META-INF/application.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase2-sar/META-INF/application.xml (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase2-sar/META-INF/application.xml 2009-05-19 09:03:30 UTC (rev 10050) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<application + version="1.4" + xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"> + <display-name>jbws2074 issue</display-name> + <module> + <java>jaxws-jbws2074-usecase2.jar</java> + </module> +</application> Added: framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase3-sar/META-INF/application.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase3-sar/META-INF/application.xml (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase3-sar/META-INF/application.xml 2009-05-19 09:03:30 UTC (rev 10050) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<application + version="1.4" + xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"> + <display-name>jbws2074 issue</display-name> + <module> + <web> + <web-uri>jaxws-jbws2074-usecase3.war</web-uri> + <context-root>/jaxws-jbws2074-usecase3</context-root> + </web> + </module> +</application> Added: framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase4-sar/META-INF/application.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase4-sar/META-INF/application.xml (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase4-sar/META-INF/application.xml 2009-05-19 09:03:30 UTC (rev 10050) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<application + version="1.4" + xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"> + <display-name>jbws2074 issue</display-name> + <module> + <java>jaxws-jbws2074-usecase4.jar</java> + </module> +</application>