[jboss-cvs] JBoss Messaging SVN: r5766 - trunk/tests/src/org/jboss/messaging/tests/integration/cluster/bridge.

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

Author: jmesnil
Date: 2009-01-30 05:09:34 -0500 (Fri, 30 Jan 2009)
New Revision: 5766

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/cluster/bridge/BridgeStartTest.java
Log:
in testTargetServerUpAndDown, put service0 and service1 stop() calls in a finally block to ensure that the services won't remain in the InVMRegistry if the test fails

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/bridge/BridgeStartTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/bridge/BridgeStartTest.java	2009-01-30 10:00:04 UTC (rev 5765)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/bridge/BridgeStartTest.java	2009-01-30 10:09:34 UTC (rev 5766)
@@ -253,142 +253,148 @@
       List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>();
       queueConfigs1.add(queueConfig1);
       service1.getServer().getConfiguration().setQueueConfigurations(queueConfigs1);
-      
-      //Don't start service 1 yet
-      
-      log.info("starting 0");
-      service0.start();      
-      log.info("started 0");
 
-      ClientSessionFactory sf0 = new ClientSessionFactoryImpl(server0tc);
-      
-      ClientSession session0 = sf0.createSession(false, true, true);
-      
-      ClientProducer producer0 = session0.createProducer(new SimpleString(testAddress));
-                 
-      final int numMessages = 10;
+      try{
+         //Don't start service 1 yet
 
-      final SimpleString propKey = new SimpleString("testkey");
+         log.info("starting 0");
+         service0.start();      
+         log.info("started 0");
 
-      for (int i = 0; i < numMessages; i++)
-      {
-         ClientMessage message = session0.createClientMessage(false);
+         ClientSessionFactory sf0 = new ClientSessionFactoryImpl(server0tc);
 
-         message.putIntProperty(propKey, i);
+         ClientSession session0 = sf0.createSession(false, true, true);
 
-         producer0.send(message);
-      }
-      
-      //Wait a bit
-      Thread.sleep(1000);
-      
-      log.info("starting 1");
-      service1.start();
-      log.info("started server 1");
-      
-      ClientSessionFactory sf1 = new ClientSessionFactoryImpl(server1tc);
-      
-      ClientSession session1 = sf1.createSession(false, true, true);
-     
-      ClientConsumer consumer1 = session1.createConsumer(queueName1);
+         ClientProducer producer0 = session0.createProducer(new SimpleString(testAddress));
 
-      session1.start();
+         final int numMessages = 10;
 
-      for (int i = 0; i < numMessages; i++)
-      {
-         ClientMessage message = consumer1.receive(1000);
+         final SimpleString propKey = new SimpleString("testkey");
 
-         assertNotNull(message);
+         for (int i = 0; i < numMessages; i++)
+         {
+            ClientMessage message = session0.createClientMessage(false);
 
-         assertEquals((Integer)i, (Integer)message.getProperty(propKey));
+            message.putIntProperty(propKey, i);
 
-         message.acknowledge();
-      }
+            producer0.send(message);
+         }
 
-      assertNull(consumer1.receive(200));
-      
-      log.info("consumed messages");
-      
-      for (int i = 0; i < numMessages; i++)
-      {
-         ClientMessage message = session0.createClientMessage(false);
+         //Wait a bit
+         Thread.sleep(1000);
 
-         message.putIntProperty(propKey, i);
+         log.info("starting 1");
+         service1.start();
+         log.info("started server 1");
 
-         producer0.send(message);
-      }
-                 
-      for (int i = 0; i < numMessages; i++)
-      {
-         ClientMessage message = consumer1.receive(1000);
+         ClientSessionFactory sf1 = new ClientSessionFactoryImpl(server1tc);
 
-         assertNotNull(message);
+         ClientSession session1 = sf1.createSession(false, true, true);
 
-         assertEquals((Integer)i, (Integer)message.getProperty(propKey));
+         ClientConsumer consumer1 = session1.createConsumer(queueName1);
 
-         message.acknowledge();
-      }
-      
-      assertNull(consumer1.receive(200));
-                 
-      session1.close();
-      
-      sf1.close();
-      
-      log.info("stipping 1");
-      service1.stop();
-      log.info("stopped 1");
-      
-      for (int i = 0; i < numMessages; i++)
-      {
-         ClientMessage message = session0.createClientMessage(false);
+         session1.start();
 
-         message.putIntProperty(propKey, i);
+         for (int i = 0; i < numMessages; i++)
+         {
+            ClientMessage message = consumer1.receive(1000);
 
-         producer0.send(message);
-      }
-      
-      log.info("Sent more messages");
-      
-      service1.start();
-      
-      log.info("started service1");
-      
-      sf1 = new ClientSessionFactoryImpl(server1tc);
-      
-      session1 = sf1.createSession(false, true, true);
-     
-      consumer1 = session1.createConsumer(queueName1);
+            assertNotNull(message);
 
-      log.info("**** started session");
-      session1.start();
-      
-      for (int i = 0; i < numMessages; i++)
-      {
-         ClientMessage message = consumer1.receive(1000);
+            assertEquals((Integer)i, (Integer)message.getProperty(propKey));
 
-         assertNotNull(message);
+            message.acknowledge();
+         }
 
-         assertEquals((Integer)i, (Integer)message.getProperty(propKey));
+         assertNull(consumer1.receive(200));
 
-         message.acknowledge();
+         log.info("consumed messages");
+
+         for (int i = 0; i < numMessages; i++)
+         {
+            ClientMessage message = session0.createClientMessage(false);
+
+            message.putIntProperty(propKey, i);
+
+            producer0.send(message);
+         }
+
+         for (int i = 0; i < numMessages; i++)
+         {
+            ClientMessage message = consumer1.receive(1000);
+
+            assertNotNull(message);
+
+            assertEquals((Integer)i, (Integer)message.getProperty(propKey));
+
+            message.acknowledge();
+         }
+
+         assertNull(consumer1.receive(200));
+
+         session1.close();
+
+         sf1.close();
+
+         log.info("stipping 1");
+         service1.stop();
+         log.info("stopped 1");
+
+         for (int i = 0; i < numMessages; i++)
+         {
+            ClientMessage message = session0.createClientMessage(false);
+
+            message.putIntProperty(propKey, i);
+
+            producer0.send(message);
+         }
+
+         log.info("Sent more messages");
+
+         service1.start();
+
+         log.info("started service1");
+
+         sf1 = new ClientSessionFactoryImpl(server1tc);
+
+         session1 = sf1.createSession(false, true, true);
+
+         consumer1 = session1.createConsumer(queueName1);
+
+         log.info("**** started session");
+         session1.start();
+
+         for (int i = 0; i < numMessages; i++)
+         {
+            ClientMessage message = consumer1.receive(1000);
+
+            assertNotNull(message);
+
+            assertEquals((Integer)i, (Integer)message.getProperty(propKey));
+
+            message.acknowledge();
+         }
+
+         assertNull(consumer1.receive(200));
+
+         log.info("received all messages again");
+
+         session1.close();
+
+         sf1.close();
+
+         session0.close();
+
+         sf0.close();
+
+
       }
-      
-      assertNull(consumer1.receive(200));
-      
-      log.info("received all messages again");
-      
-      session1.close();
-      
-      sf1.close();
-            
-      session0.close();
+      finally
+      {
+         service0.stop();
 
-      sf0.close();
-      
-      service0.stop();
-
-      service1.stop();
+         service1.stop();
+      }
    }
    
    public void testTargetServerNotAvailableNoReconnectTries() throws Exception