[jboss-cvs] JBossAS SVN: r99969 - branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test.

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

Author: clebert.suconic at jboss.com
Date: 2010-01-26 19:49:43 -0500 (Tue, 26 Jan 2010)
New Revision: 99969

Modified:
   branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java
Log:
test changes

Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java	2010-01-27 00:38:25 UTC (rev 99968)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java	2010-01-27 00:49:43 UTC (rev 99969)
@@ -77,6 +77,7 @@
    public void setUp() throws Exception
    {
       super.setUp();
+      context = new InitialContext();
       setupBasicDestinations();
       
    }
@@ -90,13 +91,11 @@
    {
 	   super.tearDown();
 	   disconnect();
+	   context.close();
+	   context = null;
    }
    protected void connect() throws Exception
    {
-      if (context == null)
-      {
-         context = new InitialContext();
-      }
       ConnectionFactory queueFactory = (ConnectionFactory) context.lookup(QUEUE_FACTORY);
       queueConnection = queueFactory.createConnection();
 
@@ -118,12 +117,6 @@
 	      topicConnection.close();
 	      topicConnection = null;
 	  }
-	   
-	  if (context != null)
-	  {
-        context.close();
-	  }
-     context = null;
 
    }
 
@@ -1021,7 +1014,7 @@
          // Send a message that has expired
          TextMessage message = session.createTextMessage("Outdated");
          sender.send(message, DeliveryMode.PERSISTENT, 4, 1);
-         Thread.sleep(100);
+         Thread.sleep(10);
 
          // Send a message that has not expired
          message = session.createTextMessage("OK");
@@ -1029,7 +1022,7 @@
 
          // Try to receive the message the not expired message
          queueConnection.start();
-         message = (TextMessage) receiver.receiveNoWait();
+         message = (TextMessage) receiver.receive(5000);
          assertEquals("OK", message.getText());
 
          // Should be no more
@@ -1066,7 +1059,7 @@
          // Sleep 6 seconds
          Thread.sleep(6*1000);
          // Try to receive the OK message
-         message = (TextMessage) receiver.receiveNoWait();
+         message = (TextMessage) receiver.receive(5000);
          assertEquals("OK", message.getText());
 
          // Should be no more
@@ -1081,9 +1074,9 @@
          // Sleep 1 seconds
          Thread.sleep(1*1000);
          // Try to receive the messages
-         message = (TextMessage) receiver.receiveNoWait();
+         message = (TextMessage) receiver.receive(5000);
          assertEquals("10 Second Expiration", message.getText());
-         message = (TextMessage) receiver.receiveNoWait();
+         message = (TextMessage) receiver.receive(5000);
          assertEquals("OK", message.getText());
 
          // Should be no more
@@ -1099,9 +1092,9 @@
          // Sleep 6 seconds
          Thread.sleep(6*1000);
          // Try to receive the OK message
-         message = (TextMessage) receiver.receiveNoWait();
+         message = (TextMessage) receiver.receive(5000);
          assertEquals("5 Second Expiration", message.getText());
-         message = (TextMessage) receiver.receiveNoWait();
+         message = (TextMessage) receiver.receive(5000);
          assertEquals("OK", message.getText());
          assertTrue("Didn't expect anymore messages", receiver.receiveNoWait() == null);
       }