You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by jx...@apache.org on 2018/07/14 00:14:38 UTC
[8/8] helix git commit: Refactor tests to use deleteCluster in test
base class to deduplicate codes.
Refactor tests to use deleteCluster in test base class to deduplicate codes.
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/4385d01a
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/4385d01a
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/4385d01a
Branch: refs/heads/master
Commit: 4385d01a3673efa631d9837507c21ccab9f69be4
Parents: cc9956b
Author: Lei Xia <lx...@linkedin.com>
Authored: Mon Jun 18 10:21:53 2018 -0700
Committer: Lei Xia <lx...@linkedin.com>
Committed: Fri Jul 13 15:57:09 2018 -0700
----------------------------------------------------------------------
.../org/apache/helix/TestHelixConfigAccessor.java | 4 ++--
.../test/java/org/apache/helix/TestHelper.java | 18 ++++++++++++------
.../helix/TestListenerCallbackBatchMode.java | 4 +---
.../helix/TestListenerCallbackPrefetch.java | 4 +---
.../java/org/apache/helix/common/ZkTestBase.java | 10 +---------
.../helix/integration/TestAddClusterV2.java | 2 +-
.../TestAddNodeAfterControllerStart.java | 4 ++--
.../TestAddStateModelFactoryAfterConnect.java | 2 +-
.../helix/integration/TestBucketizedResource.java | 6 +++---
.../integration/TestCarryOverBadCurState.java | 2 +-
.../apache/helix/integration/TestNullReplica.java | 2 +-
.../TestPartitionLevelTransitionConstraint.java | 2 +-
.../integration/TestResetPartitionState.java | 2 +-
.../helix/integration/TestResetResource.java | 2 +-
.../integration/TestResourceGroupEndtoEnd.java | 2 +-
.../TestStartMultipleControllersWithSameName.java | 2 +-
.../integration/TestStateTransitionThrottle.java | 4 ++--
.../integration/TestWeightBasedRebalanceUtil.java | 2 +-
.../helix/integration/TestZkConnectionLost.java | 11 ++---------
.../manager/TestParticipantManager.java | 4 +---
.../integration/messaging/TestBatchMessage.java | 8 ++++----
.../messaging/TestP2PMessageSemiAuto.java | 2 +-
.../paticipant/TestNonOfflineInitState.java | 2 +-
.../paticipant/TestRestartParticipant.java | 2 +-
.../CrushRebalancers/TestCrushAutoRebalance.java | 2 +-
.../TestCrushAutoRebalanceNonRack.java | 2 +-
.../TestDelayedAutoRebalance.java | 2 +-
.../TestPartitionMigrationBase.java | 2 +-
.../rebalancer/TestAutoIsWithEmptyMap.java | 2 +-
...InMaintenanceModeWhenReachingMaxPartition.java | 2 +-
...anceModeWhenReachingOfflineInstancesLimit.java | 2 +-
.../rebalancer/TestMixedModeAutoRebalance.java | 2 +-
.../rebalancer/TestSemiAutoRebalance.java | 2 +-
.../spectator/TestRoutingTableProvider.java | 2 +-
...TestRoutingTableProviderFromCurrentStates.java | 5 +----
.../TestRoutingTableProviderFromTargetEV.java | 5 +----
.../TestRoutingTableProviderPeriodicRefresh.java | 2 +-
.../task/TestGenericTaskAssignmentCalculator.java | 9 ++-------
.../helix/manager/zk/TestHandleNewSession.java | 2 +-
.../helix/manager/zk/TestZKLiveInstanceData.java | 2 +-
.../helix/manager/zk/TestZkClusterManager.java | 6 +++---
.../TestClusterStatusMonitorLifecycle.java | 2 +-
.../org/apache/helix/tools/TestHelixAdminCli.java | 9 +++------
43 files changed, 68 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/TestHelixConfigAccessor.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/TestHelixConfigAccessor.java b/helix-core/src/test/java/org/apache/helix/TestHelixConfigAccessor.java
index 00a49b5..6a7bcca 100644
--- a/helix-core/src/test/java/org/apache/helix/TestHelixConfigAccessor.java
+++ b/helix-core/src/test/java/org/apache/helix/TestHelixConfigAccessor.java
@@ -173,7 +173,7 @@ public class TestHelixConfigAccessor extends ZkUnitTestBase {
// e.printStackTrace();
}
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
}
@@ -212,7 +212,7 @@ public class TestHelixConfigAccessor extends ZkUnitTestBase {
String participantConfigValue = configAccessor.get(participantScope, "participantConfigKey");
Assert.assertEquals(participantConfigValue, "participantConfigValue");
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
}
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/TestHelper.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/TestHelper.java b/helix-core/src/test/java/org/apache/helix/TestHelper.java
index 2b47e94..2f25e30 100644
--- a/helix-core/src/test/java/org/apache/helix/TestHelper.java
+++ b/helix-core/src/test/java/org/apache/helix/TestHelper.java
@@ -287,13 +287,19 @@ public class TestHelper {
}
public static void dropCluster(String clusterName, ZkClient zkClient) throws Exception {
- if (!zkClient.exists("/" + clusterName)) {
- LOG.warn("Cluster does not exist:" + clusterName + ". Deleting it");
- zkClient.deleteRecursively("/" + clusterName);
- }
-
ClusterSetup setupTool = new ClusterSetup(zkClient);
- setupTool.deleteCluster(clusterName);
+ dropCluster(clusterName, zkClient, setupTool);
+ }
+
+ public static void dropCluster(String clusterName, ZkClient zkClient, ClusterSetup setup) {
+ String namespace = "/" + clusterName;
+ if (zkClient.exists(namespace)) {
+ try {
+ setup.deleteCluster(clusterName);
+ } catch (Exception ex) {
+ LOG.error("Failed to delete cluster " + clusterName, ex);
+ }
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/TestListenerCallbackBatchMode.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/TestListenerCallbackBatchMode.java b/helix-core/src/test/java/org/apache/helix/TestListenerCallbackBatchMode.java
index bfe6658..9440af0 100644
--- a/helix-core/src/test/java/org/apache/helix/TestListenerCallbackBatchMode.java
+++ b/helix-core/src/test/java/org/apache/helix/TestListenerCallbackBatchMode.java
@@ -119,9 +119,7 @@ public class TestListenerCallbackBatchMode extends ZkUnitTestBase {
public void afterClass()
throws Exception {
_manager.disconnect();
- if (_gZkClient.exists("/" + clusterName)) {
- _gSetupTool.deleteCluster(clusterName);
- }
+ deleteCluster(clusterName);
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/TestListenerCallbackPrefetch.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/TestListenerCallbackPrefetch.java b/helix-core/src/test/java/org/apache/helix/TestListenerCallbackPrefetch.java
index cc5f256..3ad96ed 100644
--- a/helix-core/src/test/java/org/apache/helix/TestListenerCallbackPrefetch.java
+++ b/helix-core/src/test/java/org/apache/helix/TestListenerCallbackPrefetch.java
@@ -104,9 +104,7 @@ public class TestListenerCallbackPrefetch extends ZkUnitTestBase {
public void afterClass()
throws Exception {
_manager.disconnect();
- if (_gZkClient.exists("/" + clusterName)) {
- _gSetupTool.deleteCluster(clusterName);
- }
+ deleteCluster(clusterName);
}
@Test
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/common/ZkTestBase.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/common/ZkTestBase.java b/helix-core/src/test/java/org/apache/helix/common/ZkTestBase.java
index 41c05c8..189e95c 100644
--- a/helix-core/src/test/java/org/apache/helix/common/ZkTestBase.java
+++ b/helix-core/src/test/java/org/apache/helix/common/ZkTestBase.java
@@ -601,15 +601,7 @@ public class ZkTestBase {
}
protected void deleteCluster(String clusterName) {
- String namespace = "/" + clusterName;
- if (_gZkClient.exists(namespace)) {
- try {
- _gSetupTool.deleteCluster(clusterName);
- } catch (Exception ex) {
- System.err.println("Failed to delete cluster " + clusterName);
- ex.printStackTrace();
- }
- }
+ TestHelper.dropCluster(clusterName, _gZkClient, _gSetupTool);
}
/**
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/TestAddClusterV2.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestAddClusterV2.java b/helix-core/src/test/java/org/apache/helix/integration/TestAddClusterV2.java
index 811ea00..73d3208 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestAddClusterV2.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestAddClusterV2.java
@@ -126,7 +126,7 @@ public class TestAddClusterV2 extends ZkTestBase {
// delete clusters
for (int i = 0; i < CLUSTER_NR; i++) {
String clusterName = CLUSTER_PREFIX + "_" + CLASS_NAME + "_" + i;
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
}
System.out.println("END " + CLASS_NAME + " at " + new Date(System.currentTimeMillis()));
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/TestAddNodeAfterControllerStart.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestAddNodeAfterControllerStart.java b/helix-core/src/test/java/org/apache/helix/integration/TestAddNodeAfterControllerStart.java
index 2b42e04..fd80961 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestAddNodeAfterControllerStart.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestAddNodeAfterControllerStart.java
@@ -87,7 +87,7 @@ public class TestAddNodeAfterControllerStart extends ZkTestBase {
for (int i = 0; i < nodeNr; i++) {
participants[i].syncStop();
}
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
}
@@ -164,7 +164,7 @@ public class TestAddNodeAfterControllerStart extends ZkTestBase {
for (int i = 0; i < nodeNr; i++) {
participants[i].syncStop();
}
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/TestAddStateModelFactoryAfterConnect.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestAddStateModelFactoryAfterConnect.java b/helix-core/src/test/java/org/apache/helix/integration/TestAddStateModelFactoryAfterConnect.java
index 891650c..b36738f 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestAddStateModelFactoryAfterConnect.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestAddStateModelFactoryAfterConnect.java
@@ -129,7 +129,7 @@ public class TestAddStateModelFactoryAfterConnect extends ZkTestBase {
for (int i = 0; i < 5; i++) {
participants[i].syncStop();
}
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/TestBucketizedResource.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestBucketizedResource.java b/helix-core/src/test/java/org/apache/helix/integration/TestBucketizedResource.java
index 16f9d12..314c5bc 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestBucketizedResource.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestBucketizedResource.java
@@ -117,7 +117,7 @@ public class TestBucketizedResource extends ZkTestBase {
for (int i = 0; i < n; i++) {
participants[i].syncStop();
}
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
}
@Test
@@ -185,7 +185,7 @@ public class TestBucketizedResource extends ZkTestBase {
for (MockParticipantManager participant : participants) {
participant.syncStop();
}
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
}
class TestExternalViewListener implements ExternalViewChangeListener {
@@ -272,6 +272,6 @@ public class TestBucketizedResource extends ZkTestBase {
for (MockParticipantManager participant : participants) {
participant.syncStop();
}
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
}
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/TestCarryOverBadCurState.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestCarryOverBadCurState.java b/helix-core/src/test/java/org/apache/helix/integration/TestCarryOverBadCurState.java
index eae7333..dd2ca3d 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestCarryOverBadCurState.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestCarryOverBadCurState.java
@@ -82,7 +82,7 @@ public class TestCarryOverBadCurState extends ZkTestBase {
for (int i = 0; i < 5; i++) {
participants[i].syncStop();
}
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END testCarryOverBadCurState at " + new Date(System.currentTimeMillis()));
}
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/TestNullReplica.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestNullReplica.java b/helix-core/src/test/java/org/apache/helix/integration/TestNullReplica.java
index 75153df..fb13558 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestNullReplica.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestNullReplica.java
@@ -81,7 +81,7 @@ public class TestNullReplica extends ZkTestBase {
for (int i = 0; i < 5; i++) {
participants[i].syncStop();
}
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/TestPartitionLevelTransitionConstraint.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestPartitionLevelTransitionConstraint.java b/helix-core/src/test/java/org/apache/helix/integration/TestPartitionLevelTransitionConstraint.java
index f762e15..1dbaadb 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestPartitionLevelTransitionConstraint.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestPartitionLevelTransitionConstraint.java
@@ -196,7 +196,7 @@ public class TestPartitionLevelTransitionConstraint extends ZkTestBase {
for (int i = 0; i < n; i++) {
participants[i].syncStop();
}
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/TestResetPartitionState.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestResetPartitionState.java b/helix-core/src/test/java/org/apache/helix/integration/TestResetPartitionState.java
index c2b2e67..06fbdd4 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestResetPartitionState.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestResetPartitionState.java
@@ -174,7 +174,7 @@ public class TestResetPartitionState extends ZkTestBase {
for (int i = 0; i < 5; i++) {
participants[i].syncStop();
}
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/TestResetResource.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestResetResource.java b/helix-core/src/test/java/org/apache/helix/integration/TestResetResource.java
index c71406e..3d39880 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestResetResource.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestResetResource.java
@@ -105,7 +105,7 @@ public class TestResetResource extends ZkTestBase {
for (int i = 0; i < 5; i++) {
participants[i].syncStop();
}
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/TestResourceGroupEndtoEnd.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestResourceGroupEndtoEnd.java b/helix-core/src/test/java/org/apache/helix/integration/TestResourceGroupEndtoEnd.java
index 88f9c7e..d3f447a 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestResourceGroupEndtoEnd.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestResourceGroupEndtoEnd.java
@@ -139,7 +139,7 @@ public class TestResourceGroupEndtoEnd extends ZkTestBase {
_controller.syncStop();
_spectator.disconnect();
_routingTableProvider.shutdown();
- _gSetupTool.deleteCluster(CLUSTER_NAME);
+ deleteCluster(CLUSTER_NAME);
}
private void addInstanceGroup(String clusterName, String instanceTag, int numInstance) {
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/TestStartMultipleControllersWithSameName.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestStartMultipleControllersWithSameName.java b/helix-core/src/test/java/org/apache/helix/integration/TestStartMultipleControllersWithSameName.java
index 9ddbbc6..a412dd0 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestStartMultipleControllersWithSameName.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestStartMultipleControllersWithSameName.java
@@ -66,7 +66,7 @@ public class TestStartMultipleControllersWithSameName extends ZkTestBase {
for (int i = 0; i < 4; i++) {
controllers[i].syncStop();
}
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionThrottle.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionThrottle.java b/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionThrottle.java
index 96874be..216d951 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionThrottle.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionThrottle.java
@@ -111,7 +111,7 @@ public class TestStateTransitionThrottle extends ZkTestBase {
for (int i = 0; i < participantCount; i++) {
participants[i].syncStop();
}
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
}
@@ -187,7 +187,7 @@ public class TestStateTransitionThrottle extends ZkTestBase {
for (int i = 0; i < participantCount; i++) {
participants[i].syncStop();
}
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/TestWeightBasedRebalanceUtil.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestWeightBasedRebalanceUtil.java b/helix-core/src/test/java/org/apache/helix/integration/TestWeightBasedRebalanceUtil.java
index fd31ba3..95a3f8a 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestWeightBasedRebalanceUtil.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestWeightBasedRebalanceUtil.java
@@ -93,7 +93,7 @@ public class TestWeightBasedRebalanceUtil extends ZkTestBase {
@AfterClass
public void afterClass() {
- _gSetupTool.deleteCluster(CLUSTER_NAME);
+ deleteCluster(CLUSTER_NAME);
}
private void setupMockCluster() {
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/TestZkConnectionLost.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestZkConnectionLost.java b/helix-core/src/test/java/org/apache/helix/integration/TestZkConnectionLost.java
index 2769a9f..282b9f1 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestZkConnectionLost.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestZkConnectionLost.java
@@ -75,16 +75,9 @@ public class TestZkConnectionLost extends TaskTestBase {
_manager.disconnect();
}
stopParticipants();
+
+ TestHelper.dropCluster(CLUSTER_NAME, _zkClient, _setupTool);
- String namespace = "/" + CLUSTER_NAME;
- if (_zkClient.exists(namespace)) {
- try {
- _setupTool.deleteCluster(CLUSTER_NAME);
- } catch (Exception ex) {
- System.err.println(
- "Failed to delete cluster " + CLUSTER_NAME + ", error: " + ex.getLocalizedMessage());
- }
- }
_zkClient.close();
TestHelper.stopZkServer(_zkServerRef.get());
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/manager/TestParticipantManager.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/TestParticipantManager.java b/helix-core/src/test/java/org/apache/helix/integration/manager/TestParticipantManager.java
index 3588366..6045b0d 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/TestParticipantManager.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/TestParticipantManager.java
@@ -57,9 +57,7 @@ public class TestParticipantManager extends ZkTestBase {
@AfterMethod
public void afterMethod(Method testMethod, ITestContext testContext) {
- if (_gZkClient.exists("/" + clusterName)) {
- _gSetupTool.deleteCluster(clusterName);
- }
+ deleteCluster(clusterName);
super.endTest(testMethod, testContext);
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessage.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessage.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessage.java
index db9d214..52a4a9e 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessage.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessage.java
@@ -116,7 +116,7 @@ public class TestBatchMessage extends ZkTestBase {
for (int i = 0; i < n; i++) {
participants[i].syncStop();
}
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
}
@@ -199,7 +199,7 @@ public class TestBatchMessage extends ZkTestBase {
for (int i = 0; i < n; i++) {
participants[i].syncStop();
}
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
}
@@ -276,7 +276,7 @@ public class TestBatchMessage extends ZkTestBase {
for (int i = 0; i < 5; i++) {
participants[i].syncStop();
}
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
}
@@ -358,7 +358,7 @@ public class TestBatchMessage extends ZkTestBase {
for (int i = 0; i < n; i++) {
participants[i].syncStop();
}
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PMessageSemiAuto.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PMessageSemiAuto.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PMessageSemiAuto.java
index 0a9ee55..551ea78 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PMessageSemiAuto.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PMessageSemiAuto.java
@@ -115,7 +115,7 @@ public class TestP2PMessageSemiAuto extends ZkTestBase {
p.syncStop();
}
}
- _gSetupTool.deleteCluster(CLUSTER_NAME);
+ deleteCluster(CLUSTER_NAME);
System.out.println("END " + CLASS_NAME + " at " + new Date(System.currentTimeMillis()));
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestNonOfflineInitState.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestNonOfflineInitState.java b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestNonOfflineInitState.java
index fcaa19f..952032c 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestNonOfflineInitState.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestNonOfflineInitState.java
@@ -79,7 +79,7 @@ public class TestNonOfflineInitState extends ZkTestBase {
for (int i = 0; i < 5; i++) {
participants[i].syncStop();
}
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END testNonOfflineInitState at " + new Date(System.currentTimeMillis()));
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestRestartParticipant.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestRestartParticipant.java b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestRestartParticipant.java
index b93397a..1ba1357 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestRestartParticipant.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestRestartParticipant.java
@@ -110,7 +110,7 @@ public class TestRestartParticipant extends ZkTestBase {
participants[i].syncStop();
}
participant.syncStop();
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("START testRestartParticipant at " + new Date(System.currentTimeMillis()));
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalance.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalance.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalance.java
index 83d1bbf..1fe333b 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalance.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalance.java
@@ -305,7 +305,7 @@ public class TestCrushAutoRebalance extends ZkTestBase {
p.syncStop();
}
}
- _gSetupTool.deleteCluster(CLUSTER_NAME);
+ deleteCluster(CLUSTER_NAME);
System.out.println("END " + CLASS_NAME + " at " + new Date(System.currentTimeMillis()));
}
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceNonRack.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceNonRack.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceNonRack.java
index 5576fcc..dbcb924 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceNonRack.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceNonRack.java
@@ -117,7 +117,7 @@ public class TestCrushAutoRebalanceNonRack extends ZkStandAloneCMTestBase {
p.syncStop();
}
}
- _gSetupTool.deleteCluster(CLUSTER_NAME);
+ deleteCluster(CLUSTER_NAME);
super.afterClass();
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalance.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalance.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalance.java
index 4a89230..7d41451 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalance.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalance.java
@@ -329,7 +329,7 @@ public class TestDelayedAutoRebalance extends ZkTestBase {
for (MockParticipantManager participant : _participants) {
participant.syncStop();
}
- _gSetupTool.deleteCluster(CLUSTER_NAME);
+ deleteCluster(CLUSTER_NAME);
System.out.println("END " + CLASS_NAME + " at " + new Date(System.currentTimeMillis()));
}
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestPartitionMigrationBase.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestPartitionMigrationBase.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestPartitionMigrationBase.java
index 8398efc..7a559a5 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestPartitionMigrationBase.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestPartitionMigrationBase.java
@@ -253,7 +253,7 @@ public class TestPartitionMigrationBase extends ZkTestBase {
participant.syncStop();
}
_manager.disconnect();
- _gSetupTool.deleteCluster(CLUSTER_NAME);
+ deleteCluster(CLUSTER_NAME);
System.out.println("END " + CLASS_NAME + " at " + new Date(System.currentTimeMillis()));
}
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoIsWithEmptyMap.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoIsWithEmptyMap.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoIsWithEmptyMap.java
index 0181139..0697426 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoIsWithEmptyMap.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoIsWithEmptyMap.java
@@ -96,7 +96,7 @@ public class TestAutoIsWithEmptyMap extends ZkTestBase {
for (int i = 0; i < 5; i++) {
participants[i].syncStop();
}
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingMaxPartition.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingMaxPartition.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingMaxPartition.java
index 85454e0..9257ae3 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingMaxPartition.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingMaxPartition.java
@@ -129,7 +129,7 @@ public class TestClusterInMaintenanceModeWhenReachingMaxPartition extends ZkTest
participant.syncStop();
}
}
- _gSetupTool.deleteCluster(CLUSTER_NAME);
+ deleteCluster(CLUSTER_NAME);
System.out.println("END " + CLASS_NAME + " at " + new Date(System.currentTimeMillis()));
}
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingOfflineInstancesLimit.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingOfflineInstancesLimit.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingOfflineInstancesLimit.java
index 902effa..c89505b 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingOfflineInstancesLimit.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingOfflineInstancesLimit.java
@@ -189,7 +189,7 @@ public class TestClusterInMaintenanceModeWhenReachingOfflineInstancesLimit
participant.syncStop();
}
}
- _gSetupTool.deleteCluster(CLUSTER_NAME);
+ deleteCluster(CLUSTER_NAME);
System.out.println("END " + CLASS_NAME + " at " + new Date(System.currentTimeMillis()));
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestMixedModeAutoRebalance.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestMixedModeAutoRebalance.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestMixedModeAutoRebalance.java
index 29efdee..a31229a 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestMixedModeAutoRebalance.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestMixedModeAutoRebalance.java
@@ -255,7 +255,7 @@ public class TestMixedModeAutoRebalance extends ZkTestBase {
for (MockParticipantManager participant : _participants) {
participant.syncStop();
}
- _gSetupTool.deleteCluster(CLUSTER_NAME);
+ deleteCluster(CLUSTER_NAME);
System.out.println("END " + CLASS_NAME + " at " + new Date(System.currentTimeMillis()));
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestSemiAutoRebalance.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestSemiAutoRebalance.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestSemiAutoRebalance.java
index b979bbe..ac4a951 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestSemiAutoRebalance.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestSemiAutoRebalance.java
@@ -129,7 +129,7 @@ public class TestSemiAutoRebalance extends ZkTestBase {
p.syncStop();
}
}
- _gSetupTool.deleteCluster(CLUSTER_NAME);
+ deleteCluster(CLUSTER_NAME);
System.out.println("END " + CLASS_NAME + " at " + new Date(System.currentTimeMillis()));
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProvider.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProvider.java b/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProvider.java
index 231f68d..dbe621c 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProvider.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProvider.java
@@ -125,7 +125,7 @@ public class TestRoutingTableProvider extends ZkTestBase {
_routingTableProvider.shutdown();
_routingTableProvider2.shutdown();
_spectator.disconnect();
- _gSetupTool.deleteCluster(CLUSTER_NAME);
+ deleteCluster(CLUSTER_NAME);
}
@Test
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderFromCurrentStates.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderFromCurrentStates.java b/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderFromCurrentStates.java
index e952e36..219b753 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderFromCurrentStates.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderFromCurrentStates.java
@@ -79,10 +79,7 @@ public class TestRoutingTableProviderFromCurrentStates extends ZkTestBase {
_manager.disconnect();
}
- String namespace = "/" + CLUSTER_NAME;
- if (_gZkClient.exists(namespace)) {
- _gSetupTool.deleteCluster(CLUSTER_NAME);
- }
+ deleteCluster(CLUSTER_NAME);
}
@Test
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderFromTargetEV.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderFromTargetEV.java b/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderFromTargetEV.java
index 3d23e30..da6e2f8 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderFromTargetEV.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderFromTargetEV.java
@@ -89,10 +89,7 @@ public class TestRoutingTableProviderFromTargetEV extends ZkTestBase {
_manager.disconnect();
}
- String namespace = "/" + CLUSTER_NAME;
- if (_gZkClient.exists(namespace)) {
- _gSetupTool.deleteCluster(CLUSTER_NAME);
- }
+ deleteCluster(CLUSTER_NAME);
}
@Test (expectedExceptions = HelixException.class)
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderPeriodicRefresh.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderPeriodicRefresh.java b/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderPeriodicRefresh.java
index 223a4d6..c78b8e6 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderPeriodicRefresh.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderPeriodicRefresh.java
@@ -129,7 +129,7 @@ public class TestRoutingTableProviderPeriodicRefresh extends ZkTestBase {
_spectator.disconnect();
_spectator_2.disconnect();
_spectator_3.disconnect();
- _gSetupTool.deleteCluster(CLUSTER_NAME);
+ deleteCluster(CLUSTER_NAME);
}
public class MockRoutingTableProvider extends RoutingTableProvider {
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/integration/task/TestGenericTaskAssignmentCalculator.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestGenericTaskAssignmentCalculator.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestGenericTaskAssignmentCalculator.java
index d05c088..57fb3a3 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestGenericTaskAssignmentCalculator.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestGenericTaskAssignmentCalculator.java
@@ -57,17 +57,12 @@ public class TestGenericTaskAssignmentCalculator extends TaskTestBase {
@BeforeClass
public void beforeClass() throws Exception {
_participants = new MockParticipantManager[_numNodes];
- String namespace = "/" + CLUSTER_NAME;
- if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursively(namespace);
- }
// Setup cluster and instances
- ClusterSetup setupTool = new ClusterSetup(ZK_ADDR);
- setupTool.addCluster(CLUSTER_NAME, true);
+ _gSetupTool.addCluster(CLUSTER_NAME, true);
for (int i = 0; i < _numNodes; i++) {
String storageNodeName = PARTICIPANT_PREFIX + "_" + (_startPort + i);
- setupTool.addInstanceToCluster(CLUSTER_NAME, storageNodeName);
+ _gSetupTool.addInstanceToCluster(CLUSTER_NAME, storageNodeName);
}
// start dummy participants
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/manager/zk/TestHandleNewSession.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestHandleNewSession.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestHandleNewSession.java
index 3060c42..d3b24d5 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestHandleNewSession.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestHandleNewSession.java
@@ -71,7 +71,7 @@ public class TestHandleNewSession extends ZkTestBase {
// Logger.getRootLogger().setLevel(Level.INFO);
System.out.println("Disconnecting ...");
participant.syncStop();
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKLiveInstanceData.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKLiveInstanceData.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKLiveInstanceData.java
index 2b75707..717528f 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKLiveInstanceData.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKLiveInstanceData.java
@@ -113,7 +113,7 @@ public class TestZKLiveInstanceData extends ZkUnitTestBase {
@AfterClass()
public void afterClass() throws Exception {
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
}
private String[] getArgs(String... args) {
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClusterManager.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClusterManager.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClusterManager.java
index 5272ea7..9445312 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClusterManager.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClusterManager.java
@@ -109,7 +109,7 @@ public class TestZkClusterManager extends ZkUnitTestBase {
controller.disconnect();
AssertJUnit.assertFalse(controller.isConnected());
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END " + className + ".testController() at "
+ new Date(System.currentTimeMillis()));
@@ -225,7 +225,7 @@ public class TestZkClusterManager extends ZkUnitTestBase {
manager.disconnect();
manager2.disconnect();
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END " + className + ".testLiveInstanceInfoProvider() at "
+ new Date(System.currentTimeMillis()));
@@ -268,7 +268,7 @@ public class TestZkClusterManager extends ZkUnitTestBase {
admin.disconnect();
AssertJUnit.assertFalse(admin.isConnected());
- _gSetupTool.deleteCluster(clusterName);
+ deleteCluster(clusterName);
System.out.println("END " + className + ".testAdministrator() at "
+ new Date(System.currentTimeMillis()));
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java b/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java
index aa308e7..220d215 100644
--- a/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java
+++ b/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java
@@ -161,7 +161,7 @@ public class TestClusterStatusMonitorLifecycle extends ZkTestBase {
}
}
cleanupControllers();
- _gSetupTool.deleteCluster(_controllerClusterName);
+ deleteCluster(_controllerClusterName);
for (String cluster : _clusters) {
TestHelper.dropCluster(cluster, _gZkClient);
http://git-wip-us.apache.org/repos/asf/helix/blob/4385d01a/helix-core/src/test/java/org/apache/helix/tools/TestHelixAdminCli.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/tools/TestHelixAdminCli.java b/helix-core/src/test/java/org/apache/helix/tools/TestHelixAdminCli.java
index 07be097..afd24e3 100644
--- a/helix-core/src/test/java/org/apache/helix/tools/TestHelixAdminCli.java
+++ b/helix-core/src/test/java/org/apache/helix/tools/TestHelixAdminCli.java
@@ -53,12 +53,9 @@ public class TestHelixAdminCli extends ZkTestBase {
@AfterMethod
public void endTest(Method testMethod, ITestContext testContext) {
- if (_gZkClient.exists("/" + clusterName)) {
- _gSetupTool.deleteCluster(clusterName);
- }
- if (_gZkClient.exists("/" + grandClusterName)) {
- _gSetupTool.deleteCluster(grandClusterName);
- }
+ deleteCluster(clusterName);
+ deleteCluster(grandClusterName);
+
super.endTest(testMethod, testContext);
}