svn commit: r1367332 - in /activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo: JmsTransactionTestSupport.java OpenwireBrokerProtocol.java joramtests/OpenwireJoramJmsTest.java

[ch...@apache.org]

Author: chirino
Date: Mon Jul 30 22:00:21 2012
New Revision: 1367332

URL: http://svn.apache.org/viewvc?rev=1367332&view=rev
Log:
Enabling more tests that are passing now.

Modified:
    activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JmsTransactionTestSupport.java
    activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/OpenwireBrokerProtocol.java
    activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/joramtests/OpenwireJoramJmsTest.java

Modified: activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JmsTransactionTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JmsTransactionTestSupport.java?rev=1367332&r1=1367331&r2=1367332&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JmsTransactionTestSupport.java (original)
+++ activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JmsTransactionTestSupport.java Mon Jul 30 22:00:21 2012
@@ -17,7 +17,6 @@
 package org.apache.activemq.apollo;
 
 import org.apache.activemq.apollo.test.JmsResourceProvider;
-import org.fusesource.stomp.jms.StompJmsSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -296,10 +295,6 @@ public abstract class JmsTransactionTest
      * @throws Exception
      */
     public void testReceiveRollback() throws Exception {
-        if (session instanceof StompJmsSession) {
-            // TODO - rollback in stompjms doesn't work the same way
-            return;
-        }
         Message[] outbound = new Message[] {session.createTextMessage("First Message"), session.createTextMessage("Second Message")};
 
         // lets consume any outstanding messages from prev test runs
@@ -351,10 +346,6 @@ public abstract class JmsTransactionTest
      * @throws Exception
      */
     public void testReceiveTwoThenRollback() throws Exception {
-        if (session instanceof StompJmsSession) {
-            // TODO - rollback in stompjms doesn't work the same way
-            return;
-        }
         Message[] outbound = new Message[] {session.createTextMessage("First Message"), session.createTextMessage("Second Message")};
 
         // lets consume any outstanding messages from prev test runs
@@ -442,10 +433,6 @@ public abstract class JmsTransactionTest
      * @throws Exception
      */
     public void testReceiveTwoThenRollbackManyTimes() throws Exception {
-        if (session instanceof StompJmsSession) {
-            // TODO - rollback in stompjms doesn't work the same way
-            return;
-        }
         for (int i = 0; i < 5; i++) {
             testReceiveTwoThenRollback();
         }

Modified: activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/OpenwireBrokerProtocol.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/OpenwireBrokerProtocol.java?rev=1367332&r1=1367331&r2=1367332&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/OpenwireBrokerProtocol.java (original)
+++ activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/OpenwireBrokerProtocol.java Mon Jul 30 22:00:21 2012
@@ -38,6 +38,7 @@ public class OpenwireBrokerProtocol exte
     public ConnectionFactory getConnectionFactory(Object broker) {
         ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory();
         factory.setBrokerURL(format("tcp://localhost:%s", port(broker)));
+        factory.setNestedMapAndListEnabled(false);
         return factory;
     }
 

Modified: activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/joramtests/OpenwireJoramJmsTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/joramtests/OpenwireJoramJmsTest.java?rev=1367332&r1=1367331&r2=1367332&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/joramtests/OpenwireJoramJmsTest.java (original)
+++ activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/joramtests/OpenwireJoramJmsTest.java Mon Jul 30 22:00:21 2012
@@ -64,13 +64,13 @@ public class OpenwireJoramJmsTest extend
         suite.addTestSuite(SelectorSyntaxTest.class);
         suite.addTestSuite(QueueSessionTest.class);
         suite.addTestSuite(SessionTest.class);
+        suite.addTestSuite(TemporaryTopicTest.class);
 // TODO: figure out why the following tests are failing..
 //        suite.addTestSuite(MessagePropertyTest.class);
 //        suite.addTestSuite(QueueBrowserTest.class);
 //        suite.addTestSuite(SelectorTest.class);
 //        suite.addTestSuite(TopicSessionTest.class);
 //        suite.addTestSuite(UnifiedSessionTest.class);
-//        suite.addTestSuite(TemporaryTopicTest.class);
         return suite;
     }