You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2013/01/26 01:20:25 UTC

svn commit: r1438788 - in /activemq/activemq-apollo/trunk: apollo-amqp/src/test/scala/org/apache/activemq/apollo/amqp/joram/JoramJmsTest.java pom.xml

Author: chirino
Date: Sat Jan 26 00:20:25 2013
New Revision: 1438788

URL: http://svn.apache.org/viewvc?rev=1438788&view=rev
Log:
All amqp joram tests are passing now against the QPID 0.20 client.

Modified:
    activemq/activemq-apollo/trunk/apollo-amqp/src/test/scala/org/apache/activemq/apollo/amqp/joram/JoramJmsTest.java
    activemq/activemq-apollo/trunk/pom.xml

Modified: activemq/activemq-apollo/trunk/apollo-amqp/src/test/scala/org/apache/activemq/apollo/amqp/joram/JoramJmsTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-amqp/src/test/scala/org/apache/activemq/apollo/amqp/joram/JoramJmsTest.java?rev=1438788&r1=1438787&r2=1438788&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-amqp/src/test/scala/org/apache/activemq/apollo/amqp/joram/JoramJmsTest.java (original)
+++ activemq/activemq-apollo/trunk/apollo-amqp/src/test/scala/org/apache/activemq/apollo/amqp/joram/JoramJmsTest.java Sat Jan 26 00:20:25 2013
@@ -52,37 +52,24 @@ public class JoramJmsTest extends TestCa
         }
 
         TestSuite suite = new TestSuite();
-
-        // TODO: enable once QPID-4454 is fixed.
-        if(false) {
-            suite.addTestSuite(MessageHeaderTest.class);
-        }
-
-        // TODO: enable once QPID 0.20 is released
-        if(true) {
-            suite.addTestSuite(TopicSessionTest.class);
-            suite.addTestSuite(MessageTypeTest.class);
-            suite.addTestSuite(QueueBrowserTest.class);
-            suite.addTestSuite(UnifiedSessionTest.class);
-            suite.addTestSuite(TemporaryTopicTest.class);
-            suite.addTestSuite(TopicConnectionTest.class);
-        }
-
-        // Passing tests against 0.18
-        if( true ) {
-            suite.addTestSuite(SelectorSyntaxTest.class);
-            suite.addTestSuite(QueueSessionTest.class);
-            suite.addTestSuite(SelectorTest.class);
-            suite.addTestSuite(TemporaryQueueTest.class);
-            suite.addTestSuite(SessionTest.class);
-            suite.addTestSuite(ConnectionTest.class);
-            suite.addTestSuite(JMSXPropertyTest.class);
-            suite.addTestSuite(MessageBodyTest.class);
-            suite.addTestSuite(MessageDefaultTest.class);
-            suite.addTestSuite(MessagePropertyConversionTest.class);
-            suite.addTestSuite(MessagePropertyTest.class);
-        }
-
+        suite.addTestSuite(MessageHeaderTest.class);
+        suite.addTestSuite(TopicSessionTest.class);
+        suite.addTestSuite(MessageTypeTest.class);
+        suite.addTestSuite(QueueBrowserTest.class);
+        suite.addTestSuite(UnifiedSessionTest.class);
+        suite.addTestSuite(TemporaryTopicTest.class);
+        suite.addTestSuite(TopicConnectionTest.class);
+        suite.addTestSuite(SelectorSyntaxTest.class);
+        suite.addTestSuite(QueueSessionTest.class);
+        suite.addTestSuite(SelectorTest.class);
+        suite.addTestSuite(TemporaryQueueTest.class);
+        suite.addTestSuite(SessionTest.class);
+        suite.addTestSuite(ConnectionTest.class);
+        suite.addTestSuite(JMSXPropertyTest.class);
+        suite.addTestSuite(MessageBodyTest.class);
+        suite.addTestSuite(MessageDefaultTest.class);
+        suite.addTestSuite(MessagePropertyConversionTest.class);
+        suite.addTestSuite(MessagePropertyTest.class);
         return suite;
     }
 

Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1438788&r1=1438787&r2=1438788&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Sat Jan 26 00:20:25 2013
@@ -141,7 +141,7 @@
     <osgi.fragment.host>${project.groupId}.apollo-broker</osgi.fragment.host>
     <mvnplugins-version>1.15</mvnplugins-version>
     <qpid-proton-version>0.3.0-fuse-1</qpid-proton-version>
-    <qpid-jms-version>0.22-SNAPSHOT</qpid-jms-version>
+    <qpid-jms-version>0.20</qpid-jms-version>
   </properties>
 
   <prerequisites>