[jboss-cvs] jboss-jms/tests/src/org/jboss/test/messaging/core/base ...

[Timothy Fox]

  User: timfox  
  Date: 06/07/17 13:14:51

  Modified:    tests/src/org/jboss/test/messaging/core/base  
                        ChannelTestBase.java
  Removed:     tests/src/org/jboss/test/messaging/core/base  
                        StateTestBase.java
  Log:
  Many changes including implementation of prefetch, SEDAisation of server, changing of recovery
  
  Revision  Changes    Path
  1.31      +41 -35    jboss-jms/tests/src/org/jboss/test/messaging/core/base/ChannelTestBase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ChannelTestBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-jms/tests/src/org/jboss/test/messaging/core/base/ChannelTestBase.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -b -r1.30 -r1.31
  --- ChannelTestBase.java	24 Jun 2006 09:05:39 -0000	1.30
  +++ ChannelTestBase.java	17 Jul 2006 17:14:50 -0000	1.31
  @@ -65,9 +65,9 @@
    *
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
    * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  - * @version <tt>$Revision: 1.30 $</tt>
  + * @version <tt>$Revision: 1.31 $</tt>
    *
  - * $Id: ChannelTestBase.java,v 1.30 2006/06/24 09:05:39 timfox Exp $
  + * $Id: ChannelTestBase.java,v 1.31 2006/07/17 17:14:50 timfox Exp $
    */
   public abstract class ChannelTestBase extends NoTestsChannelTestBase
   {
  @@ -184,6 +184,8 @@
   
      // Channel tests -------------------------------------------------
      
  +   
  +   
      /*
       * If a channel has a set a receiver and remove is called with a different receiver
       * need to ensure the receiver is not removed (since it doesn't match)
  @@ -286,14 +288,14 @@
         assertFalse(sm.isReliable());
         assertEquals(0, sm.getMessageID());
   
  -      assertFalse(channel.deliver(null));
  -
         SimpleReceiver receiver = new SimpleReceiver("ACKING", SimpleReceiver.ACKING);
  -      assertTrue(channel.deliver(receiver));
  +      channel.add(receiver);
  +      channel.deliver(true);
         assertEquals(1, receiver.getMessages().size());
         assertEquals(0, ((Message)receiver.getMessages().get(0)).getMessageID());
   
  -      assertFalse(channel.deliver(receiver));
  +      channel.deliver(true);
  +      assertEquals(1, receiver.getMessages().size());
   
   
      }
  @@ -324,25 +326,23 @@
            Delivery delivery = channel.handle(observer, messages[i], null);
   
            assertTrue(delivery.isDone());
  -
  -         assertFalse(channel.deliver(null));
         }
   
         List stored = channel.browse();
         assertEqualSets(messages, stored);
   
         SimpleReceiver receiver = new SimpleReceiver("ACKING", SimpleReceiver.ACKING);
  +      channel.add(receiver);
  +      channel.deliver(true);
  +      assertEquals(10, receiver.getMessages().size());
         for(int i = 0; i < NUMBER_OF_MESSAGES; i++)
         {
  -         assertTrue(channel.deliver(receiver));
  -         assertEquals(1, receiver.getMessages().size());
  -         assertEquals(i, ((Message)receiver.getMessages().get(0)).getMessageID());
  -         receiver.clear();
  +         assertEquals(i, ((Message)receiver.getMessages().get(i)).getMessageID());         
         }
  +      receiver.clear();
   
  -      assertFalse(channel.deliver(receiver));
  -
  -      log.info("ok");
  +      channel.deliver(true);
  +      assertEquals(0, receiver.getMessages().size());
      }
   
      ////////
  @@ -385,10 +385,13 @@
   
         assertTrue(channel.browse().isEmpty());
   
  -      assertFalse(channel.deliver(null));
  -      assertFalse(channel.deliver(new SimpleReceiver("ACKING", SimpleReceiver.ACKING)));
  +      channel.deliver(true);
  +      
  +      Receiver r = new SimpleReceiver("ACKING", SimpleReceiver.ACKING);
  +      
  +      channel.add(r);
   
  -      log.info("ok");
  +      channel.deliver(true);
      }
   
      ///////////
  @@ -427,16 +430,16 @@
         assertTrue(sm.isReliable());
         assertEquals(0, sm.getMessageID());
   
  -      assertFalse(channel.deliver(null));
  +      channel.deliver(true);
   
         SimpleReceiver receiver = new SimpleReceiver("ACKING", SimpleReceiver.ACKING);
  -      assertTrue(channel.deliver(receiver));
  +      channel.add(receiver);
  +      channel.deliver(true);
         assertEquals(1, receiver.getMessages().size());
         assertEquals(0, ((Message)receiver.getMessages().get(0)).getMessageID());
   
  -      assertFalse(channel.deliver(receiver));
  -
  -      log.info("ok");
  +      channel.deliver(true);
  +      assertEquals(1, receiver.getMessages().size());
      }
   
      //////////
  @@ -477,13 +480,16 @@
            // the channel must not accept the message
            assertNull(delivery);
   
  -         assertFalse(channel.deliver(null));
  -         assertFalse(channel.deliver(new SimpleReceiver("ACKING", SimpleReceiver.ACKING)));
  +         channel.deliver(true);
  +         
  +         Receiver r = new SimpleReceiver("ACKING", SimpleReceiver.ACKING);
  +         
  +         channel.add(r);
  +         
  +         channel.deliver(true);
         }
   
         assertTrue(channel.browse().isEmpty());
  -
  -      log.info("ok");
      }
   
      ///////////
  @@ -523,17 +529,17 @@
         assertEqualSets(messages, channel.browse());
   
         SimpleReceiver receiver = new SimpleReceiver("ACKING", SimpleReceiver.ACKING);
  +      channel.add(receiver);
  +      channel.deliver(true);
  +      assertEquals(10, receiver.getMessages().size());
         for(int i = 0; i < NUMBER_OF_MESSAGES; i++)
         {
  -         assertTrue(channel.deliver(receiver));
  -         assertEquals(1, receiver.getMessages().size());
  -         assertEquals(i, ((Message)receiver.getMessages().get(0)).getMessageID());
  -         receiver.clear();
  +         assertEquals(i, ((Message)receiver.getMessages().get(i)).getMessageID());         
         }
  +      receiver.clear();
   
  -      assertFalse(channel.deliver(receiver));
  -
  -      log.info("ok");
  +      channel.deliver(true);
  +      assertEquals(0, receiver.getMessages().size());
      }