[hornetq-commits] JBoss hornetq SVN: r12268 - trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client.

[do-not-reply at jboss.org]

Author: borges
Date: 2012-03-08 11:06:44 -0500 (Thu, 08 Mar 2012)
New Revision: 12268

Modified:
   trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TemporaryQueueTest.java
Log:
Fix tests leaving serverLocator open.

Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TemporaryQueueTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TemporaryQueueTest.java	2012-03-08 16:06:28 UTC (rev 12267)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TemporaryQueueTest.java	2012-03-08 16:06:44 UTC (rev 12268)
@@ -204,7 +204,7 @@
       Assert.assertTrue("connection close listeners not fired", latch.await(2 * TemporaryQueueTest.CONNECTION_TTL,
                                                                             TimeUnit.MILLISECONDS));
 
-      sf = locator.createSessionFactory();
+      sf = addSessionFactory(locator.createSessionFactory());
       session = sf.createSession(false, true, true);
       session.start();
 
@@ -343,7 +343,7 @@
       serverWithReattach.setReconnectAttempts(-1);
       serverWithReattach.setRetryInterval(1000);
       serverWithReattach.setConfirmationWindowSize(-1);
-      ClientSessionFactory reattachSF = serverWithReattach.createSessionFactory();
+      ClientSessionFactory reattachSF = createSessionFactory(serverWithReattach);
 
       ClientSession session = reattachSF.createSession(false, false);
       session.createTemporaryQueue("tmpAd", "tmpQ");
@@ -428,7 +428,7 @@
       // Will be using a single Session as this is how an issue was raised
       for (int i = 0 ; i < iterations; i++)
       {
-         ClientSessionFactory clientsConnecton = locator.createSessionFactory();
+         ClientSessionFactory clientsConnecton = addSessionFactory(locator.createSessionFactory());
          ClientSession localSession = clientsConnecton.createSession();
 
          ClientProducer prod = localSession.createProducer(address);
@@ -481,8 +481,6 @@
          }
          finally
          {
-//            sessConsumerRed.close();
-//            sessConsumerBlue.close();
             localSession.close();
             clientsConnecton.close();
          }
@@ -514,9 +512,9 @@
          }
       });
 
-      ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
+      ServerLocator locator = createInVMNonHALocator();
       locator.setConnectionTTL(TemporaryQueueTest.CONNECTION_TTL);
-      sf = locator.createSessionFactory();
+      sf = addSessionFactory(locator.createSessionFactory());
       session = sf.createSession(false, true, true);
 
       session.createTemporaryQueue(address, queue);
@@ -548,8 +546,9 @@
       session.close();
 
       sf.close();
-      ServerLocator locator2 = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
-      sf = locator2.createSessionFactory();
+      ServerLocator locator2 = createInVMNonHALocator();
+
+      sf = addSessionFactory(locator2.createSessionFactory());
       session = sf.createSession(false, true, true);
       session.start();
 
@@ -695,9 +694,4 @@
       retlocator.setClientFailureCheckPeriod(TemporaryQueueTest.CONNECTION_TTL / 3);
       return retlocator;
    }
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }