[hornetq-commits] JBoss hornetq SVN: r8950 - trunk/tests/src/org/hornetq/tests/timing/core/server/impl.

[do-not-reply at jboss.org]

Author: timfox
Date: 2010-03-24 06:06:32 -0400 (Wed, 24 Mar 2010)
New Revision: 8950

Modified:
   trunk/tests/src/org/hornetq/tests/timing/core/server/impl/QueueImplTest.java
Log:
fixed test

Modified: trunk/tests/src/org/hornetq/tests/timing/core/server/impl/QueueImplTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/timing/core/server/impl/QueueImplTest.java	2010-03-23 15:20:55 UTC (rev 8949)
+++ trunk/tests/src/org/hornetq/tests/timing/core/server/impl/QueueImplTest.java	2010-03-24 10:06:32 UTC (rev 8950)
@@ -64,16 +64,6 @@
 
    // The tests ----------------------------------------------------------------
 
-   public void testScheduledDirect() throws Exception
-   {
-      testScheduled(true);
-   }
-
-   public void testScheduledQueueing() throws Exception
-   {
-      testScheduled(false);
-   }
-
    public void testScheduledNoConsumer() throws Exception
    {
       QueueImpl queue = new QueueImpl(1,
@@ -149,7 +139,7 @@
       assertRefListsIdenticalRefs(refs, consumer.getReferences());
    }
 
-   private void testScheduled(final boolean direct) throws Exception
+   public void testScheduled() throws Exception
    {
       QueueImpl queue = new QueueImpl(1,
                                   new SimpleString("address1"),
@@ -165,13 +155,7 @@
 
       FakeConsumer consumer = null;
 
-      if (direct)
-      {
-         consumer = new FakeConsumer();
-
-         queue.addConsumer(consumer);
-      }
-
+    
       // Send one scheduled
 
       long now = System.currentTimeMillis();
@@ -207,14 +191,12 @@
       ref8.setScheduledDeliveryTime(now + 6000);
       queue.addLast(ref8);
 
-      if (!direct)
-      {
-         consumer = new FakeConsumer();
+      consumer = new FakeConsumer();
 
-         queue.addConsumer(consumer);
+      queue.addConsumer(consumer);
 
-         queue.deliverNow();
-      }
+      queue.deliverNow();
+      
 
       List<MessageReference> refs = new ArrayList<MessageReference>();