Author: thomas.diesler(a)jboss.com Date: 2007-01-04 09:30:21 -0500 (Thu, 04 Jan 2007) New Revision: 1788 Modified: trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTest.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java Log: Fix tests for jbossas-4.0 Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/build.xml 2007-01-04 14:30:21 UTC (rev 1788) @@ -128,7 +128,6 @@ <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> <pathelement location="${jboss.client}/jboss-logging-log4j.jar"/> - <pathelement location="${jboss.client}/${jbossws.client.jar}"/> <pathelement location="${jboss.client}/jboss-jaxrpc.jar"/> <pathelement location="${jboss.client}/jboss-jaxws.jar"/> <pathelement location="${jboss.client}/jboss-saaj.jar"/> @@ -146,8 +145,7 @@ <pathelement location="${jboss.server.lib}/jboss.jar"/> <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/> - <pathelement location="${integration.jboss50.dir}/output/lib/jbossws-${jbossws.integration.target}-integration.jar"/> - <pathelement location="${integration.jboss42.dir}/output/lib/jbossws-${jbossws.integration.target}-integration.jar"/> + <pathelement location="${basedir}/../integration-${jbossws.integration.target}/output/lib/jbossws-${jbossws.integration.target}-integration.jar"/> <pathelement location="${integration.tomcat.dir}/output/lib/jbossws-tomcat-integration.jar"/> </path> @@ -157,9 +155,7 @@ --> <path id="test.client.classpath"> <path refid="jbossws.client.classpath"/> - <pathelement location="${integration.jboss50.dir}/output/lib/jbossws-${jbossws.integration.target}-integration.jar"/> - <pathelement location="${integration.jboss42.dir}/output/lib/jbossws-${jbossws.integration.target}-integration.jar"/> - <pathelement location="${integration.tomcat.dir}/output/lib/jbossws-tomcat-integration.jar"/> + <pathelement location="${basedir}/../integration-${jbossws.integration.target}/output/lib/jbossws-${jbossws.integration.target}-integration.jar"/> <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/> <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/> <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> @@ -314,7 +310,7 @@ <antcall target="tests-main"> <param name="include.wildcard" value="org/jboss/test/ws/**/*TestCase.class"/> <param name="exclude.wildcard" value="org/jboss/test/ws/*/benchmark/**"/> - <param name="excludesfile" value="${tests.resources.dir}/tests-no-excludes.txt"/> + <param name="excludesfile" value="${tests.excludesfile}"/> </antcall> <antcall target="tests-report"/> </target> @@ -323,7 +319,7 @@ <target name="tests-benchmark" description="Run benchmark unit tests"> <antcall target="tests-main"> <param name="include.wildcard" value="org/jboss/test/ws/benchmark/**/*TestCase.class"/> - <param name="excludesfile" value="${tests.resources.dir}/tests-no-excludes.txt"/> + <param name="excludesfile" value="${tests.excludesfile}"/> </antcall> <antcall target="tests-report"/> </target> @@ -341,7 +337,7 @@ <target name="tests-tools" description="Run tools unit tests"> <antcall target="tests-main"> <param name="include.wildcard" value="org/jboss/test/ws/tools/**/*TestCase.class"/> - <param name="excludesfile" value="${tests.resources.dir}/tests-no-excludes.txt"/> + <param name="excludesfile" value="${tests.excludesfile}"/> </antcall> <antcall target="tests-report"/> </target> @@ -354,7 +350,7 @@ <antcall target="tests-main"> <param name="include.wildcard" value="org/jboss/test/ws/${test}/**/*TestCase.class"/> <param name="exclude.wildcard" value="org/jboss/test/ws/*/benchmark/**"/> - <param name="excludesfile" value="${tests.resources.dir}/tests-no-excludes.txt"/> + <param name="excludesfile" value="${tests.excludesfile}"/> </antcall> </target> Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTest.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTest.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTest.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -65,22 +65,22 @@ } /** True, if -Djbossws.integration.target=tomcat */ - public boolean isTomcat() + public boolean isTargetTomcat() { return JBossWSTestHelper.isTargetTomcat(); } - public boolean isJBoss50() + public boolean isTargetJBoss50() { return JBossWSTestHelper.isTargetJBoss50(); } - public boolean isJBoss42() + public boolean isTargetJBoss42() { return JBossWSTestHelper.isTargetJBoss42(); } - public boolean isJBoss40() + public boolean isTargetJBoss40() { return JBossWSTestHelper.isTargetJBoss40(); } Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -47,7 +47,7 @@ protected void setUp() throws Exception { super.setUp(); - if (port == null && isJBoss50() == false) + if (port == null && isTargetJBoss50() == false) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); @@ -57,7 +57,7 @@ public void testHandlers() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -57,7 +57,7 @@ public void testHandlers() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -50,7 +50,7 @@ public void setUp() throws Exception { super.setUp(); - if (port == null && isJBoss50() == false) + if (port == null && isTargetJBoss50() == false) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); @@ -60,7 +60,7 @@ public void testCall() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -57,7 +57,7 @@ public void testEndpoint() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -49,8 +49,11 @@ */ public void testSOAPMessageToEndpointQueue() throws Exception { - System.out.println("FIXME: [JBWS-1312] Fix JMS transport in trunk"); - if (true) return; + if (isTargetJBoss()) + { + System.out.println("FIXME: [JBWS-1312] Fix JMS transport in trunk"); + return; + } String reqMessage = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -48,7 +48,7 @@ { super.setUp(); - if (endpoint == null && isJBoss50() == false) + if (endpoint == null && isTargetJBoss50() == false) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB"); @@ -58,7 +58,7 @@ public void testEchoString() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -72,7 +72,7 @@ public void testEchoSimpleUserType() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -58,7 +58,7 @@ { super.setUp(); - if (call == null && isJBoss50() == false) + if (call == null && isTargetJBoss50() == false) { File javaWsdlMappingFile = new File("resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jaxrpc-mapping.xml"); assertTrue(javaWsdlMappingFile.exists()); @@ -73,7 +73,7 @@ public void testEchoString() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -97,7 +97,7 @@ public void testEchoSimpleUserType() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -65,7 +65,7 @@ call.setTargetEndpointAddress(TARGET_ENDPOINT_ADDRESS); - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -96,7 +96,7 @@ call.setTargetEndpointAddress(TARGET_ENDPOINT_ADDRESS); - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -61,7 +61,7 @@ String hello = "Hello"; String world = "world!"; - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -76,7 +76,7 @@ String hello = "Hello"; SimpleUserType userType = new SimpleUserType(1, 2); - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -55,7 +55,7 @@ { super.setUp(); - if (port == null && isJBoss50() == false) + if (port == null && isTargetJBoss50() == false) { File javaWsdlMappingFile = new File("resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jaxrpc-mapping.xml"); assertTrue(javaWsdlMappingFile.exists()); @@ -73,7 +73,7 @@ String hello = "Hello"; String world = "world!"; - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -88,7 +88,7 @@ String hello = "Hello"; SimpleUserType userType = new SimpleUserType(1, 2); - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -56,8 +56,7 @@ if (port == null) { - System.out.println("FIXME: [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x"); - if (isTargetJBoss() && false) + if (isTargetJBoss42() || isTargetJBoss40()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE"); @@ -65,6 +64,9 @@ } else { + if (isTargetJBoss50()) + System.out.println("FIXME: [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x"); + ServiceFactoryImpl factory = new ServiceFactoryImpl(); URL wsdlURL = new File("resources/jaxrpc/samples/jsr109pojo/rpclit//WEB-INF/wsdl/TestService.wsdl").toURL(); URL mappingURL = new File("resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jaxrpc-mapping.xml").toURL(); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -63,7 +63,7 @@ */ public void testRoleSecuredSLSB() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -94,7 +94,7 @@ */ public void testBasicSecuredSLSB() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -110,7 +110,7 @@ public void testBasicSecuredServiceAccess() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -141,7 +141,7 @@ public void testRoleSecuredServiceAccess() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -172,7 +172,7 @@ public void testConfidentialServiceAccess() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -14,10 +14,14 @@ */ package org.jboss.test.ws.jaxrpc.samples.wsbpel.hello; +import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.rpc.Call; +import junit.framework.Test; + import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; /** * Test business process behavior based on web services. @@ -30,32 +34,35 @@ private HelloWorldService service; /* - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(BpelHelloTestCase.class, "jaxrpc-samples-wsbpel-hello.war, jaxrpc-samples-wsbpel-hello-client.jar"); - } + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(BpelHelloTestCase.class, "jaxrpc-samples-wsbpel-hello.war, jaxrpc-samples-wsbpel-hello-client.jar"); + } + */ - protected void setUp() throws Exception - { - if (service == null) - { - if (isTargetServerJBoss()) - { - InitialContext iniCtx = getInitialContext(); - service = (HelloWorldService)iniCtx.lookup("java:comp/env/service/BpelHello"); - } - else - { - throw new IllegalStateException("Unsupported target server"); - } - } - } - */ + protected void setUp() throws Exception + { + if (service == null) + { + if (isTargetJBoss()) + { + //InitialContext iniCtx = getInitialContext(); + //service = (HelloWorldService)iniCtx.lookup("java:comp/env/service/BpelHello"); + } + else + { + throw new IllegalStateException("Unsupported target server"); + } + } + } public void testSayHelloProxy() throws Exception { - System.out.println("FIXME: [JBWS-868] BPEL in jbossws-samples"); - if (true) return; + if (isTargetJBoss()) + { + System.out.println("FIXME: [JBWS-868] BPEL in jbossws-samples"); + return; + } Greeter proxy = service.getGreeterPort(); @@ -65,9 +72,12 @@ public void testSayHelloDII() throws Exception { - System.out.println("FIXME: [JBWS-868] BPEL in jbossws-samples"); - if (true) return; - + if (isTargetJBoss()) + { + System.out.println("FIXME: [JBWS-868] BPEL in jbossws-samples"); + return; + } + String portTypeNS = "http://jbpm.org/examples/hello"; Call call = service.createCall(new QName(portTypeNS, "GreeterPort")); call.setOperationName(new QName(portTypeNS, "sayHello")); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -91,8 +91,11 @@ public void testEndpoint() throws Exception { - System.out.println("FIXME: [JBWS-1329] Fix StorePassEncryptTestCase for jbossas-5.0"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWS-1329] Fix StorePassEncryptTestCase for jbossas-5.0"); + return; + } UserType in0 = new UserType("Kermit"); UserType retObj = port.echoUserType(in0); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -62,7 +62,7 @@ public void testDynamicProxy() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -81,7 +81,7 @@ public void testEJBClient() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -76,7 +76,7 @@ public void testServletClient() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -53,8 +53,11 @@ */ public void testEndpoint() throws Exception { - System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + return; + } InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -48,8 +48,11 @@ public void testEndpoint() throws Exception { - System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + return; + } InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); @@ -62,8 +65,11 @@ public void testFault() throws Exception { - System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + return; + } InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -52,8 +52,11 @@ public void testEndpoint() throws Exception { - System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + return; + } InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); @@ -66,8 +69,11 @@ public void testEndpointNoProperties() throws Exception { - System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + return; + } Properties props = System.getProperties(); props.remove("org.jboss.ws.wsse.keyStore"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -41,25 +41,24 @@ */ public class UsernameTestCase extends JBossWSTest { - private static JaxRpcTestService endpoint; + private static JaxRpcTestService port; public static Test suite() { return JBossWSTestSetup.newTestSetup(UsernameTestCase.class, "jaxrpc-wsse-username.jar, jaxrpc-wsse-username-client.jar"); } - /* protected void setUp() throws Exception { super.setUp(); - if (endpoint == null) + if (port == null) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB"); - endpoint = (JaxRpcTestService)service.getPort(JaxRpcTestService.class); - ((Stub)endpoint)._setProperty(Stub.USERNAME_PROPERTY, "kermit"); - ((Stub)endpoint)._setProperty(Stub.PASSWORD_PROPERTY, "thefrog"); + port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class); + ((Stub)port)._setProperty(Stub.USERNAME_PROPERTY, "kermit"); + ((Stub)port)._setProperty(Stub.PASSWORD_PROPERTY, "thefrog"); } Properties props = System.getProperties(); @@ -70,44 +69,52 @@ props.remove("org.jboss.ws.wsse.keyStoreType"); props.remove("org.jboss.ws.wsse.trustStoreType"); } - */ public void testEchoString() throws Exception { - System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); - if (true) return; - + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + return; + } + String hello = "Hello"; String world = "world!"; - Object retObj = endpoint.echoString(hello, world); + Object retObj = port.echoString(hello, world); assertEquals(hello + world, retObj); } public void testEchoSimpleUserType() throws Exception { - System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); - if (true) return; - + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + return; + } + String hello = "Hello"; SimpleUserType userType = new SimpleUserType(1, 2); - Object retObj = endpoint.echoSimpleUserType(hello, userType); + Object retObj = port.echoSimpleUserType(hello, userType); assertEquals(userType, retObj); } public void testEchoStringNoUsername() throws Exception { - System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); - if (true) return; - + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + return; + } + String hello = "Hello"; String world = "world!"; - ((Stub)endpoint)._setProperty(Stub.USERNAME_PROPERTY, null); - ((Stub)endpoint)._setProperty(Stub.PASSWORD_PROPERTY, null); + ((Stub)port)._setProperty(Stub.USERNAME_PROPERTY, null); + ((Stub)port)._setProperty(Stub.PASSWORD_PROPERTY, null); try { - endpoint.echoString(hello, world); + port.echoString(hello, world); fail("Expected exception not thrown"); } catch (RemoteException e) Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -48,7 +48,7 @@ */ public void testWebClient() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -43,8 +43,11 @@ public void testEndpoint() throws Exception { - System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + return; + } InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/AccountSignupService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -65,7 +65,7 @@ public void testVirtualFile() throws Exception { - if (isJBoss50() == false) + if (isTargetJBoss50() == false) return; File earFile = new File("libs/jaxws-eardeployment.ear"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -32,8 +32,6 @@ import javax.management.Attribute; import javax.management.MBeanServerConnection; import javax.management.ObjectName; -import javax.naming.InitialContext; -import javax.naming.NamingException; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -41,6 +39,7 @@ import junit.framework.Test; import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestHelper; import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; @@ -61,7 +60,7 @@ protected void setUp() throws Exception { - MBeanServerConnection server = getMBeanServer(); + MBeanServerConnection server = JBossWSTestHelper.getServer(); useJBossWebLoader = (Boolean)server.getAttribute(new ObjectName("jboss.web:service=WebServer"), "UseJBossWebLoader"); server.setAttribute(new ObjectName("jboss.web:service=WebServer"), new Attribute("UseJBossWebLoader", new Boolean(true))); super.setUp(); @@ -70,7 +69,7 @@ protected void tearDown() throws Exception { super.tearDown(); - MBeanServerConnection server = getMBeanServer(); + MBeanServerConnection server = JBossWSTestHelper.getServer(); server.setAttribute(new ObjectName("jboss.web:service=WebServer"), new Attribute("UseJBossWebLoader", useJBossWebLoader)); } }; @@ -78,8 +77,11 @@ public void testWSDLAccess() throws MalformedURLException { - System.out.println("FIXME: [JBWEB-68] Servlet.init(ServletConfig) not called"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWEB-68] Servlet.init(ServletConfig) not called"); + return; + } URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-endpoint?wsdl"); WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); @@ -89,8 +91,11 @@ public void testClientAccess() throws Exception { - System.out.println("FIXME: [JBWEB-68] Servlet.init(ServletConfig) not called"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWEB-68] Servlet.init(ServletConfig) not called"); + return; + } // Create the port URL wsdlURL = new File("resources/jaxws/endpoint/WEB-INF/wsdl/TestService.wsdl").toURL(); @@ -105,19 +110,15 @@ public void testServletAccess() throws Exception { - System.out.println("FIXME: [JBWEB-68] Servlet.init(ServletConfig) not called"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWEB-68] Servlet.init(ServletConfig) not called"); + return; + } - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-endpoint?param=hello-world"); + URL url = new URL("http://" + getServerHost() + ":8080/jaxws-endpoint-servlet?param=hello-world"); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); assertEquals("hello-world", br.readLine()); } - - private static MBeanServerConnection getMBeanServer() throws NamingException - { - InitialContext iniCtx = new InitialContext(); - MBeanServerConnection server = (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor"); - return server; - } } Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -44,7 +44,7 @@ deploy("jaxws-jsr181-webservice01-ejb21.jar"); try { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -62,7 +62,7 @@ deploy("jaxws-jsr181-webservice02-ejb21.jar"); try { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -80,7 +80,7 @@ deploy("jaxws-jsr181-webservice03-ejb21.jar"); try { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -67,16 +67,17 @@ public void testWebService() throws Exception { - System.out.println("FIXME: [JBAS-3825] Fix BASIC authentication"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBAS-3825] Fix BASIC authentication"); + return; + } - assertWSDLAccess(); - InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class); - //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxws-samples-jsr181ejb/EJB3Bean01"); + ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, TARGET_ENDPOINT_ADDRESS); Stub stub = (Stub)port; stub._setProperty(Stub.USERNAME_PROPERTY, "kermit"); @@ -86,12 +87,4 @@ Object retObj = port.echo(helloWorld); assertEquals(helloWorld, retObj); } - - private void assertWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } } Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -75,7 +75,7 @@ public void testWebService() throws Exception { - if (isJBoss50() == false) + if (isTargetJBoss50() == false) { System.out.println("FIXME: [JBWS-1438] Implement @WebServiceRef injection for JBossAS-4.2"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -73,7 +73,7 @@ public void testEJB3Client() throws Exception { - if (isJBoss50() == false) + if (isTargetJBoss50() == false) { System.out.println("FIXME: [JBWS-1438] Implement @WebServiceRef injection for JBossAS-4.2"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -75,13 +75,13 @@ public void testServletClient() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); return; } - if (isJBoss50() == false) + if (isTargetJBoss50() == false) { System.out.println("FIXME: [JBWS-1438] Implement @WebServiceRef injection for JBossAS-4.2"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -40,7 +40,10 @@ protected String getFixMe() { - return "FIXME: [JBWS-1394] Fix OneWayJava2WSDLTestCase in trunk"; + if (isTargetJBoss()) + return "FIXME: [JBWS-1394] Fix OneWayJava2WSDLTestCase"; + else + return null; } public String getWSDLName()