[jboss-cvs] JBoss Messaging SVN: r7393 - trunk/tests/src/org/jboss/messaging/tests/unit/core/duplicateDetection.

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

Author: clebert.suconic at jboss.com
Date: 2009-06-18 16:10:40 -0400 (Thu, 18 Jun 2009)
New Revision: 7393

Modified:
   trunk/tests/src/org/jboss/messaging/tests/unit/core/duplicateDetection/DuplicateDetectionUnitTest.java
Log:
JBMESSAGING-1660 - tweak on test

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/duplicateDetection/DuplicateDetectionUnitTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/duplicateDetection/DuplicateDetectionUnitTest.java	2009-06-18 20:04:31 UTC (rev 7392)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/duplicateDetection/DuplicateDetectionUnitTest.java	2009-06-18 20:10:40 UTC (rev 7393)
@@ -26,8 +26,6 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Random;
 import java.util.concurrent.Executors;
 
 import org.jboss.messaging.core.config.Configuration;
@@ -36,7 +34,6 @@
 import org.jboss.messaging.core.paging.PagingManager;
 import org.jboss.messaging.core.paging.PagingStore;
 import org.jboss.messaging.core.persistence.QueueBindingInfo;
-import org.jboss.messaging.core.persistence.StorageManager;
 import org.jboss.messaging.core.persistence.impl.journal.JournalStorageManager;
 import org.jboss.messaging.core.postoffice.PostOffice;
 import org.jboss.messaging.core.postoffice.impl.DuplicateIDCacheImpl;
@@ -67,99 +64,110 @@
 
    // Constructors --------------------------------------------------
 
+   @Override
    protected void tearDown() throws Exception
    {
       super.tearDown();
    }
-   
+
    // Public --------------------------------------------------------
 
    public void testReloadDuplication() throws Exception
    {
 
-      clearData();
-      
-      SimpleString ADDRESS = new SimpleString("address");
+      JournalStorageManager journal = null;
 
-      Configuration configuration = createConfigForJournal();
+      try
+      {
+         clearData();
 
-      configuration.start();
+         SimpleString ADDRESS = new SimpleString("address");
 
-      configuration.setJournalType(JournalType.ASYNCIO);
+         Configuration configuration = createConfigForJournal();
 
-      JournalStorageManager journal = new JournalStorageManager(configuration, Executors.newCachedThreadPool());
+         configuration.start();
 
-      journal.start();
-      journal.loadBindingJournal(new ArrayList<QueueBindingInfo>());
+         configuration.setJournalType(JournalType.ASYNCIO);
 
-      HashMap<SimpleString, List<Pair<byte[], Long>>> mapDups = new HashMap<SimpleString, List<Pair<byte[], Long>>>();
+         journal = new JournalStorageManager(configuration, Executors.newCachedThreadPool());
 
-      journal.loadMessageJournal(new FakePagingManager(),
-                                 new ResourceManagerImpl(0, 0),
-                                 new HashMap<Long, Queue>(),
-                                 mapDups);
-      
-      
-      assertEquals(0, mapDups.size());
+         journal.start();
+         journal.loadBindingJournal(new ArrayList<QueueBindingInfo>());
 
-      DuplicateIDCacheImpl cacheID = new DuplicateIDCacheImpl(ADDRESS, 10, journal, true);
+         HashMap<SimpleString, List<Pair<byte[], Long>>> mapDups = new HashMap<SimpleString, List<Pair<byte[], Long>>>();
 
-      for (int i = 0; i < 100; i++)
-      {
-         cacheID.addToCache(RandomUtil.randomBytes(), null);
-      }
+         journal.loadMessageJournal(new FakePagingManager(),
+                                    new ResourceManagerImpl(0, 0),
+                                    new HashMap<Long, Queue>(),
+                                    mapDups);
 
-      journal.stop();
+         assertEquals(0, mapDups.size());
 
-      journal = new JournalStorageManager(configuration, Executors.newCachedThreadPool());
-      journal.start();
-      journal.loadBindingJournal(new ArrayList<QueueBindingInfo>());
+         DuplicateIDCacheImpl cacheID = new DuplicateIDCacheImpl(ADDRESS, 10, journal, true);
 
-      journal.loadMessageJournal(new FakePagingManager(),
-                                 new ResourceManagerImpl(0, 0),
-                                 new HashMap<Long, Queue>(),
-                                 mapDups);
-      
-      
-      assertEquals(1, mapDups.size());
-      
-      
-      List<Pair<byte[], Long>> values = mapDups.get(ADDRESS); 
-      
-      assertEquals(10, values.size());
-      
-      
-      cacheID = new DuplicateIDCacheImpl(ADDRESS, 10, journal, true);
-      cacheID.load(values);
-      
-      
-      for (int i = 0; i < 100; i++)
-      {
-         cacheID.addToCache(RandomUtil.randomBytes(), null);
-      }
+         for (int i = 0; i < 100; i++)
+         {
+            cacheID.addToCache(RandomUtil.randomBytes(), null);
+         }
 
-      
-      journal.stop();
-      
-      mapDups.clear();
+         journal.stop();
 
-      journal = new JournalStorageManager(configuration, Executors.newCachedThreadPool());
-      journal.start();
-      journal.loadBindingJournal(new ArrayList<QueueBindingInfo>());
+         journal = new JournalStorageManager(configuration, Executors.newCachedThreadPool());
+         journal.start();
+         journal.loadBindingJournal(new ArrayList<QueueBindingInfo>());
 
-      journal.loadMessageJournal(new FakePagingManager(),
-                                 new ResourceManagerImpl(0, 0),
-                                 new HashMap<Long, Queue>(),
-                                 mapDups);
-      
-      
-      assertEquals(1, mapDups.size());
-      
-      
-      values = mapDups.get(ADDRESS); 
-      
-      assertEquals(10, values.size());
+         journal.loadMessageJournal(new FakePagingManager(),
+                                    new ResourceManagerImpl(0, 0),
+                                    new HashMap<Long, Queue>(),
+                                    mapDups);
 
+         assertEquals(1, mapDups.size());
+
+         List<Pair<byte[], Long>> values = mapDups.get(ADDRESS);
+
+         assertEquals(10, values.size());
+
+         cacheID = new DuplicateIDCacheImpl(ADDRESS, 10, journal, true);
+         cacheID.load(values);
+
+         for (int i = 0; i < 100; i++)
+         {
+            cacheID.addToCache(RandomUtil.randomBytes(), null);
+         }
+
+         journal.stop();
+
+         mapDups.clear();
+
+         journal = new JournalStorageManager(configuration, Executors.newCachedThreadPool());
+         journal.start();
+         journal.loadBindingJournal(new ArrayList<QueueBindingInfo>());
+
+         journal.loadMessageJournal(new FakePagingManager(),
+                                    new ResourceManagerImpl(0, 0),
+                                    new HashMap<Long, Queue>(),
+                                    mapDups);
+
+         assertEquals(1, mapDups.size());
+
+         values = mapDups.get(ADDRESS);
+
+         assertEquals(10, values.size());
+      }
+      finally
+      {
+         if (journal != null)
+         {
+            try
+            {
+               journal.stop();
+            }
+            catch (Throwable ignored)
+            {
+            }
+         }
+      }
+
    }
 
    // Package protected ---------------------------------------------