From 90790952d65d2e8dea51e130461d9ebe9b713410 Mon Sep 17 00:00:00 2001 From: "Timothy A. Bish" Date: Thu, 17 Jan 2013 00:13:40 +0000 Subject: [PATCH] fix test breakage after: https://issues.apache.org/jira/browse/AMQ-3833 Depending on timing of events in the test the producer audit can land on the last log file so there can be one or two left. git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1434514 13f79535-47bb-0310-9956-ffa450edef68 --- .../DurableSubProcessMultiRestartTest.java | 4 +- .../usecases/DurableSubSelectorDelayTest.java | 54 +++++++++---------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java b/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java index c4077be0be..d15bfd80de 100644 --- a/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java @@ -114,12 +114,12 @@ public class DurableSubProcessMultiRestartTest { assertTrue("no exceptions: " + exceptions, exceptions.isEmpty()); final KahaDBPersistenceAdapter pa = (KahaDBPersistenceAdapter) broker.getPersistenceAdapter(); - assertTrue("only two journal files should be left: " + pa.getStore().getJournal().getFileMap().size(), + assertTrue("only less than two journal files should be left: " + pa.getStore().getJournal().getFileMap().size(), Wait.waitFor(new Wait.Condition() { @Override public boolean isSatisified() throws Exception { - return pa.getStore().getJournal().getFileMap().size() == 2; + return pa.getStore().getJournal().getFileMap().size() <= 2; } }, TimeUnit.MINUTES.toMillis(3)) ); diff --git a/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubSelectorDelayTest.java b/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubSelectorDelayTest.java index 2dbd198674..f17db91cea 100644 --- a/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubSelectorDelayTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubSelectorDelayTest.java @@ -76,11 +76,11 @@ public class DurableSubSelectorDelayTest { TimeUnit.MINUTES.sleep(2); final KahaDBPersistenceAdapter pa = (KahaDBPersistenceAdapter) broker.getPersistenceAdapter(); - assertTrue("only two journal files should be left ", Wait.waitFor(new Wait.Condition() { + assertTrue("less than two journal file should be left, was: " + pa.getStore().getJournal().getFileMap().size(), Wait.waitFor(new Wait.Condition() { @Override public boolean isSatisified() throws Exception { - return pa.getStore().getJournal().getFileMap().size() == 2; + return pa.getStore().getJournal().getFileMap().size() <= 2; } }, TimeUnit.MINUTES.toMillis(2))); @@ -92,19 +92,25 @@ public class DurableSubSelectorDelayTest { */ final class MsgProducer extends Thread { - final String url = "vm://" - + DurableSubSelectorDelayTest.getName(); + final String url = "vm://" + DurableSubSelectorDelayTest.getName(); final ConnectionFactory cf = new ActiveMQConnectionFactory(url); int transRover = 0; int messageRover = 0; + int count = 40; public MsgProducer() { super("MsgProducer"); setDaemon(true); } + public MsgProducer(int count) { + super("MsgProducer"); + setDaemon(true); + this.count = count; + } + @Override public void run() { long endTime = RUNTIME + System.currentTimeMillis(); @@ -115,8 +121,8 @@ public class DurableSubSelectorDelayTest { send(); } } catch (Throwable e) { - e.printStackTrace(System.out); - throw new RuntimeException(e); + e.printStackTrace(System.out); + throw new RuntimeException(e); } } @@ -124,10 +130,8 @@ public class DurableSubSelectorDelayTest { int trans = ++transRover; boolean relevantTrans = true; - int count = 40; - LOG.info("Sending Trans[id=" + trans + ", count=" - + count + "]"); + LOG.info("Sending Trans[id=" + trans + ", count=" + count + "]"); Connection con = cf.createConnection(); @@ -150,8 +154,7 @@ public class DurableSubSelectorDelayTest { message.setBooleanProperty("RELEVANT", relevantTrans); prod.send(topic, message); - LOG.info("Committed Trans[id=" + trans + ", count=" - + count + "], ID=" + messageRover); + LOG.info("Committed Trans[id=" + trans + ", count=" + count + "], ID=" + messageRover); sess.close(); con.close(); @@ -167,7 +170,7 @@ public class DurableSubSelectorDelayTest { final ConnectionFactory cf = new ActiveMQConnectionFactory(connectionUri); - private final String subName ; + private final String subName; private final int id; private final String conClientId; @@ -176,8 +179,8 @@ public class DurableSubSelectorDelayTest { public DurableSubscriber(int id) throws JMSException { this.id = id; conClientId = "cli" + id; - subName = "subscription"+ id; - selector ="RELEVANT = true"; + subName = "subscription" + id; + selector = "RELEVANT = true"; } private void process() throws JMSException { @@ -196,7 +199,7 @@ public class DurableSubSelectorDelayTest { long max = end - System.currentTimeMillis(); if (max <= 0) { - break; + break; } Message message = consumer.receive(max); @@ -204,9 +207,7 @@ public class DurableSubSelectorDelayTest { continue; } - LOG.info("Received Trans[id=" - + message.getIntProperty("TRANS") + ", count=" - + transCount + "] in " + this + "."); + LOG.info("Received Trans[id=" + message.getIntProperty("TRANS") + ", count=" + transCount + "] in " + this + "."); } while (true); @@ -227,8 +228,7 @@ public class DurableSubSelectorDelayTest { private void unsubscribe() throws JMSException { Connection con = openConnection(); - Session session = con - .createSession(false, Session.AUTO_ACKNOWLEDGE); + Session session = con.createSession(false, Session.AUTO_ACKNOWLEDGE); session.unsubscribe(subName); session.close(); con.close(); @@ -265,14 +265,14 @@ public class DurableSubSelectorDelayTest { broker.setDeleteAllMessagesOnStartup(deleteAllMessages); File kahadbData = new File("activemq-data/" + getName() + "-kahadb"); - if (deleteAllMessages) - delete(kahadbData); + if (deleteAllMessages) + delete(kahadbData); - broker.setPersistent(true); - KahaDBPersistenceAdapter kahadb = new KahaDBPersistenceAdapter(); - kahadb.setDirectory(kahadbData); - kahadb.setJournalMaxFileLength( 500 * 1024); - broker.setPersistenceAdapter(kahadb); + broker.setPersistent(true); + KahaDBPersistenceAdapter kahadb = new KahaDBPersistenceAdapter(); + kahadb.setDirectory(kahadbData); + kahadb.setJournalMaxFileLength(500 * 1024); + broker.setPersistenceAdapter(kahadb); connectionUri = broker.addConnector("tcp://localhost:0").getPublishableConnectString();