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 2017/09/07 16:17:43 UTC

[07/14] activemq git commit: [AMQ-6778] - fix test regression that needs to account for presence of correct advisory dests

[AMQ-6778] - fix test regression that needs to account for presence of correct advisory dests

(cherry picked from commit 206f77adac24414751509195fd3b985d976573fd)


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/199f25ed
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/199f25ed
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/199f25ed

Branch: refs/heads/activemq-5.15.x
Commit: 199f25ed93612d90b29cf8f7ebc6c27bb9005592
Parents: 1bba73d
Author: gtully <ga...@gmail.com>
Authored: Wed Jul 26 11:58:04 2017 +0100
Committer: Timothy Bish <ta...@gmail.com>
Committed: Thu Sep 7 12:11:10 2017 -0400

----------------------------------------------------------------------
 .../activemq/security/SimpleAuthenticationPluginTest.java       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/199f25ed/activemq-unit-tests/src/test/java/org/apache/activemq/security/SimpleAuthenticationPluginTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/security/SimpleAuthenticationPluginTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/security/SimpleAuthenticationPluginTest.java
index 1a154b2..78e6f60 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/security/SimpleAuthenticationPluginTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/security/SimpleAuthenticationPluginTest.java
@@ -17,6 +17,7 @@
 package org.apache.activemq.security;
 
 import java.net.URI;
+import java.util.Arrays;
 
 import javax.jms.Connection;
 import javax.jms.JMSException;
@@ -126,6 +127,7 @@ public class SimpleAuthenticationPluginTest extends SecurityTestSupport {
         Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
         conn.start();
 
+        LOG.info("dest list at start:" + Arrays.asList(broker.getRegionBroker().getDestinations()));
         final int numDests = broker.getRegionBroker().getDestinations().length;
         for (int i=0; i<10; i++) {
             MessageProducer p = sess.createProducer(new ActiveMQQueue("USERS.PURGE." + i));
@@ -135,8 +137,9 @@ public class SimpleAuthenticationPluginTest extends SecurityTestSupport {
         assertTrue("dests are purged", Wait.waitFor(new Wait.Condition() {
             @Override
             public boolean isSatisified() throws Exception {
+                LOG.info("dest list:" + Arrays.asList(broker.getRegionBroker().getDestinations()));
                 LOG.info("dests, orig: " + numDests + ", now: "+ broker.getRegionBroker().getDestinations().length);
-                return (numDests + 1) == broker.getRegionBroker().getDestinations().length;
+                return numDests == broker.getRegionBroker().getDestinations().length;
             }
         }));