From 4fdeaf24f284a8e4e5691551e72fead6f596023c Mon Sep 17 00:00:00 2001 From: Jay J Wylie Date: Mon, 13 May 2013 11:31:16 -0700 Subject: [PATCH] Remove no-longer needed test from RebalancePartitionsInfoTest; annotated another test as mostly failing.. --- .../client/rebalance/RebalanceBatchPlanTest.java | 1 + .../rebalance/RebalancePartitionsInfoTest.java | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/test/unit/voldemort/client/rebalance/RebalanceBatchPlanTest.java b/test/unit/voldemort/client/rebalance/RebalanceBatchPlanTest.java index 5dfc076796..eec113b94e 100644 --- a/test/unit/voldemort/client/rebalance/RebalanceBatchPlanTest.java +++ b/test/unit/voldemort/client/rebalance/RebalanceBatchPlanTest.java @@ -45,6 +45,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; +// TODO: This suite of tests is known to mostly fail. Sorry. // TODO: This test needs to be mostly re-written. The planning algorithm has // changed and this test focused on the implementation of the prior planning // algorithm, rather than the features of a plan in general. diff --git a/test/unit/voldemort/client/rebalance/RebalancePartitionsInfoTest.java b/test/unit/voldemort/client/rebalance/RebalancePartitionsInfoTest.java index b40cda5154..b454cbfb2c 100644 --- a/test/unit/voldemort/client/rebalance/RebalancePartitionsInfoTest.java +++ b/test/unit/voldemort/client/rebalance/RebalancePartitionsInfoTest.java @@ -1,7 +1,6 @@ package voldemort.client.rebalance; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; import java.util.HashMap; import java.util.List; @@ -29,7 +28,6 @@ public void testRebalancePartitionsInfoCreate() { HashMap> testMap = new HashMap>(); testMap.put(1, Lists.newArrayList(1)); HashMap>> storeTestMap1 = Maps.newHashMap(); - HashMap>> storeTestMap2 = Maps.newHashMap(); // TEST 2 ) With empty maps info = new RebalancePartitionsInfo(0, 1, storeTestMap1, ServerTestUtils.getLocalCluster(1)); @@ -37,19 +35,6 @@ public void testRebalancePartitionsInfoCreate() { info2 = RebalancePartitionsInfo.create(jsonString); assertEquals(info, info2); - // TEST 3 ) With different stores - storeTestMap1.put("test1", testMap); - storeTestMap2.put("test2", testMap); - - try { - info = new RebalancePartitionsInfo(0, - 1, - storeTestMap1, - ServerTestUtils.getLocalCluster(1)); - - fail("Should have thrown an exception"); - } catch(Exception e) {} - // TEST 3 ) With some more replicas testMap.put(3, Lists.newArrayList(1, 3, 5)); info = new RebalancePartitionsInfo(0, 1, storeTestMap1, ServerTestUtils.getLocalCluster(1));