You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2013/01/16 18:24:39 UTC
svn commit: r1434055 -
/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java
Author: tabish
Date: Wed Jan 16 17:24:38 2013
New Revision: 1434055
URL: http://svn.apache.org/viewvc?rev=1434055&view=rev
Log:
fix test breakage after: https://issues.apache.org/jira/browse/AMQ-3833
The producerAudit is only written out on change so in this test it holds onto log 5 meaning there are two left instead of one.
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java
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=1434055&r1=1434054&r2=1434055&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 Wed Jan 16 17:24:38 2013
@@ -17,12 +17,13 @@
package org.apache.activemq.usecases;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import java.util.Random;
-import java.util.HashSet;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
+
import javax.jms.Connection;
import javax.jms.JMSException;
import javax.jms.Message;
@@ -31,7 +32,9 @@ import javax.jms.MessageListener;
import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.management.ObjectName;
+
import junit.framework.Test;
+
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerFactory;
import org.apache.activemq.broker.BrokerService;
@@ -43,9 +46,9 @@ import org.apache.activemq.command.Activ
import org.apache.activemq.command.MessageId;
import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
-import org.apache.activemq.util.Wait;
import org.apache.activemq.store.kahadb.disk.journal.Journal;
import org.apache.activemq.store.kahadb.disk.page.PageFile;
+import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,8 +60,9 @@ public class DurableSubscriptionOfflineT
public boolean keepDurableSubsActive = true;
private BrokerService broker;
private ActiveMQTopic topic;
- private List<Throwable> exceptions = new ArrayList<Throwable>();
+ private final List<Throwable> exceptions = new ArrayList<Throwable>();
+ @Override
protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {
ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://" + getName(true));
connectionFactory.setWatchTopicAdvisories(false);
@@ -80,7 +84,8 @@ public class DurableSubscriptionOfflineT
public static Test suite() {
return suite(DurableSubscriptionOfflineTest.class);
}
-
+
+ @Override
protected void setUp() throws Exception {
exceptions.clear();
topic = (ActiveMQTopic) createDestination();
@@ -88,6 +93,7 @@ public class DurableSubscriptionOfflineT
super.setUp();
}
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
destroyBroker();
@@ -96,7 +102,7 @@ public class DurableSubscriptionOfflineT
private void createBroker() throws Exception {
createBroker(true);
}
-
+
private void createBroker(boolean deleteAllMessages) throws Exception {
broker = BrokerFactory.createBroker("broker:(vm://" + getName(true) +")");
broker.setBrokerName(getName(true));
@@ -113,7 +119,7 @@ public class DurableSubscriptionOfflineT
policyMap.setDefaultEntry(policy);
broker.setDestinationPolicy(policyMap);
}
-
+
setDefaultPersistenceAdapter(broker);
if (broker.getPersistenceAdapter() instanceof JDBCPersistenceAdapter) {
// ensure it kicks in during tests
@@ -220,7 +226,7 @@ public class DurableSubscriptionOfflineT
assertEquals(sent, listener.count);
}
-
+
public void initCombosForTestVerifyAllConsumedAreAcked() throws Exception {
this.addCombinationValues("defaultPersistenceAdapter",
new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
@@ -604,7 +610,7 @@ public class DurableSubscriptionOfflineT
con.close();
assertEquals("offline consumer got all", sent, listener.count);
- }
+ }
public void initCombosForTestMixOfOnLineAndOfflineSubsGetAllMatched() throws Exception {
this.addCombinationValues("defaultPersistenceAdapter",
@@ -811,7 +817,7 @@ public class DurableSubscriptionOfflineT
this.addCombinationValues("defaultPersistenceAdapter",
new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
}
-
+
public void testOfflineSubscriptionWithSelectorAfterRestart() throws Exception {
// create offline subs 1
Connection con = createConnection("offCli1");
@@ -852,7 +858,7 @@ public class DurableSubscriptionOfflineT
Thread.sleep(3 * 1000);
broker.stop();
createBroker(false /*deleteAllMessages*/);
-
+
// send more messages
con = createConnection();
session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -1343,7 +1349,7 @@ public class DurableSubscriptionOfflineT
Thread.sleep(1 * 1000);
session.close();
con.close();
-
+
LOG.info("cli1 again, should get 1 new ones");
con = createConnection("cli1");
session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -1491,6 +1497,7 @@ public class DurableSubscriptionOfflineT
final Listener listener = new Listener();
consumer.setMessageListener(listener);
assertTrue("got all sent", Wait.waitFor(new Wait.Condition() {
+ @Override
public boolean isSatisified() throws Exception {
LOG.info("Want: " + toSend + ", current: " + listener.count);
return listener.count == toSend;
@@ -1502,7 +1509,7 @@ public class DurableSubscriptionOfflineT
destroyBroker();
createBroker(false);
KahaDBPersistenceAdapter pa = (KahaDBPersistenceAdapter) broker.getPersistenceAdapter();
- assertEquals("only one journal file left after restart", 1, pa.getStore().getJournal().getFileMap().size());
+ assertEquals("only two journal file(s) left after restart", 2, pa.getStore().getJournal().getFileMap().size());
}
// https://issues.apache.org/jira/browse/AMQ-3768
@@ -1674,6 +1681,7 @@ public class DurableSubscriptionOfflineT
Listener(String id) {
this.id = id;
}
+ @Override
public void onMessage(Message message) {
count++;
if (id != null) {
@@ -1686,6 +1694,7 @@ public class DurableSubscriptionOfflineT
public class FilterCheckListener extends Listener {
+ @Override
public void onMessage(Message message) {
count++;