[jbossws-commits] JBossWS SVN: r14455 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport and 1 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue May 31 09:42:09 EDT 2011
Author: alessio.soldano at jboss.com
Date: 2011-05-31 09:42:09 -0400 (Tue, 31 May 2011)
New Revision: 14455
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/JMSEndpointsTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Fixing JMS testcases so that they don't silently ignore failures on AS7; excluding them for now
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/JMSEndpointsTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/JMSEndpointsTestCase.java 2011-05-31 04:13:10 UTC (rev 14454)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/JMSEndpointsTestCase.java 2011-05-31 13:42:09 UTC (rev 14455)
@@ -31,18 +31,14 @@
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 junit.framework.TestSuite;
import org.apache.cxf.transport.jms.spec.JMSSpecConstants;
import org.jboss.ws.common.DOMUtils;
-import org.jboss.ws.common.ObjectNameFactory;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
/**
* The test for cxf jms transport packaged in a jar file and deployed with jbossws-cxf.xml
@@ -55,27 +51,10 @@
public static Test suite() throws Exception
{
- if (isHornetQAvailable()) {
- return new JBossWSCXFTestSetup(JMSEndpointsTestCase.class, "hornetq-jmsendpoints-as6.sar, jaxws-samples-jmsendpoints-as6.jar");
- } else {
- return new TestSuite();
- }
+ return new JBossWSCXFTestSetup(JMSEndpointsTestCase.class,
+ "hornetq-jmsendpoints-as6.sar, jaxws-samples-jmsendpoints-as6.jar");
}
- public 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 testMessagingClient() throws Exception
{
String reqMessage =
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java 2011-05-31 04:13:10 UTC (rev 14454)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java 2011-05-31 13:42:09 UTC (rev 14455)
@@ -31,17 +31,12 @@
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 junit.framework.TestSuite;
-import org.jboss.test.ws.jaxws.samples.jmsendpoints.jmstransport.JMSEndpointsTestCase;
import org.jboss.ws.common.DOMUtils;
-import org.jboss.ws.common.ObjectNameFactory;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestSetup;
/**
@@ -53,34 +48,12 @@
{
private static boolean waitForResponse;
- public static Test suite() throws Exception
+ public static Test suite() throws Exception
{
- if (isHornetQAvailable())
- {
- return new JBossWSTestSetup(FromJavaJMSTransportTestCase.class,
- "hornetq-fromjava-jmsendpoints-as6.sar, jaxws-fromjava-jmsendpoints-as6.jar");
- }
- else
- {
- return new TestSuite();
- }
-
+ return new JBossWSTestSetup(FromJavaJMSTransportTestCase.class,
+ "hornetq-fromjava-jmsendpoints-as6.sar, jaxws-fromjava-jmsendpoints-as6.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 testMessagingClient() throws Exception
{
String reqMessage =
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2011-05-31 04:13:10 UTC (rev 14454)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2011-05-31 13:42:09 UTC (rev 14455)
@@ -34,23 +34,19 @@
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;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.jboss.ws.common.DOMUtils;
-import org.jboss.ws.common.ObjectNameFactory;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
/**
* The test for cxf jms transport
@@ -61,34 +57,12 @@
{
private static boolean waitForResponse;
- public static Test suite() throws Exception
+ public static Test suite() throws Exception
{
- if (isHornetQAvailable())
- {
- return new JBossWSCXFTestSetup(JMSTransportTestCase.class,
- "hornetq-samples-jmstransport-as6.sar, jaxws-samples-jmstransport.war");
- }
- else
- {
- return new TestSuite();
- }
-
+ return new JBossWSCXFTestSetup(JMSTransportTestCase.class,
+ "hornetq-samples-jmstransport-as6.sar, jaxws-samples-jmstransport.war");
}
- 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 testJMSEndpointPort() throws Exception
{
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-jmstransport?wsdl");
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-05-31 04:13:10 UTC (rev 14454)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-05-31 13:42:09 UTC (rev 14455)
@@ -1068,6 +1068,9 @@
<!-- @WebServiceRef not implemented yet on AS7 -->
<exclude>org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase*</exclude>
+ <!-- JMS endpoint functionalities to be restored on AS7 -->
+ <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude>
+
<!-- JAXRPC deployments -->
<exclude>org/jboss/test/ws/jaxrpc/**</exclude>
</excludes>
More information about the jbossws-commits
mailing list