[jboss-cvs] joramtests/src/main/java/org/objectweb/jtests/jms/conform/selector ...

[Clebert Suconic]

  User: csuconic
  Date: 07/06/19 19:32:35

  Modified:    src/main/java/org/objectweb/jtests/jms/conform/selector 
                        SelectorTest.java
  Log:
  Several fixes on flawed tests
  
  Revision  Changes    Path
  1.2       +58 -2     joramtests/src/main/java/org/objectweb/jtests/jms/conform/selector/SelectorTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SelectorTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/joramtests/src/main/java/org/objectweb/jtests/jms/conform/selector/SelectorTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- SelectorTest.java	29 Mar 2007 04:28:35 -0000	1.1
  +++ SelectorTest.java	19 Jun 2007 23:32:35 -0000	1.2
  @@ -38,7 +38,7 @@
    * Test the message selector features of JMS
    *
    * @author Jeff Mesnil (jmesnil at inrialpes.fr)
  - * @version $Id: SelectorTest.java,v 1.1 2007/03/29 04:28:35 starksm Exp $
  + * @version $Id: SelectorTest.java,v 1.2 2007/06/19 23:32:35 csuconic Exp $
    */
   public class SelectorTest extends PTPTestCase
   {
  @@ -52,6 +52,10 @@
         try
         {
            receiverConnection.stop();
  +         if (receiver!=null)
  +         {
  +        	 receiver.close();
  +         }
            receiver = receiverSession.createReceiver(receiverQueue, "");
            receiverConnection.start();
   
  @@ -82,6 +86,10 @@
         try
         {
            receiverConnection.stop();
  +         if (receiver!=null)
  +         {
  +        	 receiver.close();
  +         }
            receiver = receiverSession.createReceiver(receiverQueue, "string = 'literal''s'");
            receiverConnection.start();
   
  @@ -114,7 +122,11 @@
         try
         {
            receiverConnection.stop();
  -         receiver = receiverSession.createReceiver(receiverQueue, "JMSDeliveryMode = 'PERSISTENT'");
  +         if (receiver!=null)
  +         {
  +        	 receiver.close();
  +         }
  +         receiver = receiverSession.createReceiver(receiverQueue, "JMSDeliveryMode = 2");
            receiverConnection.start();
   
            TextMessage dummyMessage = senderSession.createTextMessage();
  @@ -149,6 +161,10 @@
         try
         {
            receiverConnection.stop();
  +         if (receiver!=null)
  +         {
  +        	 receiver.close();
  +         }
            receiver = receiverSession.createReceiver(receiverQueue, "NumberOfOrders > 1");
            receiverConnection.start();
   
  @@ -183,6 +199,10 @@
         try
         {
            receiverConnection.stop();
  +         if (receiver!=null)
  +         {
  +        	 receiver.close();
  +         }
            receiver = receiverSession.createReceiver(receiverQueue,
                  "JMSType = 'car' AND color = 'blue' AND weight > 2500");
            receiverConnection.start();
  @@ -222,6 +242,10 @@
         try
         {
            receiverConnection.stop();
  +         if (receiver!=null)
  +         {
  +        	 receiver.close();
  +         }
            receiver = receiverSession.createReceiver(receiverQueue, "weight > 2500");
            receiverConnection.start();
   
  @@ -256,6 +280,10 @@
         try
         {
            receiverConnection.stop();
  +         if (receiver!=null)
  +         {
  +        	 receiver.close();
  +         }
            receiver = receiverSession.createReceiver(receiverQueue, "weight = 2500");
            receiverConnection.start();
   
  @@ -290,6 +318,10 @@
         try
         {
            receiverConnection.stop();
  +         if (receiver!=null)
  +         {
  +        	 receiver.close();
  +         }
            receiver = receiverSession.createReceiver(receiverQueue, "weight <> 2500");
            receiverConnection.start();
   
  @@ -324,6 +356,10 @@
         try
         {
            receiverConnection.stop();
  +         if (receiver!=null)
  +         {
  +        	 receiver.close();
  +         }
            receiver = receiverSession.createReceiver(receiverQueue, "age BETWEEN 15 and 19");
            receiverConnection.start();
   
  @@ -361,6 +397,10 @@
         try
         {
            receiverConnection.stop();
  +         if (receiver!=null)
  +         {
  +        	 receiver.close();
  +         }
            receiver = receiverSession.createReceiver(receiverQueue, "Country IN ('UK', 'US', 'France')");
            receiverConnection.start();
   
  @@ -398,6 +438,10 @@
         try
         {
            receiverConnection.stop();
  +         if (receiver!=null)
  +         {
  +        	 receiver.close();
  +         }
            receiver = receiverSession.createReceiver(receiverQueue, "underscored LIKE '\\_%' ESCAPE '\\'");
            receiverConnection.start();
   
  @@ -435,6 +479,10 @@
         try
         {
            receiverConnection.stop();
  +         if (receiver!=null)
  +         {
  +        	 receiver.close();
  +         }
            receiver = receiverSession.createReceiver(receiverQueue, "word LIKE 'l_se'");
            receiverConnection.start();
   
  @@ -472,6 +520,10 @@
         try
         {
            receiverConnection.stop();
  +         if (receiver!=null)
  +         {
  +        	 receiver.close();
  +         }
            receiver = receiverSession.createReceiver(receiverQueue, "phone LIKE '12%3'");
            receiverConnection.start();
   
  @@ -509,6 +561,10 @@
         try
         {
            receiverConnection.stop();
  +         if (receiver!=null)
  +         {
  +        	 receiver.close();
  +         }
            receiver = receiverSession.createReceiver(receiverQueue, "prop_name IS NULL");
            receiverConnection.start();