fix up to respect normalisation of mbean attribute/property names from http://git-wip-us.apache.org/repos/asf/activemq/commit/0709c2cc
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/ee08fc1e Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/ee08fc1e Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/ee08fc1e Branch: refs/heads/trunk Commit: ee08fc1e24b8b034f1e5d6aae0a97dfa3e0f4bb1 Parents: 318d52c Author: gtully <gary.tu...@gmail.com> Authored: Mon Jul 14 15:31:40 2014 +0100 Committer: gtully <gary.tu...@gmail.com> Committed: Mon Jul 14 17:02:18 2014 +0100 ---------------------------------------------------------------------- .../org/apache/activemq/bugs/AMQ4677Test.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/ee08fc1e/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4677Test.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4677Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4677Test.java index 4a1ea41..fd80690 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4677Test.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4677Test.java @@ -30,6 +30,8 @@ import javax.management.ObjectName; import org.apache.activemq.ActiveMQConnectionFactory; 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.leveldb.LevelDBStore; import org.apache.activemq.leveldb.LevelDBStoreViewMBean; import org.apache.activemq.util.Wait; @@ -89,7 +91,7 @@ public class AMQ4677Test { MessageProducer producer = session.createProducer(destination); producer.setDeliveryMode(DeliveryMode.PERSISTENT); - LevelDBStoreViewMBean levelDBView = getLevelDBStoreMBean(); + final LevelDBStoreViewMBean levelDBView = getLevelDBStoreMBean(); assertNotNull(levelDBView); levelDBView.compact(); @@ -133,19 +135,18 @@ public class AMQ4677Test { } }); - done.await(10, TimeUnit.MINUTES); + done.await(15, TimeUnit.MINUTES); session.commit(); LOG.info("Finished receiving all messages."); - LOG.info("Current number of logs {}", countLogFiles()); - - assertTrue("Should only have one log file left.", Wait.waitFor(new Wait.Condition() { + assertTrue("Should < 3 logfiles left.", Wait.waitFor(new Wait.Condition() { @Override public boolean isSatisified() throws Exception { - return countLogFiles() == 1; + levelDBView.compact(); + return countLogFiles() < 3; } - }, TimeUnit.MINUTES.toMillis(5))); + }, TimeUnit.MINUTES.toMillis(5), (int)TimeUnit.SECONDS.toMillis(30))); levelDBView.compact(); LOG.info("Current number of logs {}", countLogFiles()); @@ -163,12 +164,13 @@ public class AMQ4677Test { } }); + LOG.info("Current number of logs {}", logFiles.length); return logFiles.length; } protected LevelDBStoreViewMBean getLevelDBStoreMBean() throws Exception { ObjectName levelDbViewMBeanQuery = new ObjectName( - "org.apache.activemq:type=Broker,brokerName=LevelDBBroker,Service=PersistenceAdapter,InstanceName=LevelDB*"); + "org.apache.activemq:type=Broker,brokerName=LevelDBBroker,service=PersistenceAdapter,instanceName=LevelDB*"); Set<ObjectName> names = brokerService.getManagementContext().queryNames(null, levelDbViewMBeanQuery); if (names.isEmpty() || names.size() > 1) {
