[hornetq-commits] JBoss hornetq SVN: r7884 - in trunk/tests/src/org/hornetq/tests: util and 1 other directory.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2009-08-22 05:44:31 -0400 (Sat, 22 Aug 2009)
New Revision: 7884

Modified:
   trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java
   trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java
   trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java
Log:
Fixing testsuite / hangs (first try)

Modified: trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java	2009-08-22 07:56:07 UTC (rev 7883)
+++ trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java	2009-08-22 09:44:31 UTC (rev 7884)
@@ -48,6 +48,10 @@
    {
       assertEquals(0, AsynchronousFileImpl.getTotalMaxIO());
       
+      factory = null;
+      
+      forceGC();
+      
       super.tearDown();
    }
 
@@ -374,6 +378,9 @@
 
       try
       {
+         
+         bb1 = factory.wrapBuffer(bytes1);
+         
          sf.write(bb1, true);
 
          fail("Should throw exception");

Modified: trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java	2009-08-22 07:56:07 UTC (rev 7883)
+++ trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java	2009-08-22 09:44:31 UTC (rev 7884)
@@ -64,56 +64,6 @@
 
    // Static --------------------------------------------------------
    private final Logger log = Logger.getLogger(this.getClass());
-
-   public static void forceGC()
-   {
-      WeakReference<Object> dumbReference = new WeakReference<Object>(new Object());
-      // A loop that will wait GC, using the minimal time as possible
-      while (dumbReference.get() != null)
-      {
-         System.gc();
-         try
-         {
-            Thread.sleep(500);
-         }
-         catch (InterruptedException e)
-         {
-         }
-      }
-   }
-
-   // 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();
-         }
-
-         for (WeakReference<?> ref : references)
-         {
-            if (ref.get() != null)
-            {
-               hasValue = true;
-            }
-         }
-      }
-      while (i++ <= 30 && hasValue);
-
-      for (WeakReference<?> ref : references)
-      {
-         assertNull(ref.get());
-      }
-   }
-
    // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------

Modified: trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java	2009-08-22 07:56:07 UTC (rev 7883)
+++ trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java	2009-08-22 09:44:31 UTC (rev 7884)
@@ -26,6 +26,7 @@
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.lang.ref.WeakReference;
 import java.net.ServerSocket;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -90,8 +91,61 @@
 
    private String testDir = System.getProperty("java.io.tmpdir", "/tmp") + "/hornetq-unit-test";
 
+   
+   
+   
    // Static --------------------------------------------------------
-   
+
+   public static void forceGC()
+   {
+      WeakReference<Object> dumbReference = new WeakReference<Object>(new Object());
+      // A loop that will wait GC, using the minimal time as possible
+      while (dumbReference.get() != null)
+      {
+         System.gc();
+         try
+         {
+            Thread.sleep(500);
+         }
+         catch (InterruptedException e)
+         {
+         }
+      }
+   }
+
+   // 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();
+         }
+
+         for (WeakReference<?> ref : references)
+         {
+            if (ref.get() != null)
+            {
+               hasValue = true;
+            }
+         }
+      }
+      while (i++ <= 30 && hasValue);
+
+      for (WeakReference<?> ref : references)
+      {
+         assertNull(ref.get());
+      }
+   }
+
+
    public static String threadDump(String msg)
    {
       StringWriter str = new StringWriter();