[jboss-cvs] JBoss Messaging SVN: r7764 - in trunk/tests/src/org/jboss/messaging/tests: util and 1 other directory.

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

Author: clebert.suconic at jboss.com
Date: 2009-08-17 13:55:58 -0400 (Mon, 17 Aug 2009)
New Revision: 7764

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/client/SessionCloseOnGCTest.java
   trunk/tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java
Log:
small tweak on GC tests

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/SessionCloseOnGCTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/SessionCloseOnGCTest.java	2009-08-17 17:36:52 UTC (rev 7763)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/SessionCloseOnGCTest.java	2009-08-17 17:55:58 UTC (rev 7764)
@@ -30,7 +30,6 @@
 import org.jboss.messaging.core.logging.Logger;
 import org.jboss.messaging.core.server.MessagingServer;
 import org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory;
-import org.jboss.messaging.integration.transports.netty.NettyConnectorFactory;
 import org.jboss.messaging.tests.util.ServiceTestBase;
 import org.jboss.messaging.utils.SimpleString;
 
@@ -94,8 +93,6 @@
          factory = null;
 
          checkWeakReferences(fref, wrs1, wrs2);
-
-         assertNull(fref.get());
       }
       finally
       {
@@ -139,8 +136,6 @@
          factory = null;
 
          checkWeakReferences(fref, wrs1, wrs2);
-
-         assertNull(fref.get());
       }
       finally
       {
@@ -180,8 +175,6 @@
          factory = null;
 
          checkWeakReferences(fref, wrs1, wrs2);
-
-         assertNull(fref.get());
       }
       finally
       {
@@ -218,8 +211,6 @@
          factory = null;
 
          checkWeakReferences(fref, wrs1, wrs2);
-
-         assertNull(fref.get());
       }
       finally
       {
@@ -266,17 +257,15 @@
       ClientSessionFactoryImpl sf = (ClientSessionFactoryImpl)createInVMFactory();
 
       ClientSession session = sf.createSession(false, true, true);
+      
+      WeakReference<ClientSession> wses = new WeakReference<ClientSession>(session);
 
       assertEquals(1, server.getRemotingService().getConnections().size());
 
       session = null;
 
-      System.gc();
-      System.gc();
-      System.gc();
+      checkWeakReferences(wses);
 
-      Thread.sleep(2000);
-
       assertEquals(0, sf.numSessions());
       assertEquals(0, sf.numConnections());
       assertEquals(0, server.getRemotingService().getConnections().size());
@@ -292,16 +281,17 @@
 
       assertEquals(3, server.getRemotingService().getConnections().size());
 
+      WeakReference<ClientSession> ref1 = new WeakReference<ClientSession> (session1); 
+      WeakReference<ClientSession> ref2 = new WeakReference<ClientSession> (session2); 
+      WeakReference<ClientSession> ref3 = new WeakReference<ClientSession> (session3); 
+
       session1 = null;
       session2 = null;
       session3 = null;
+      
 
-      System.gc();
-      System.gc();
-      System.gc();
+      checkWeakReferences(ref1, ref2, ref3);
 
-      Thread.sleep(2000);
-
       assertEquals(0, sf.numSessions());
       assertEquals(0, sf.numConnections());
       assertEquals(0, server.getRemotingService().getConnections().size());

Modified: trunk/tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java	2009-08-17 17:36:52 UTC (rev 7763)
+++ trunk/tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java	2009-08-17 17:55:58 UTC (rev 7764)
@@ -94,14 +94,14 @@
    // verify if these weak references are released after a few GCs
    public static void checkWeakReferences(WeakReference<?>... references)
    {
- 
+
       int i = 0;
       boolean hasValue = false;
-      
+
       do
       {
          hasValue = false;
-         
+
          if (i > 0)
          {
             forceGC();
@@ -115,7 +115,12 @@
             }
          }
       }
-      while (i++ <= 10 && hasValue);
+      while (i++ <= 30 && hasValue);
+
+      for (WeakReference<?> ref : references)
+      {
+         assertNull(ref.get());
+      }
    }
 
    // Constructors --------------------------------------------------
@@ -202,23 +207,29 @@
 
    protected MessagingServer createServer(final boolean realFiles, final Configuration configuration)
    {
-      return createServer(realFiles, configuration,  -1, -1, new HashMap<String, AddressSettings>());
+      return createServer(realFiles, configuration, -1, -1, new HashMap<String, AddressSettings>());
    }
 
-   protected MessagingServer createServer(final boolean realFiles, final Configuration configuration,
+   protected MessagingServer createServer(final boolean realFiles,
+                                          final Configuration configuration,
                                           final JBMSecurityManager securityManager)
    {
       MessagingServer server;
 
       if (realFiles)
       {
-         server = Messaging.newMessagingServer(configuration, ManagementFactory.getPlatformMBeanServer(), securityManager);
+         server = Messaging.newMessagingServer(configuration,
+                                               ManagementFactory.getPlatformMBeanServer(),
+                                               securityManager);
       }
       else
       {
-         server = Messaging.newMessagingServer(configuration, ManagementFactory.getPlatformMBeanServer(), securityManager, false);
+         server = Messaging.newMessagingServer(configuration,
+                                               ManagementFactory.getPlatformMBeanServer(),
+                                               securityManager,
+                                               false);
       }
-      
+
       Map<String, AddressSettings> settings = new HashMap<String, AddressSettings>();
 
       for (Map.Entry<String, AddressSettings> setting : settings.entrySet())
@@ -238,7 +249,9 @@
                                                              final Map<String, Object> params)
    {
       return createServer(realFiles,
-                          createClusteredDefaultConfig(index, params, INVM_ACCEPTOR_FACTORY), -1, -1,
+                          createClusteredDefaultConfig(index, params, INVM_ACCEPTOR_FACTORY),
+                          -1,
+                          -1,
                           new HashMap<String, AddressSettings>());
    }
 
@@ -284,7 +297,6 @@
       configuration.setJournalCompactMinFiles(0);
       configuration.setJournalCompactPercentage(0);
 
-
       configuration.getAcceptorConfigurations().clear();
 
       for (String acceptor : acceptors)