Author: alessio.soldano(a)jboss.com Date: 2010-05-20 12:46:56 -0400 (Thu, 20 May 2010) New Revision: 12292 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java Log: Remove todo Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2010-05-20 13:31:41 UTC (rev 12291) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2010-05-20 16:46:56 UTC (rev 12292) @@ -31,18 +31,16 @@ import javax.jms.QueueSession; import javax.jms.Session; import javax.jms.TextMessage; -import javax.management.ObjectName; import javax.naming.InitialContext; +import junit.framework.Test; + +import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.common.DOMUtils; -import org.jboss.wsf.common.ObjectNameFactory; -import junit.framework.Test; - /** * A web service client that connects to a MDB endpoint. * @@ -55,24 +53,9 @@ public static Test suite() throws Exception { - //TODO: replace isHornetQAvailable call with JBossWSTestHelper.isTargetJBoss6() once AS 6 M3 is out and hence M2 is not supported anymore - return new JBossWSTestSetup(JMSTransportTestCase.class, isHornetQAvailable() ? "jaxrpc-samples-jmstransport-as6.sar" : "jaxrpc-samples-jmstransport.sar"); + return new JBossWSTestSetup(JMSTransportTestCase.class, JBossWSTestHelper.isTargetJBoss6() ? "jaxrpc-samples-jmstransport-as6.sar" : "jaxrpc-samples-jmstransport.sar"); } - private static boolean isHornetQAvailable() - { - try - { - ObjectName oname = ObjectNameFactory.create("jboss.system:type=Server"); - String jbossVersion = (String)getServer().getAttribute(oname, "VersionNumber"); - return JBossWSTestHelper.isTargetJBoss6() && !jbossVersion.contains("M2"); - } - catch (Exception e) - { - return false; - } - } - /** * Send the message to the specified queue */ Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.java 2010-05-20 13:31:41 UTC (rev 12291) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.java 2010-05-20 16:46:56 UTC (rev 12292) @@ -45,26 +45,11 @@ public static Test suite() { - //TODO: replace isHornetQAvailable call with JBossWSTestHelper.isTargetJBoss6() once AS 6 M3 is out and hence M2 is not supported anymore - return new JBossWSTestSetup(AddressingClientTestCase.class, isHornetQAvailable() + return new JBossWSTestSetup(AddressingClientTestCase.class, JBossWSTestHelper.isTargetJBoss6() ? "jaxws-samples-dar-queue-as6.sar,jaxws-samples-dar-addressing-client.war,jaxws-samples-dar-addressing.jar" : "jaxws-samples-dar-queue.sar,jaxws-samples-dar-addressing-client.war,jaxws-samples-dar-addressing.jar"); } - private static boolean isHornetQAvailable() - { - try - { - ObjectName oname = ObjectNameFactory.create("jboss.system:type=Server"); - String jbossVersion = (String)getServer().getAttribute(oname, "VersionNumber"); - return JBossWSTestHelper.isTargetJBoss6() && !jbossVersion.contains("M2"); - } - catch (Exception e) - { - return false; - } - } - public void testSync() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/dar?wsdl"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java 2010-05-20 13:31:41 UTC (rev 12291) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java 2010-05-20 16:46:56 UTC (rev 12292) @@ -34,12 +34,10 @@ import javax.jms.QueueSession; import javax.jms.Session; import javax.jms.TextMessage; -import javax.management.ObjectName; import javax.naming.InitialContext; import junit.framework.Test; -import org.jboss.wsf.common.ObjectNameFactory; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; @@ -57,23 +55,9 @@ public static Test suite() { //TODO: replace isHornetQAvailable call with JBossWSTestHelper.isTargetJBoss6() once AS 6 M3 is out and hence M2 is not supported anymore - return new JBossWSTestSetup(JMSClientTestCase.class, isHornetQAvailable() ? "jaxws-samples-dar-jms-client-test-as6.sar,jaxws-samples-dar-jms.jar" : "jaxws-samples-dar-jms-client-test.sar,jaxws-samples-dar-jms.jar"); + return new JBossWSTestSetup(JMSClientTestCase.class, JBossWSTestHelper.isTargetJBoss6() ? "jaxws-samples-dar-jms-client-test-as6.sar,jaxws-samples-dar-jms.jar" : "jaxws-samples-dar-jms-client-test.sar,jaxws-samples-dar-jms.jar"); } - private static boolean isHornetQAvailable() - { - try - { - ObjectName oname = ObjectNameFactory.create("jboss.system:type=Server"); - String jbossVersion = (String)getServer().getAttribute(oname, "VersionNumber"); - return JBossWSTestHelper.isTargetJBoss6() && !jbossVersion.contains("M2"); - } - catch (Exception e) - { - return false; - } - } - public void test() throws Exception { String url = "http://" + getServerHost() + ":8080/dar-jms-client/JMSClient"; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2010-05-20 13:31:41 UTC (rev 12291) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2010-05-20 16:46:56 UTC (rev 12292) @@ -35,7 +35,6 @@ import javax.jms.QueueSession; import javax.jms.Session; import javax.jms.TextMessage; -import javax.management.ObjectName; import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -43,7 +42,6 @@ import junit.framework.Test; import org.jboss.wsf.common.DOMUtils; -import org.jboss.wsf.common.ObjectNameFactory; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; @@ -60,24 +58,9 @@ public static Test suite() throws Exception { - //TODO: replace isHornetQAvailable call with JBossWSTestHelper.isTargetJBoss6() once AS 6 M3 is out and hence M2 is not supported anymore - return new JBossWSTestSetup(JMSTransportTestCase.class, isHornetQAvailable() ? "jaxws-samples-jmstransport-as6.jar" : "jaxws-samples-jmstransport.sar"); + return new JBossWSTestSetup(JMSTransportTestCase.class, JBossWSTestHelper.isTargetJBoss6() ? "jaxws-samples-jmstransport-as6.jar" : "jaxws-samples-jmstransport.sar"); } - private static boolean isHornetQAvailable() - { - try - { - ObjectName oname = ObjectNameFactory.create("jboss.system:type=Server"); - String jbossVersion = (String)getServer().getAttribute(oname, "VersionNumber"); - return JBossWSTestHelper.isTargetJBoss6() && !jbossVersion.contains("M2"); - } - catch (Exception e) - { - return false; - } - } - public void testPublishedContract() throws Exception { //test the published contract using the 2nd port, which is an http one