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/05/17 16:04:00 UTC
svn commit: r1483809 -
/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/
Author: chirino
Date: Fri May 17 14:04:00 2013
New Revision: 1483809
URL: http://svn.apache.org/r1483809
Log:
Give the leveldb 3 broker virt topic network test a more appropriate file name. Also add a single broker test for leveldb.
Added:
activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/SingleBrokerVirtualDestinationsWithWildcardLevelDBTest.java
- copied, changed from r1483593, activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkAMQPATest.java
activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkLevelDBTest.java
- copied, changed from r1483593, activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkAMQPATest.java
Removed:
activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkAMQPATest.java
Copied: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/SingleBrokerVirtualDestinationsWithWildcardLevelDBTest.java (from r1483593, activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkAMQPATest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/SingleBrokerVirtualDestinationsWithWildcardLevelDBTest.java?p2=activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/SingleBrokerVirtualDestinationsWithWildcardLevelDBTest.java&p1=activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkAMQPATest.java&r1=1483593&r2=1483809&rev=1483809&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkAMQPATest.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/SingleBrokerVirtualDestinationsWithWildcardLevelDBTest.java Fri May 17 14:04:00 2013
@@ -16,19 +16,29 @@
*/
package org.apache.activemq.usecases;
-import java.io.File;
-import java.io.IOException;
-
+import org.apache.activemq.JmsMultipleBrokersTestSupport;
import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.region.DestinationInterceptor;
+import org.apache.activemq.broker.region.virtual.VirtualDestination;
+import org.apache.activemq.broker.region.virtual.VirtualDestinationInterceptor;
+import org.apache.activemq.broker.region.virtual.VirtualTopic;
import org.apache.activemq.leveldb.LevelDBStore;
+import org.apache.activemq.store.kahadb.KahaDBStore;
+import org.apache.activemq.util.MessageIdList;
+import javax.jms.MessageConsumer;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+
+public class SingleBrokerVirtualDestinationsWithWildcardLevelDBTest extends SingleBrokerVirtualDestinationsWithWildcardTest {
-public class ThreeBrokerVirtualTopicNetworkAMQPATest extends ThreeBrokerVirtualTopicNetworkTest {
-
- protected void configurePersistenceAdapter(BrokerService broker) throws IOException {
- File dataFileDir = new File("target/test-amq-data/amq/" + broker.getBrokerName());
- LevelDBStore adapter = new LevelDBStore();
- adapter.setDirectory(dataFileDir);
- broker.setPersistenceAdapter(adapter);
+ @Override
+ protected void configurePersistenceAdapter(BrokerService broker) throws IOException {
+ File dataFileDir = new File("target/test-amq-data/leveldb/" + broker.getBrokerName());
+ LevelDBStore kaha = new LevelDBStore();
+ kaha.setDirectory(dataFileDir);
+ broker.setPersistenceAdapter(kaha);
}
+
}
\ No newline at end of file
Copied: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkLevelDBTest.java (from r1483593, activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkAMQPATest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkLevelDBTest.java?p2=activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkLevelDBTest.java&p1=activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkAMQPATest.java&r1=1483593&r2=1483809&rev=1483809&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkAMQPATest.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkLevelDBTest.java Fri May 17 14:04:00 2013
@@ -23,10 +23,10 @@ import org.apache.activemq.broker.Broker
import org.apache.activemq.leveldb.LevelDBStore;
-public class ThreeBrokerVirtualTopicNetworkAMQPATest extends ThreeBrokerVirtualTopicNetworkTest {
+public class ThreeBrokerVirtualTopicNetworkLevelDBTest extends ThreeBrokerVirtualTopicNetworkTest {
protected void configurePersistenceAdapter(BrokerService broker) throws IOException {
- File dataFileDir = new File("target/test-amq-data/amq/" + broker.getBrokerName());
+ File dataFileDir = new File("target/test-data/leveldb/" + broker.getBrokerName());
LevelDBStore adapter = new LevelDBStore();
adapter.setDirectory(dataFileDir);
broker.setPersistenceAdapter(adapter);