[infinispan-commits] Infinispan SVN: r2329 - branches/4.2.x/core/src/test/java/org/infinispan/test/fwk.

[infinispan-commits at lists.jboss.org]

Author: mircea.markus
Date: 2010-09-06 13:47:30 -0400 (Mon, 06 Sep 2010)
New Revision: 2329

Modified:
   branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
Log:
[ISPN-632] - Testing Framework does not correctly associate an human readable name with a node in a cluster

Modified: branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2010-09-06 13:41:38 UTC (rev 2328)
+++ branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2010-09-06 17:47:30 UTC (rev 2329)
@@ -16,8 +16,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -294,17 +296,16 @@
    }
 
    private static class PerThreadCacheManagers {
-      HashMap<String, EmbeddedCacheManager> cacheManagers = new HashMap<String, EmbeddedCacheManager>();
+      HashMap<EmbeddedCacheManager, String> cacheManagers = new HashMap<EmbeddedCacheManager, String>();
 
       public void checkManagersClosed(String testName) {
-         for (String cmName : cacheManagers.keySet()) {
-            EmbeddedCacheManager cm = cacheManagers.get(cmName);
-            if (cm.getStatus().allowInvocations()) {
+         for (Map.Entry<EmbeddedCacheManager, String> cmEntry : cacheManagers.entrySet()) {
+            if (cmEntry.getKey().getStatus().allowInvocations()) {
                String thName = Thread.currentThread().getName();
                String errorMessage = '\n' +
                      "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +
                      "!!!!!! (" + thName + ") Exiting because " + testName + " has NOT shut down all the cache managers it has started !!!!!!!\n" +
-                     "!!!!!! (" + thName + ") The still-running cacheManager was created here: " + cmName + " !!!!!!!\n" +
+                     "!!!!!! (" + thName + ") The still-running cacheManager was created here: " + cmEntry.getValue() + " !!!!!!!\n" +
                      "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n";
                log.error(errorMessage);
                System.err.println(errorMessage);
@@ -315,7 +316,7 @@
       }
 
       public String getNextCacheName() {
-         int index = cacheManagers.keySet().size();
+         int index = cacheManagers.size();
          char name = (char) ((int)'A' + index);
          StringBuffer result = new StringBuffer(5);
          for (int i = 0; i < 5; i++) {
@@ -325,7 +326,7 @@
       }
 
       public void add(String methodName, DefaultCacheManager cm) {
-         cacheManagers.put(methodName, cm);
+         cacheManagers.put(cm, methodName);
       }
    }
 }