Author: veithen
Date: Fri Nov 16 16:39:33 2012
New Revision: 1410449
URL: http://svn.apache.org/viewvc?rev=1410449&view=rev
Log:
Exclude Qpid tests when running on Java 1.5.
Modified:
axis/axis2/java/transports/trunk/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
Modified:
axis/axis2/java/transports/trunk/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java?rev=1410449&r1=1410448&r2=1410449&view=diff
==============================================================================
---
axis/axis2/java/transports/trunk/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
(original)
+++
axis/axis2/java/transports/trunk/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
Fri Nov 16 16:39:33 2012
@@ -44,13 +44,19 @@ public class JMSTransportTest extends Te
// Don't execute all possible test combinations:
// * Use a single setup to execute tests with all message types.
// * Only use a small set of message types for the other setups.
-
suite.addExclude("(!(|(&(broker=qpid)(singleCF=false)(cfOnSender=false)(!(|(destType=topic)(replyDestType=topic))))"
+
+
suite.addExclude("(!(|(&(broker=ActiveMQ)(singleCF=false)(cfOnSender=false)(!(|(destType=topic)(replyDestType=topic))))"
+
"(&(test=AsyncXML)(messageType=SOAP11)(data=ASCII))" +
"(&(test=EchoXML)(messageType=POX)(data=ASCII))" +
"(test=MinConcurrency)))");
// SYNAPSE-436:
suite.addExclude("(&(test=EchoXML)(replyDestType=topic)(endpoint=axis))");
+
+ // Although Qpid is compiled for Java 1.5, it uses classes only
present in 1.6.
+ if (System.getProperty("java.version").startsWith("1.5.")) {
+ System.out.println("Excluding Qpid tests; please run the build
with Java 1.6 to include them");
+ suite.addExclude("(broker=qpid)");
+ }
// Example to run a few use cases.. please leave these commented out -
asankha
//suite.addExclude("(|(test=AsyncXML)(test=MinConcurrency)(destType=topic)(broker=qpid)(destType=topic)(replyDestType=topic)(client=jms)(endpoint=mock)(cfOnSender=true))");
