[jbossws-commits] JBossWS SVN: r15378 - in shared-testsuite/branches/JBWS-3393: testsuite/src/test/ant-import and 17 other directories.

Author: alessio.soldano(a)jboss.com Date: 2011-12-14 17:49:55 -0500 (Wed, 14 Dec 2011) New Revision: 15378 Removed: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/console/ Modified: shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTest.java shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/ant-import/build-jars-jaxws.xml shared-testsuite/branches/JBWS-3393/testsuite/src/test/ant-import/build-samples-jaxws.xml shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java Log: Updates to the testsuites Modified: shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTest.java =================================================================== --- shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -206,6 +206,21 @@ return JBossWSTestHelper.isTargetJBoss6(); } + public static boolean isTargetJBoss7() + { + return JBossWSTestHelper.isTargetJBoss7(); + } + + public static boolean isTargetJBoss70() + { + return JBossWSTestHelper.isTargetJBoss70(); + } + + public static boolean isTargetJBoss71() + { + return JBossWSTestHelper.isTargetJBoss71(); + } + public static boolean isIntegrationNative() { return JBossWSTestHelper.isIntegrationNative(); Modified: shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -102,6 +102,24 @@ return target.startsWith("jboss6"); } + public static boolean isTargetJBoss7() + { + String target = getIntegrationTarget(); + return target.startsWith("jboss7"); + } + + public static boolean isTargetJBoss70() + { + String target = getIntegrationTarget(); + return target.startsWith("jboss70"); + } + + public static boolean isTargetJBoss71() + { + String target = getIntegrationTarget(); + return target.startsWith("jboss71"); + } + public static boolean isIntegrationNative() { String vendor = getImplementationVendor(); Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-12-14 22:49:55 UTC (rev 15378) @@ -283,23 +283,6 @@ </jar> <!-- jaxws-jbws1581 --> - <war warfile="${tests.output.dir}/test-libs/as6/jaxws-jbws1581-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF"> - <include name="jboss-web.xml" /> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/test-libs/as6/jaxws-jbws1581.ear"> - <fileset dir="${tests.output.dir}/test-libs/as6"> - <include name="jaxws-jbws1581-pojo.war" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1581/META-INF"> - <include name="jboss-app.xml" /> - </metainf> - </jar> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1581-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class" /> Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/ant-import/build-samples-jaxws.xml =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/ant-import/build-samples-jaxws.xml 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/ant-import/build-samples-jaxws.xml 2011-12-14 22:49:55 UTC (rev 15378) @@ -507,18 +507,7 @@ </classes> </war> - <!-- management-recording.jar --> - <jar destfile="${tests.output.dir}/test-libs/management-recording-native.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/management/recording/Endpoint.class"/> - <include name="org/jboss/test/ws/management/recording/EndpointImpl.class"/> - <include name="org/jboss/test/ws/management/recording/MyManaged*.class"/> - <include name="org/jboss/test/ws/management/recording/ExtManaged*.class"/> - </fileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.logging"/> - </manifest> - </jar> + <!-- management-recording-as7.jar --> <jar destfile="${tests.output.dir}/test-libs/management-recording-as7.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/management/recording/Endpoint.class"/> @@ -528,18 +517,6 @@ <attribute name="Dependencies" value="org.jboss.logging"/> </manifest> </jar> - <jar destfile="${tests.output.dir}/test-libs/management-recording.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/management/recording/Endpoint.class"/> - <include name="org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.class"/> - <include name="org/jboss/test/ws/management/recording/MyManaged*.class"/> - <include name="org/jboss/test/ws/management/recording/ExtManaged*.class"/> - <include name="org/jboss/test/ws/management/recording/*.xml"/> - </fileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.logging"/> - </manifest> - </jar> <!-- saaj-jbws3084 --> <war Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -80,7 +80,7 @@ public void testBasicSecuredSLSB() throws Exception { InitialContext iniCtx = getInitialContext(); - OrganizationHome home = (OrganizationHome)iniCtx.lookup(isTargetJBoss6() ? "ejb/BasicSecuredSLSB" : "ejb:/jaxrpc-samples-secureejb//BasicSecuredSLSB!" + OrganizationHome.class.getName()); + OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb:/jaxrpc-samples-secureejb//BasicSecuredSLSB!" + OrganizationHome.class.getName()); OrganizationRemote bean = home.create(); String info = bean.getContactInfo("mafia"); Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -52,7 +52,7 @@ public void testEJBClient() throws Exception { InitialContext iniCtx = getInitialContext(); - EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup(isTargetJBoss6() ? "/EJBClient" : "ejb:/jaxrpc-samples-serviceref-ejb-client//EJBClient!" + EJBRemoteHome.class.getName()); + EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("ejb:/jaxrpc-samples-serviceref-ejb-client//EJBClient!" + EJBRemoteHome.class.getName()); EJBRemote ejbRemote = ejbHome.create(); String helloWorld = "Hello World!"; Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -43,10 +43,7 @@ { public static Test suite() { - String archives = isTargetJBoss6() - ? "as6/jaxws-jbws1581.ear, jaxws-jbws1581-ejb3.jar" - : "jaxws-jbws1581.ear, jaxws-jbws1581-ejb3.jar"; - return new JBossWSTestSetup(JBWS1581EarTestCase.class, archives); + return new JBossWSTestSetup(JBWS1581EarTestCase.class, "jaxws-jbws1581.ear, jaxws-jbws1581-ejb3.jar"); } public void testWSDLAccess() throws Exception @@ -58,7 +55,7 @@ public void testEJBVehicle() throws Exception { - EJB3Remote remote = (EJB3Remote)getInitialContext().lookup(isTargetJBoss6() ? "/EJB3Bean/remote" : "ejb:/jaxws-jbws1581-ejb3//EJB3Bean!" + EJB3Remote.class.getName()); + EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("ejb:/jaxws-jbws1581-ejb3//EJB3Bean!" + EJB3Remote.class.getName()); String retStr = remote.runTest("Hello World!"); assertEquals("Hello World!", retStr); } Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -43,10 +43,7 @@ { public static Test suite() { - String archives = isTargetJBoss6() - ? "as6/jaxws-jbws1581-pojo.war, jaxws-jbws1581-ejb3.jar" - : "jaxws-jbws1581-pojo.war, jaxws-jbws1581-ejb3.jar"; - return new JBossWSTestSetup(JBWS1581WarTestCase.class, archives); + return new JBossWSTestSetup(JBWS1581WarTestCase.class, "jaxws-jbws1581-pojo.war, jaxws-jbws1581-ejb3.jar"); } public void testWSDLAccess() throws Exception @@ -58,7 +55,7 @@ public void testEJBVehicle() throws Exception { - EJB3Remote remote = (EJB3Remote)getInitialContext().lookup(isTargetJBoss6() ? "/EJB3Bean/remote" : "ejb:/jaxws-jbws1581-ejb3//EJB3Bean!" + EJB3Remote.class.getName()); + EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("ejb:/jaxws-jbws1581-ejb3//EJB3Bean!" + EJB3Remote.class.getName()); String retStr = remote.runTest("Hello World!"); assertEquals("Hello World!", retStr); } Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -45,7 +45,7 @@ public static Test suite() { - return new JBossWSTestSetup(JBWS2241TestCase.class, "jaxws-jbws2241.jar", !isTargetJBoss6()); + return new JBossWSTestSetup(JBWS2241TestCase.class, "jaxws-jbws2241.jar", true); } public void setUp() throws MalformedURLException Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -40,7 +40,7 @@ { public static Test suite() { - return new JBossWSTestSetup(JBWS2307MTOMTestCase.class, "jaxws-jbws2307-client.war, jaxws-jbws2307-service.war", !isTargetJBoss6()); + return new JBossWSTestSetup(JBWS2307MTOMTestCase.class, "jaxws-jbws2307-client.war, jaxws-jbws2307-service.war", true); } public void testMTOM() throws Exception Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -40,7 +40,7 @@ { public static Test suite() { - return new JBossWSTestSetup(JBWS2307TestCase.class, "jaxws-jbws2307-client.war, jaxws-jbws2307-service.war", !isTargetJBoss6()); + return new JBossWSTestSetup(JBWS2307TestCase.class, "jaxws-jbws2307-client.war, jaxws-jbws2307-service.war", true); } public void testClient() throws Exception Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -40,7 +40,7 @@ { public static Test suite() { - return new JBossWSTestSetup(JBWS2527TestCase.class, "", !isTargetJBoss6()); + return new JBossWSTestSetup(JBWS2527TestCase.class, "", true); } public void test() throws Exception Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -64,8 +64,7 @@ public void testServletAccess() throws Exception { - boolean clCheck = !isTargetJBoss6(); - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3223-servlet?param=hello-world&clCheck=" + clCheck); + URL url = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3223-servlet?param=hello-world&clCheck=true"); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); assertEquals("hello-world", br.readLine()); } Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -57,7 +57,7 @@ public void testRemoteAccess() throws Exception { InitialContext iniCtx = getInitialContext(); - EJB3RemoteBusinessInterface ejb3Remote = (EJB3RemoteBusinessInterface)iniCtx.lookup(isTargetJBoss6() ? "/FooBean01/remote" : "ejb:/jaxws-jbws944//FooBean01!" + EJB3RemoteBusinessInterface.class.getName()); + EJB3RemoteBusinessInterface ejb3Remote = (EJB3RemoteBusinessInterface)iniCtx.lookup("ejb:/jaxws-jbws944//FooBean01!" + EJB3RemoteBusinessInterface.class.getName()); String helloWorld = "Hello world!"; Object retObj = ejb3Remote.echo(helloWorld); @@ -69,7 +69,7 @@ public void testNarrowedRemoteAccess() throws Exception { InitialContext iniCtx = getInitialContext(); - Object obj = iniCtx.lookup(isTargetJBoss6() ? "/FooBean01/home" : "ejb:/jaxws-jbws944//FooBean01!" + EJB3RemoteHome.class.getName()); + Object obj = iniCtx.lookup("ejb:/jaxws-jbws944//FooBean01!" + EJB3RemoteHome.class.getName()); EJB3RemoteHome ejb3Home = (EJB3RemoteHome)PortableRemoteObject.narrow(obj, EJB3RemoteHome.class); EJB3RemoteInterface ejb3Remote = ejb3Home.create(); Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -44,7 +44,7 @@ public static Test suite() { - return new JBossWSTestSetup(WebServiceContextEJBTestCase.class, "jaxws-samples-context.jar", !isTargetJBoss6()); + return new JBossWSTestSetup(WebServiceContextEJBTestCase.class, "jaxws-samples-context.jar", true); } public void setUp() throws Exception Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -44,7 +44,7 @@ public static Test suite() { - return new JBossWSTestSetup(WebServiceContextJSETestCase.class, "jaxws-samples-context.war", !isTargetJBoss6()); + return new JBossWSTestSetup(WebServiceContextJSETestCase.class, "jaxws-samples-context.war", true); } public void setUp() throws Exception Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -48,7 +48,7 @@ public static Test suite() { - return new JBossWSTestSetup(SecurityDomainTestCase.class, "jaxws-samples-securityDomain.jar", !isTargetJBoss6()); + return new JBossWSTestSetup(SecurityDomainTestCase.class, "jaxws-samples-securityDomain.jar", true); } private SecureEndpoint getPort() throws Exception Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -73,7 +73,7 @@ public void testEJBClient() throws Exception { InitialContext iniCtx = getInitialContext(); - EJBRemote ejbRemote = (EJBRemote)iniCtx.lookup(isTargetJBoss6() ? "/EJBClient/remote" : "ejb:/jaxws-samples-serviceref-ejb-client//EJBClient!" + EJBRemote.class.getName()); + EJBRemote ejbRemote = (EJBRemote)iniCtx.lookup("ejb:/jaxws-samples-serviceref-ejb-client//EJBClient!" + EJBRemote.class.getName()); String helloWorld = "Hello World!"; Object retObj = ejbRemote.echo(helloWorld); Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -42,7 +42,7 @@ public static Test suite() { - return new JBossWSTestSetup(WebServiceRefSecTestCase.class, "jaxws-samples-webservicerefsec.jar", !isTargetJBoss6()); + return new JBossWSTestSetup(WebServiceRefSecTestCase.class, "jaxws-samples-webservicerefsec.jar", true); } public void testServletClient() throws Exception Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -153,15 +153,7 @@ assertNotNull(response); assertNotNull(response.getDataHandler().getContent()); - File tmpDir = null; - if (isTargetJBoss6()) - { - tmpDir = new File(System.getProperty("jboss.home") + FS + "server" + FS + System.getProperty("jboss.server.instance") + FS + "tmp" + FS + "jbossws"); - } - else - { - tmpDir = new File(System.getProperty("jboss.home") + FS + "standalone" + FS + "tmp" + FS + "jbossws"); - } + File tmpDir = new File(System.getProperty("jboss.home") + FS + "standalone" + FS + "tmp" + FS + "jbossws"); assertTrue("Temp dir doesn't exist: " + tmpDir, tmpDir.exists()); //[JBWS-2834]: windows file delete issue Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -76,11 +76,6 @@ assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsprovide" + ".bat").exists()); assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsconsume" + ".sh").exists()); assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsconsume" + ".bat").exists()); - - if (!isTargetJBoss6()) return; // wsrunclient not available since AS7x - - assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsrunclient" + ".sh").exists()); - assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsrunclient" + ".bat").exists()); } protected void tearDown() throws Exception Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -22,7 +22,6 @@ package org.jboss.test.ws.management.recording; import java.net.URL; -import java.rmi.RMISecurityManager; import javax.management.MBeanServerConnection; import javax.management.ObjectName; @@ -48,27 +47,13 @@ protected void setUp() throws Exception { - if (!isTargetJBoss6()) { - endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl"; - JBossWSTestHelper.deploy("management-recording-as7.jar"); - } else if (isIntegrationNative()) { - endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointImpl"; - JBossWSTestHelper.deploy("management-recording-native.jar"); - } else { - endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithHandlerImpl"; - JBossWSTestHelper.deploy("management-recording.jar"); - } + endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl"; + JBossWSTestHelper.deploy("management-recording-as7.jar"); } protected void tearDown() throws Exception { - if (!isTargetJBoss6()) { - JBossWSTestHelper.undeploy("management-recording-as7.jar"); - } else if (isIntegrationNative()) { - JBossWSTestHelper.undeploy("management-recording-native.jar"); - } else { - JBossWSTestHelper.undeploy("management-recording.jar"); - } + JBossWSTestHelper.undeploy("management-recording-as7.jar"); } public void testAddCustomProcessor() throws Exception Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -55,27 +55,13 @@ protected void setUp() throws Exception { - if (!isTargetJBoss6()) { - endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl"; - JBossWSTestHelper.deploy("management-recording-as7.jar"); - } else if (isIntegrationNative()) { - endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointImpl"; - JBossWSTestHelper.deploy("management-recording-native.jar"); - } else { - endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithHandlerImpl"; - JBossWSTestHelper.deploy("management-recording.jar"); - } + endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl"; + JBossWSTestHelper.deploy("management-recording-as7.jar"); } protected void tearDown() throws Exception { - if (!isTargetJBoss6()) { - JBossWSTestHelper.undeploy("management-recording-as7.jar"); - } else if (isIntegrationNative()) { - JBossWSTestHelper.undeploy("management-recording-native.jar"); - } else { - JBossWSTestHelper.undeploy("management-recording.jar"); - } + JBossWSTestHelper.undeploy("management-recording-as7.jar"); } public void testRecording() throws Exception Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -149,13 +149,7 @@ sb.append("project.name=" + projectName + "\n"); sb.append("project.jboss.home=" + jbossHome.replace('\\', '/') + "\n"); sb.append("project.type=jar\n"); - if (isTargetJBoss6()) { - sb.append("project.jboss.conf=default\n"); - } - else - { - sb.append("project.jboss.conf=standalone\n"); - } + sb.append("project.jboss.conf=standalone\n"); sb.append("workspace.home=" + binDistroDir.getAbsolutePath().replace('\\', '/') + "\n"); BufferedWriter out = new BufferedWriter(new FileWriter(file)); out.write(sb.toString());