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 2012/12/08 17:02:11 UTC
svn commit: r1418699 - in
/activemq/trunk/activemq-core/src/test/java/org/apache/activemq: broker/
bugs/ transport/failover/ usecases/
Author: chirino
Date: Sat Dec 8 16:02:09 2012
New Revision: 1418699
URL: http://svn.apache.org/viewvc?rev=1418699&view=rev
Log:
Also run tests against LevelDB
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/QueueMbeanRestartTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2584Test.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2870Test.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/QueueMbeanRestartTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/QueueMbeanRestartTest.java?rev=1418699&r1=1418698&r2=1418699&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/QueueMbeanRestartTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/QueueMbeanRestartTest.java Sat Dec 8 16:02:09 2012
@@ -49,7 +49,7 @@ public class QueueMbeanRestartTest exten
public void initCombosForTestMBeanPresenceOnRestart() {
addCombinationValues("defaultPersistenceAdapter",
- new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.JDBC});
+ new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
}
public void testMBeanPresenceOnRestart() throws Exception {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2584Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2584Test.java?rev=1418699&r1=1418698&r2=1418699&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2584Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2584Test.java Sat Dec 8 16:02:09 2012
@@ -57,7 +57,7 @@ public class AMQ2584Test extends org.apa
public void initCombosForTestSize() throws Exception {
this.addCombinationValues("defaultPersistenceAdapter",
new Object[]{
- PersistenceAdapterChoice.AMQ,
+ PersistenceAdapterChoice.LevelDB,
PersistenceAdapterChoice.KahaDB
});
}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2870Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2870Test.java?rev=1418699&r1=1418698&r2=1418699&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2870Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2870Test.java Sat Dec 8 16:02:09 2012
@@ -53,7 +53,7 @@ public class AMQ2870Test extends org.apa
public void initCombosForTestSize() throws Exception {
this.addCombinationValues("defaultPersistenceAdapter",
- new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.AMQ});
+ new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB});
}
public void testSize() throws Exception {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java?rev=1418699&r1=1418698&r2=1418699&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java Sat Dec 8 16:02:09 2012
@@ -144,7 +144,7 @@ public class FailoverTransactionTest ext
public void initCombosForTestFailoverCommitReplyLost() {
addCombinationValues("defaultPersistenceAdapter",
- new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.AMQ, PersistenceAdapterChoice.JDBC});
+ new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
}
@SuppressWarnings("unchecked")
@@ -352,7 +352,7 @@ public class FailoverTransactionTest ext
public void initCombosForTestFailoverSendReplyLost() {
addCombinationValues("defaultPersistenceAdapter",
- new Object[]{PersistenceAdapterChoice.KahaDB,
+ new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB,
PersistenceAdapterChoice.JDBC
// not implemented for AMQ store
});
@@ -461,7 +461,7 @@ public class FailoverTransactionTest ext
public void initCombosForTestFailoverConnectionSendReplyLost() {
addCombinationValues("defaultPersistenceAdapter",
- new Object[]{PersistenceAdapterChoice.KahaDB,
+ new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB,
PersistenceAdapterChoice.JDBC
// last producer message id store feature not implemented for AMQ store
});
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java?rev=1418699&r1=1418698&r2=1418699&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java Sat Dec 8 16:02:09 2012
@@ -68,7 +68,7 @@ public class ConcurrentProducerDurableCo
public void initCombosForTestSendRateWithActivatingConsumers() throws Exception {
addCombinationValues("defaultPersistenceAdapter",
- new Object[]{PersistenceAdapterChoice.KahaDB, /* too slow for hudson - PersistenceAdapterChoice.JDBC,*/ PersistenceAdapterChoice.MEM});
+ new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.MEM});
}
public void testSendRateWithActivatingConsumers() throws Exception {
@@ -153,7 +153,7 @@ public class ConcurrentProducerDurableCo
public void x_initCombosForTestSendWithInactiveAndActiveConsumers() throws Exception {
addCombinationValues("defaultPersistenceAdapter",
- new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.JDBC});
+ new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
}
public void x_testSendWithInactiveAndActiveConsumers() throws Exception {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java?rev=1418699&r1=1418698&r2=1418699&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java Sat Dec 8 16:02:09 2012
@@ -74,7 +74,7 @@ public class ConcurrentProducerQueueCons
public void initCombosForTestSendRateWithActivatingConsumers() throws Exception {
addCombinationValues("defaultPersistenceAdapter",
- new Object[]{PersistenceAdapterChoice.KahaDB,
+ new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB,
/* too slow for hudson - PersistenceAdapterChoice.JDBC,*/
PersistenceAdapterChoice.MEM});
}
@@ -164,7 +164,7 @@ public class ConcurrentProducerQueueCons
public void x_initCombosForTestSendWithInactiveAndActiveConsumers() throws Exception {
addCombinationValues("defaultPersistenceAdapter",
- new Object[]{PersistenceAdapterChoice.KahaDB,
+ new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB,
/* too slow for hudson - PersistenceAdapterChoice.JDBC,*/
PersistenceAdapterChoice.MEM});
}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java?rev=1418699&r1=1418698&r2=1418699&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java Sat Dec 8 16:02:09 2012
@@ -132,7 +132,7 @@ public class DurableSubscriptionOfflineT
public void initCombosForTestConsumeOnlyMatchedMessages() throws Exception {
this.addCombinationValues("defaultPersistenceAdapter",
- new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.JDBC});
+ new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
this.addCombinationValues("usePrioritySupport",
new Object[]{ Boolean.TRUE, Boolean.FALSE});
}
@@ -223,7 +223,7 @@ public class DurableSubscriptionOfflineT
public void initCombosForTestVerifyAllConsumedAreAcked() throws Exception {
this.addCombinationValues("defaultPersistenceAdapter",
- new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.JDBC});
+ new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
this.addCombinationValues("usePrioritySupport",
new Object[]{ Boolean.TRUE, Boolean.FALSE});
}
@@ -453,7 +453,7 @@ public class DurableSubscriptionOfflineT
public void initCombosForTestOfflineSubscriptionCanConsumeAfterOnlineSubs() throws Exception {
this.addCombinationValues("defaultPersistenceAdapter",
- new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.JDBC});
+ new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
this.addCombinationValues("usePrioritySupport",
new Object[]{ Boolean.TRUE, Boolean.FALSE});
}
@@ -532,7 +532,7 @@ public class DurableSubscriptionOfflineT
public void initCombosForTestInterleavedOfflineSubscriptionCanConsume() throws Exception {
this.addCombinationValues("defaultPersistenceAdapter",
- new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.JDBC});
+ new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
}
public void testInterleavedOfflineSubscriptionCanConsume() throws Exception {
@@ -608,7 +608,7 @@ public class DurableSubscriptionOfflineT
public void initCombosForTestMixOfOnLineAndOfflineSubsGetAllMatched() throws Exception {
this.addCombinationValues("defaultPersistenceAdapter",
- new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.JDBC});
+ new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
}
private static String filter = "$a='A1' AND (($b=true AND $c=true) OR ($d='D1' OR $d='D2'))";
@@ -809,7 +809,7 @@ public class DurableSubscriptionOfflineT
public void initCombosForTestOfflineSubscriptionWithSelectorAfterRestart() throws Exception {
this.addCombinationValues("defaultPersistenceAdapter",
- new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.JDBC});
+ new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
}
public void testOfflineSubscriptionWithSelectorAfterRestart() throws Exception {
@@ -899,7 +899,7 @@ public class DurableSubscriptionOfflineT
public void initCombosForTestOfflineAfterRestart() throws Exception {
this.addCombinationValues("defaultPersistenceAdapter",
- new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.JDBC});
+ new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
}
public void testOfflineSubscriptionAfterRestart() throws Exception {