[hornetq-commits] JBoss hornetq SVN: r11025 - branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution.

[do-not-reply at jboss.org]

Author: borges
Date: 2011-07-22 09:58:45 -0400 (Fri, 22 Jul 2011)
New Revision: 11025

Modified:
   branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
Log:
Improve failure message, and test

Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java	2011-07-22 13:58:06 UTC (rev 11024)
+++ branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java	2011-07-22 13:58:45 UTC (rev 11025)
@@ -294,7 +294,7 @@
 
          for (Binding binding : bindings.getBindings())
          {
-            if (binding instanceof LocalQueueBinding && local || binding instanceof RemoteQueueBinding && !local)
+            if ((binding instanceof LocalQueueBinding && local) || (binding instanceof RemoteQueueBinding && !local))
             {
                QueueBinding qBinding = (QueueBinding)binding;
 
@@ -315,10 +315,9 @@
 
       // System.out.println(threadDump(" - fired by ClusterTestBase::waitForBindings"));
 
-      String msg = "Timed out waiting for bindings (bindingCount = " + bindingCount +
-                   ", totConsumers = " +
-                   totConsumers +
-                   ")";
+      String msg =
+               "Timed out waiting for bindings [bindingCount = " + bindingCount + " (expected=" + count +
+                        ")], [totConsumers = " + totConsumers + ", expected" + consumerCount + ")";
 
       ClusterTestBase.log.error(msg);