Fixed minor issue with tests in AdminServiceBasicTest. They were not …

…including an appropriate zone list when constructing a cluster.
glinmac · Mar 20, 2013 · 10d57ac · 10d57ac
1 parent b8f93b2
commit 10d57ac
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/src/java/voldemort/cluster/Cluster.java b/src/java/voldemort/cluster/Cluster.java
@@ -74,9 +74,10 @@ public Cluster(String name, List<Node> nodes, List<Zone> zones) {
         } else {
             // Add default zone
             zonesById = new LinkedHashMap<Integer, Zone>(1);
-            zonesById.put(Zone.DEFAULT_ZONE_ID, new Zone());
-            nodesPerZone.put(new Zone(), new ArrayList<Integer>());
-            partitionsPerZone.put(new Zone(), new ArrayList<Integer>());
+            Zone defaultZone = new Zone();
+            zonesById.put(defaultZone.getId(), defaultZone);
+            nodesPerZone.put(defaultZone, new ArrayList<Integer>());
+            partitionsPerZone.put(defaultZone, new ArrayList<Integer>());
         }
 
         this.nodesById = new LinkedHashMap<Integer, Node>(nodes.size());

diff --git a/test/unit/voldemort/client/AdminServiceBasicTest.java b/test/unit/voldemort/client/AdminServiceBasicTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2012 LinkedIn, Inc
+ * Copyright 2008-2013 LinkedIn, Inc
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -288,6 +288,8 @@ public void testAddStore() throws Exception {
 
     @Test
     public void testReplicationMapping() {
+        List<Zone> zones = ServerTestUtils.getZones(2);
+
         List<Node> nodes = Lists.newArrayList();
         nodes.add(new Node(0, "localhost", 1, 2, 3, 0, Lists.newArrayList(0, 4, 8)));
         nodes.add(new Node(1, "localhost", 1, 2, 3, 0, Lists.newArrayList(1, 5, 9)));
@@ -302,7 +304,7 @@ public void testReplicationMapping() {
                                                                1,
                                                                1,
                                                                RoutingStrategyType.CONSISTENT_STRATEGY);
-        Cluster newCluster = new Cluster("single_zone_cluster", nodes);
+        Cluster newCluster = new Cluster("single_zone_cluster", nodes, zones);
 
         try {
             adminClient.helperOps.getReplicationMapping(0, newCluster, storeDef);
@@ -383,7 +385,6 @@ public void testReplicationMapping() {
         }
 
         // Test 2 - With zone routing strategy
-        List<Zone> zones = ServerTestUtils.getZones(2);
         HashMap<Integer, Integer> zoneReplicationFactors = Maps.newHashMap();
         for(int zoneIds = 0; zoneIds < 2; zoneIds++) {
             zoneReplicationFactors.put(zoneIds, 1);
@@ -467,7 +468,7 @@ public void testReplicationMapping() {
                                                1,
                                                1,
                                                RoutingStrategyType.CONSISTENT_STRATEGY);
-        newCluster = new Cluster("single_zone_cluster", nodes);
+        newCluster = new Cluster("single_zone_cluster", nodes, zones);
 
         {
             replicationMapping = adminClient.helperOps.getReplicationMapping(0,
@@ -646,6 +647,8 @@ public void testReplicationMapping() {
 
     @Test
     public void testReplicationMappingWithZonePreference() {
+        List<Zone> zones = ServerTestUtils.getZones(2);
+
         List<Node> nodes = Lists.newArrayList();
         nodes.add(new Node(0, "localhost", 1, 2, 3, 0, Lists.newArrayList(0, 4, 8)));
         nodes.add(new Node(1, "localhost", 1, 2, 3, 0, Lists.newArrayList(1, 5, 9)));
@@ -660,7 +663,7 @@ public void testReplicationMappingWithZonePreference() {
                                                                1,
                                                                1,
                                                                RoutingStrategyType.CONSISTENT_STRATEGY);
-        Cluster newCluster = new Cluster("single_zone_cluster", nodes);
+        Cluster newCluster = new Cluster("single_zone_cluster", nodes, zones);
 
         try {
             adminClient.helperOps.getReplicationMapping(0, newCluster, storeDef, 1);
@@ -675,7 +678,7 @@ public void testReplicationMappingWithZonePreference() {
                                                1,
                                                1,
                                                RoutingStrategyType.CONSISTENT_STRATEGY);
-        newCluster = new Cluster("single_zone_cluster", nodes);
+        newCluster = new Cluster("single_zone_cluster", nodes, zones);
 
         try {
             adminClient.helperOps.getReplicationMapping(0, newCluster, storeDef, 0);
@@ -726,7 +729,6 @@ public void testReplicationMappingWithZonePreference() {
         }
 
         // Test 2 - With zone routing strategy, and zone replication factor 1
-        List<Zone> zones = ServerTestUtils.getZones(2);
         HashMap<Integer, Integer> zoneReplicationFactors = Maps.newHashMap();
         for(int zoneIds = 0; zoneIds < 2; zoneIds++) {
             zoneReplicationFactors.put(zoneIds, 1);