[hornetq-commits] JBoss hornetq SVN: r11216 - branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2011-08-22 21:24:00 -0400 (Mon, 22 Aug 2011)
New Revision: 11216

Modified:
   branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java
Log:
https://issues.jboss.org/browse/HORNETQ-753 & https://issues.jboss.org/browse/JBPAPP-6522 - fixing test

Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java	2011-08-22 20:44:17 UTC (rev 11215)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java	2011-08-23 01:24:00 UTC (rev 11216)
@@ -55,6 +55,7 @@
  * A JMSBridgeTest
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @author Clebert Suconic
  * 
  * Created 14 Jan 2009 14:05:01
  *
@@ -192,7 +193,7 @@
 
          for (int i = 0; i < numMessages; i++)
          {
-            ClientMessage message = session0.createMessage(false);
+            ClientMessage message = session0.createMessage(true);
 
             if (largeMessage)
             {
@@ -311,6 +312,9 @@
 
    public void internalTestWithFilter(final boolean largeMessage, final boolean useFiles) throws Exception
    {
+
+      final int numMessages = 10;
+
       HornetQServer server0 = null;
       HornetQServer server1 = null;
       ServerLocator locator = null;
@@ -352,7 +356,7 @@
                                                                            1d,
                                                                            -1,
                                                                            false,
-                                                                           1024,
+                                                                           0,
                                                                            staticConnectors,
                                                                            false,
                                                                            ConfigurationImpl.DEFAULT_CLUSTER_USER,
@@ -390,15 +394,13 @@
 
          session1.start();
 
-         final int numMessages = 10;
-
          final SimpleString propKey = new SimpleString("testkey");
 
          final SimpleString selectorKey = new SimpleString("animal");
 
          for (int i = 0; i < numMessages; i++)
          {
-            ClientMessage message = session0.createMessage(false);
+            ClientMessage message = session0.createMessage(true);
 
             message.putIntProperty(propKey, i);
 
@@ -416,7 +418,7 @@
 
          for (int i = 0; i < numMessages; i++)
          {
-            ClientMessage message = session0.createMessage(false);
+            ClientMessage message = session0.createMessage(true);
 
             message.putIntProperty(propKey, i);
 
@@ -435,6 +437,8 @@
             ClientMessage message = consumer1.receive(200);
 
             Assert.assertNotNull(message);
+            
+            Assert.assertEquals("goat", message.getStringProperty(selectorKey));
 
             Assert.assertEquals(i, message.getObjectProperty(propKey));
 
@@ -445,6 +449,10 @@
                readMessages(message);
             }
          }
+         
+         session0.commit();
+         
+         session1.commit();
 
          Assert.assertNull(consumer1.receiveImmediate());
 
@@ -481,7 +489,16 @@
 
       }
       
-      assertEquals(0, loadQueues(server0).size());
+      if (useFiles)
+      {
+         Map<Long, AtomicInteger> counters = loadQueues(server0);
+         assertEquals(1, counters.size());
+         Long key = counters.keySet().iterator().next();
+         
+         AtomicInteger value = counters.get(key);
+         assertNotNull(value);
+         assertEquals(numMessages, counters.get(key).intValue());
+      }
 
 
    }
@@ -560,7 +577,7 @@
 
          for (int i = 0; i < numMessages; i++)
          {
-            ClientMessage message = session0.createMessage(false);
+            ClientMessage message = session0.createMessage(true);
 
             message.getBodyBuffer().writeBytes(new byte[1024]);
 
@@ -720,7 +737,7 @@
 
          for (int i = 0; i < numMessages; i++)
          {
-            ClientMessage message = session0.createMessage(false);
+            ClientMessage message = session0.createMessage(true);
 
             message.getBodyBuffer().writeBytes(new byte[1024]);
 
@@ -928,7 +945,7 @@
 
          for (int i = 0; i < numMessages; i++)
          {
-            ClientMessage message = session0.createMessage(false);
+            ClientMessage message = session0.createMessage(true);
 
             message.putStringProperty(propKey, new SimpleString("bing"));
 
@@ -1280,7 +1297,7 @@
                                                                            1d,
                                                                            -1,
                                                                            false,
-                                                                           1024,
+                                                                           0,
                                                                            staticConnectors,
                                                                            false,
                                                                            ConfigurationImpl.DEFAULT_CLUSTER_USER,
@@ -1324,7 +1341,7 @@
 
          for (int i = 0; i < numMessages; i++)
          {
-            ClientMessage message = session0.createMessage(false);
+            ClientMessage message = session0.createMessage(true);
 
             message.putIntProperty(propKey, i);
 
@@ -1638,7 +1655,7 @@
 
          for (int i = 0; i < numMessages; i++)
          {
-            ClientMessage message = session0.createMessage(false);
+            ClientMessage message = session0.createMessage(true);
 
             message.putIntProperty(propKey, i);