From do-not-reply at jboss.org Mon Aug 22 21:24:01 2011
Content-Type: multipart/mixed; boundary="===============2913837826395540781=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: hornetq-commits at lists.jboss.org
Subject: [hornetq-commits] JBoss hornetq SVN: r11216 -
 branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge.
Date: Mon, 22 Aug 2011 21:24:00 -0400
Message-ID: <201108230124.p7N1O04d009498@svn01.web.mwc.hst.phx2.redhat.com>

--===============2913837826395540781==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: clebert.suconic(a)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/brow=
se/JBPAPP-6522 - fixing test

Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/c=
luster/bridge/BridgeTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3D"mailto:tim.fox(a)jboss.com">Tim Fox</a>
+ * @author Clebert Suconic
  * =

  * Created 14 Jan 2009 14:05:01
  *
@@ -192,7 +193,7 @@
 =

          for (int i =3D 0; i < numMessages; i++)
          {
-            ClientMessage message =3D session0.createMessage(false);
+            ClientMessage message =3D session0.createMessage(true);
 =

             if (largeMessage)
             {
@@ -311,6 +312,9 @@
 =

    public void internalTestWithFilter(final boolean largeMessage, final bo=
olean useFiles) throws Exception
    {
+
+      final int numMessages =3D 10;
+
       HornetQServer server0 =3D null;
       HornetQServer server1 =3D null;
       ServerLocator locator =3D 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 =3D 10;
-
          final SimpleString propKey =3D new SimpleString("testkey");
 =

          final SimpleString selectorKey =3D new SimpleString("animal");
 =

          for (int i =3D 0; i < numMessages; i++)
          {
-            ClientMessage message =3D session0.createMessage(false);
+            ClientMessage message =3D session0.createMessage(true);
 =

             message.putIntProperty(propKey, i);
 =

@@ -416,7 +418,7 @@
 =

          for (int i =3D 0; i < numMessages; i++)
          {
-            ClientMessage message =3D session0.createMessage(false);
+            ClientMessage message =3D session0.createMessage(true);
 =

             message.putIntProperty(propKey, i);
 =

@@ -435,6 +437,8 @@
             ClientMessage message =3D consumer1.receive(200);
 =

             Assert.assertNotNull(message);
+            =

+            Assert.assertEquals("goat", message.getStringProperty(selector=
Key));
 =

             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 =3D loadQueues(server0);
+         assertEquals(1, counters.size());
+         Long key =3D counters.keySet().iterator().next();
+         =

+         AtomicInteger value =3D counters.get(key);
+         assertNotNull(value);
+         assertEquals(numMessages, counters.get(key).intValue());
+      }
 =

 =

    }
@@ -560,7 +577,7 @@
 =

          for (int i =3D 0; i < numMessages; i++)
          {
-            ClientMessage message =3D session0.createMessage(false);
+            ClientMessage message =3D session0.createMessage(true);
 =

             message.getBodyBuffer().writeBytes(new byte[1024]);
 =

@@ -720,7 +737,7 @@
 =

          for (int i =3D 0; i < numMessages; i++)
          {
-            ClientMessage message =3D session0.createMessage(false);
+            ClientMessage message =3D session0.createMessage(true);
 =

             message.getBodyBuffer().writeBytes(new byte[1024]);
 =

@@ -928,7 +945,7 @@
 =

          for (int i =3D 0; i < numMessages; i++)
          {
-            ClientMessage message =3D session0.createMessage(false);
+            ClientMessage message =3D 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 =3D 0; i < numMessages; i++)
          {
-            ClientMessage message =3D session0.createMessage(false);
+            ClientMessage message =3D session0.createMessage(true);
 =

             message.putIntProperty(propKey, i);
 =

@@ -1638,7 +1655,7 @@
 =

          for (int i =3D 0; i < numMessages; i++)
          {
-            ClientMessage message =3D session0.createMessage(false);
+            ClientMessage message =3D session0.createMessage(true);
 =

             message.putIntProperty(propKey, i);
 =



--===============2913837826395540781==--