[jboss-cvs] JBoss Messaging SVN: r6094 - trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2009-03-16 12:04:32 -0400 (Mon, 16 Mar 2009)
New Revision: 6094

Modified:
   trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/BindingImplTest.java
Log:
Just a tweak on the test

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/BindingImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/BindingImplTest.java	2009-03-16 14:24:04 UTC (rev 6093)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/BindingImplTest.java	2009-03-16 16:04:32 UTC (rev 6094)
@@ -23,7 +23,6 @@
 package org.jboss.messaging.tests.unit.core.postoffice.impl;
 
 import java.util.Set;
-import java.util.concurrent.CountDownLatch;
 
 import javax.transaction.xa.Xid;
 
@@ -68,53 +67,22 @@
    public void testRemoveWhileRouting() throws Exception
    {
       // It would require many iterations before getting a failure
-      for (int i = 0; i < 2000; i++)
+      for (int i = 0; i < 500; i++)
       {
-         internalTestRoute();
+         internalTest(true);
       }
    }
 
-   private void internalTestRoute() throws Exception
-   {
-
-      final FakeBinding fake = new FakeBinding(new SimpleString("a"));
-
-      final BindingsImpl bind = new BindingsImpl();
-      bind.addBinding(fake);
-      bind.addBinding(new FakeBinding(new SimpleString("a")));
-      bind.addBinding(new FakeBinding(new SimpleString("a")));
-
-      Thread t = new Thread()
-      {
-         @Override
-         public void run()
-         {
-            try
-            {
-               bind.removeBinding(fake);
-            }
-            catch (Exception e)
-            {
-               e.printStackTrace();
-            }
-         }
-      };
-
-      t.start();
-
-      bind.route(new FakeMessage(), new FakeTransaction());
-   }
-
    public void testRemoveWhileRedistributing() throws Exception
    {
       // It would require many iterations before getting a failure
-      for (int i = 0; i < 2000; i++)
+      for (int i = 0; i < 500; i++)
       {
-         internalTestRedistribute();
+         internalTest(false);
       }
    }
 
-   private void internalTestRedistribute() throws Exception
+   private void internalTest(final boolean route) throws Exception
    {
       final FakeBinding fake = new FakeBinding(new SimpleString("a"));
 
@@ -141,7 +109,17 @@
 
       t.start();
 
-      bind.redistribute(new FakeMessage(), new SimpleString("a"), new FakeTransaction());
+      for (int i = 0; i < 100; i++)
+      {
+         if (route)
+         {
+            bind.route(new FakeMessage(), new FakeTransaction());
+         }
+         else
+         {
+            bind.redistribute(new FakeMessage(), new SimpleString("a"), new FakeTransaction());
+         }
+      }
    }
 
    class FakeTransaction implements Transaction