svn commit: r812217 - /activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesWithNoConsumerTest.java

[gtully]

Author: gtully
Date: Mon Sep  7 16:19:41 2009
New Revision: 812217

URL: http://svn.apache.org/viewvc?rev=812217&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-1112 - test both values of 
optimizedDispatch

Modified:
    
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesWithNoConsumerTest.java

Modified: 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesWithNoConsumerTest.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesWithNoConsumerTest.java?rev=812217&r1=812216&r2=812217&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesWithNoConsumerTest.java
 (original)
+++ 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesWithNoConsumerTest.java
 Mon Sep  7 16:19:41 2009
@@ -49,6 +49,7 @@
        Session session;
        MessageProducer producer;
        public ActiveMQDestination destination = new ActiveMQQueue("test");
+    public boolean optimizedDispatch = true;
        
     public static Test suite() {
         return suite(ExpiredMessagesWithNoConsumerTest.class);
@@ -75,8 +76,7 @@
 
         PolicyMap policyMap = new PolicyMap();
         PolicyEntry defaultEntry = new PolicyEntry();
-        // TODO Optimize dispatch makes this test hang
-        defaultEntry.setOptimizedDispatch(true);
+        defaultEntry.setOptimizedDispatch(optimizedDispatch );
         defaultEntry.setExpireMessagesPeriod(100);
         defaultEntry.setMaxExpirePageSize(800);
 
@@ -94,6 +94,10 @@
         broker.waitUntilStarted();
     }
                
+    public void initCombosForTestExpiredMessagesWithNoConsumer() {
+        addCombinationValues("optimizedDispatch", new Object[] {Boolean.TRUE, 
Boolean.FALSE});
+    }
+    
        public void testExpiredMessagesWithNoConsumer() throws Exception {
                
            createBrokerWithMemoryLimit();