svn commit: r513919 - in /activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors: AMQStoreCursorDurableTest.java AMQStoreQueueStoreTest.java CursorSupport.java KahaCursorDurableTest.java KahaQueueStoreTest.java

[ra...@apache.org]

Author: rajdavies
Date: Fri Mar  2 11:57:57 2007
New Revision: 513919

URL: http://svn.apache.org/viewvc?view=rev&rev=513919
Log:
test the AMQ Store cursors instead of Kaha

Added:
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/AMQStoreCursorDurableTest.java
      - copied, changed from r512256, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaCursorDurableTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/AMQStoreQueueStoreTest.java
      - copied, changed from r512256, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaQueueStoreTest.java
Removed:
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaCursorDurableTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaQueueStoreTest.java
Modified:
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/CursorSupport.java

Copied: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/AMQStoreCursorDurableTest.java (from r512256, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaCursorDurableTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/AMQStoreCursorDurableTest.java?view=diff&rev=513919&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaCursorDurableTest.java&r1=512256&p2=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/AMQStoreCursorDurableTest.java&r2=513919
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaCursorDurableTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/AMQStoreCursorDurableTest.java Fri Mar  2 11:57:57 2007
@@ -17,24 +17,24 @@
  */
 package org.apache.activemq.broker.region.cursors;
 
-import java.io.File;
 import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.store.kahadaptor.KahaPersistenceAdapter;
+import org.apache.activemq.store.amq.AMQPersistenceAdapter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 /**
  * @version $Revision: 1.3 $
  */
-public class KahaCursorDurableTest extends CursorDurableTest{
+public class AMQStoreCursorDurableTest extends CursorDurableTest{
     
-    protected static final Log log = LogFactory.getLog(KahaCursorDurableTest.class);
+    protected static final Log log = LogFactory.getLog(AMQStoreCursorDurableTest.class);
 
     
 
     protected void configureBroker(BrokerService answer) throws Exception{
-        KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter(new File("target/test-amq-data/durableTest"));
+        AMQPersistenceAdapter adaptor = new AMQPersistenceAdapter();
         answer.setPersistenceAdapter(adaptor);
-        answer.addConnector(bindAddress);
         answer.setDeleteAllMessagesOnStartup(true);
+        answer.addConnector(bindAddress);
+       
     }
 }

Copied: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/AMQStoreQueueStoreTest.java (from r512256, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaQueueStoreTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/AMQStoreQueueStoreTest.java?view=diff&rev=513919&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaQueueStoreTest.java&r1=512256&p2=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/AMQStoreQueueStoreTest.java&r2=513919
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaQueueStoreTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/AMQStoreQueueStoreTest.java Fri Mar  2 11:57:57 2007
@@ -17,32 +17,33 @@
  */
 package org.apache.activemq.broker.region.cursors;
 
-import java.io.File;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.broker.region.policy.PolicyMap;
 import org.apache.activemq.broker.region.policy.StorePendingQueueMessageStoragePolicy;
-import org.apache.activemq.store.kahadaptor.KahaPersistenceAdapter;
+import org.apache.activemq.store.PersistenceAdapter;
+import org.apache.activemq.store.amq.AMQPersistenceAdapter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 /**
  * @version $Revision: 1.3 $
  */
-public class KahaQueueStoreTest extends CursorQueueStoreTest{
+public class AMQStoreQueueStoreTest extends CursorQueueStoreTest{
     
-    protected static final Log log = LogFactory.getLog(KahaQueueStoreTest.class);
+    protected static final Log log = LogFactory.getLog(AMQStoreQueueStoreTest.class);
 
     
 
     protected void configureBroker(BrokerService answer) throws Exception{
-        KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter(new File("target/test-amq-data/durableTest"));
+        PersistenceAdapter adaptor = new AMQPersistenceAdapter();
         answer.setPersistenceAdapter(adaptor);
         PolicyEntry policy = new PolicyEntry();
         policy.setPendingQueuePolicy(new StorePendingQueueMessageStoragePolicy());
         PolicyMap pMap = new PolicyMap();
         pMap.setDefaultEntry(policy);
         answer.setDestinationPolicy(pMap);
-        answer.addConnector(bindAddress);
         answer.setDeleteAllMessagesOnStartup(true);
+        answer.addConnector(bindAddress);
+       
     }
 }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/CursorSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/CursorSupport.java?view=diff&rev=513919&r1=513918&r2=513919
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/CursorSupport.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/CursorSupport.java Fri Mar  2 11:57:57 2007
@@ -139,10 +139,12 @@
                System.err.println("BAD MATCH AT POS " + i);
                System.err.println(sent);
                System.err.println(consumed);
+               /*
                System.err.println("\n\n\n\n\n");
                for (int j = 0; j < consumerList.size(); j++) {
                    System.err.println(consumerList.get(j));
                }
+               */
             }
             assertEquals("This should be the same at pos " + i + " in the list",sent.getJMSMessageID(),consumed.getJMSMessageID());
         }