IGNITE-45 - Fixing tests.

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java

@@ -1778,8 +1778,8 @@ else if (rebalanceOrder < 0)
      * @return Validation result or {@code null} in case of success.
      */
     @Nullable private IgniteSpiNodeValidationResult validateHashIdResolvers(ClusterNode node) {
-        for (GridCacheAdapter cache : ctx.cache().internalCaches()) {
-            CacheConfiguration cfg = cache.configuration();
+        for (DynamicCacheDescriptor desc : registeredCaches.values()) {
+            CacheConfiguration cfg = desc.cacheConfiguration();
 
             if (cfg.getAffinity() instanceof CacheRendezvousAffinityFunction) {
                 CacheRendezvousAffinityFunction aff = (CacheRendezvousAffinityFunction)cfg.getAffinity();
@@ -1795,12 +1795,12 @@ else if (rebalanceOrder < 0)
 
                     if (nodeHashObj.hashCode() == topNodeHashObj.hashCode()) {
                         String errMsg = "Failed to add node to topology because it has the same hash code for " +
-                            "partitioned affinity as one of existing nodes [cacheName=" + cache.name() +
+                            "partitioned affinity as one of existing nodes [cacheName=" + cfg.getName() +
                             ", hashIdResolverClass=" + hashIdRslvr.getClass().getName() +
                             ", existingNodeId=" + topNode.id() + ']';
 
                         String sndMsg = "Failed to add node to topology because it has the same hash code for " +
-                            "partitioned affinity as one of existing nodes [cacheName=" + cache.name() +
+                            "partitioned affinity as one of existing nodes [cacheName=" + cfg.getName() +
                             ", hashIdResolverClass=" + hashIdRslvr.getClass().getName() + ", existingNodeId=" +
                             topNode.id() + ']';
 

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java

@@ -76,11 +76,7 @@ public class GridCachePartitionedAffinityHashIdResolverSelfTest extends GridComm
      * @throws Exception If failed.
      */
     public void testDuplicateId() throws Exception {
-        rslvr = new CacheAffinityNodeHashResolver() {
-            @Override public Object resolve(ClusterNode node) {
-                return 1;
-            }
-        };
+        rslvr = new BogusHashResolver();
 
         startGrid(0);
 
@@ -93,4 +89,14 @@ public void testDuplicateId() throws Exception {
         }, IgniteCheckedException.class, "Failed to start manager: GridManagerAdapter [enabled=true, name=" +
             "org.apache.ignite.internal.managers.discovery.GridDiscoveryManager]");
     }
+
+    /**
+     *
+     */
+    private static class BogusHashResolver implements CacheAffinityNodeHashResolver {
+        /** {@inheritDoc} */
+        @Override public Object resolve(ClusterNode node) {
+            return 1;
+        }
+    }
 }