http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/integration/TestResourceWithSamePartitionKey.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestResourceWithSamePartitionKey.java b/helix-core/src/test/java/org/apache/helix/integration/TestResourceWithSamePartitionKey.java index e0a85ef..75bfc43 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/TestResourceWithSamePartitionKey.java +++ b/helix-core/src/test/java/org/apache/helix/integration/TestResourceWithSamePartitionKey.java @@ -33,7 +33,7 @@ import org.apache.helix.manager.zk.ZKHelixDataAccessor; import org.apache.helix.manager.zk.ZkBaseDataAccessor; import org.apache.helix.model.IdealState; import org.apache.helix.model.IdealState.RebalanceMode; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; import org.testng.Assert; import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/integration/TestRestartParticipant.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestRestartParticipant.java b/helix-core/src/test/java/org/apache/helix/integration/TestRestartParticipant.java index e6733ce..392ecc9 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/TestRestartParticipant.java +++ b/helix-core/src/test/java/org/apache/helix/integration/TestRestartParticipant.java @@ -28,8 +28,8 @@ import org.apache.helix.integration.manager.ClusterControllerManager; import org.apache.helix.integration.manager.MockParticipantManager; import org.apache.helix.mock.participant.MockTransition; import org.apache.helix.model.Message; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier.BestPossAndExtViewZkVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier.BestPossAndExtViewZkVerifier; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/integration/TestSchemataSM.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestSchemataSM.java b/helix-core/src/test/java/org/apache/helix/integration/TestSchemataSM.java index 4a95414..4a82500 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/TestSchemataSM.java +++ b/helix-core/src/test/java/org/apache/helix/integration/TestSchemataSM.java @@ -23,7 +23,6 @@ import java.util.Arrays; import java.util.Date; import java.util.Map; -import org.apache.helix.HelixConstants; import org.apache.helix.PropertyKey; import org.apache.helix.TestHelper; import org.apache.helix.ZNRecord; @@ -33,8 +32,8 @@ import org.apache.helix.manager.zk.ZKHelixDataAccessor; import org.apache.helix.manager.zk.ZkBaseDataAccessor; import org.apache.helix.model.ExternalView; import org.apache.helix.model.IdealState; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier.BestPossAndExtViewZkVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier.BestPossAndExtViewZkVerifier; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/integration/TestSessionExpiryInTransition.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestSessionExpiryInTransition.java b/helix-core/src/test/java/org/apache/helix/integration/TestSessionExpiryInTransition.java index c1c0ab9..2ba56cb 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/TestSessionExpiryInTransition.java +++ b/helix-core/src/test/java/org/apache/helix/integration/TestSessionExpiryInTransition.java @@ -29,8 +29,8 @@ import org.apache.helix.integration.manager.ClusterControllerManager; import org.apache.helix.integration.manager.MockParticipantManager; import org.apache.helix.mock.participant.MockTransition; import org.apache.helix.model.Message; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier.BestPossAndExtViewZkVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier.BestPossAndExtViewZkVerifier; import org.apache.log4j.Logger; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/integration/TestStandAloneCMMain.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestStandAloneCMMain.java b/helix-core/src/test/java/org/apache/helix/integration/TestStandAloneCMMain.java index 2e07c8a..d64dff0 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/TestStandAloneCMMain.java +++ b/helix-core/src/test/java/org/apache/helix/integration/TestStandAloneCMMain.java @@ -30,7 +30,7 @@ import org.apache.helix.integration.manager.ClusterControllerManager; import org.apache.helix.manager.zk.ZKHelixDataAccessor; import org.apache.helix.manager.zk.ZkBaseDataAccessor; import org.apache.helix.model.LiveInstance; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; import org.apache.log4j.Logger; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/integration/TestStandAloneCMSessionExpiry.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestStandAloneCMSessionExpiry.java b/helix-core/src/test/java/org/apache/helix/integration/TestStandAloneCMSessionExpiry.java index cc63176..f94b2e9 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/TestStandAloneCMSessionExpiry.java +++ b/helix-core/src/test/java/org/apache/helix/integration/TestStandAloneCMSessionExpiry.java @@ -26,7 +26,7 @@ import org.apache.helix.ZkTestHelper; import org.apache.helix.integration.manager.ClusterControllerManager; import org.apache.helix.integration.manager.MockParticipantManager; import org.apache.helix.tools.ClusterSetup; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; import org.apache.log4j.Logger; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionTimeout.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionTimeout.java b/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionTimeout.java index b1b3031..7b51f74 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionTimeout.java +++ b/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionTimeout.java @@ -43,8 +43,8 @@ import org.apache.helix.participant.statemachine.StateModelInfo; import org.apache.helix.participant.statemachine.StateTransitionError; import org.apache.helix.participant.statemachine.Transition; import org.apache.helix.tools.ClusterSetup; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier.MasterNbInExtViewVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier.MasterNbInExtViewVerifier; import org.apache.log4j.Logger; import org.testng.Assert; import org.testng.annotations.BeforeClass; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionTimeoutWithResource.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionTimeoutWithResource.java b/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionTimeoutWithResource.java index 0eeedd5..1599133 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionTimeoutWithResource.java +++ b/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionTimeoutWithResource.java @@ -50,7 +50,7 @@ import org.apache.helix.participant.statemachine.StateModelInfo; import org.apache.helix.participant.statemachine.StateTransitionError; import org.apache.helix.participant.statemachine.Transition; import org.apache.helix.tools.ClusterSetup; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; import org.apache.log4j.Logger; import org.testng.Assert; import org.testng.annotations.BeforeClass; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/integration/TestSwapInstance.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestSwapInstance.java b/helix-core/src/test/java/org/apache/helix/integration/TestSwapInstance.java index 523feb5..965a0d9 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/TestSwapInstance.java +++ b/helix-core/src/test/java/org/apache/helix/integration/TestSwapInstance.java @@ -25,7 +25,7 @@ import org.apache.helix.ZNRecord; import org.apache.helix.integration.manager.MockParticipantManager; import org.apache.helix.manager.zk.ZKHelixAdmin; import org.apache.helix.model.IdealState; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/integration/TestZkCallbackHandlerLeak.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestZkCallbackHandlerLeak.java b/helix-core/src/test/java/org/apache/helix/integration/TestZkCallbackHandlerLeak.java index 10c468f..907ee31 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/TestZkCallbackHandlerLeak.java +++ b/helix-core/src/test/java/org/apache/helix/integration/TestZkCallbackHandlerLeak.java @@ -33,7 +33,7 @@ import org.apache.helix.integration.manager.ZkTestManager; import org.apache.helix.manager.zk.CallbackHandler; import org.apache.helix.manager.zk.ZkClient; import org.apache.helix.model.CurrentState; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/integration/TestZkReconnect.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestZkReconnect.java b/helix-core/src/test/java/org/apache/helix/integration/TestZkReconnect.java index 51326ae..3475049 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/TestZkReconnect.java +++ b/helix-core/src/test/java/org/apache/helix/integration/TestZkReconnect.java @@ -36,8 +36,8 @@ import org.apache.helix.model.Message; import org.apache.helix.participant.statemachine.StateModel; import org.apache.helix.participant.statemachine.StateModelFactory; import org.apache.helix.tools.ClusterSetup; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier.BestPossAndExtViewZkVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier.BestPossAndExtViewZkVerifier; import org.apache.log4j.Logger; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/integration/TestZkSessionExpiry.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestZkSessionExpiry.java b/helix-core/src/test/java/org/apache/helix/integration/TestZkSessionExpiry.java index e67c06d..f027422 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/TestZkSessionExpiry.java +++ b/helix-core/src/test/java/org/apache/helix/integration/TestZkSessionExpiry.java @@ -37,7 +37,7 @@ import org.apache.helix.messaging.handling.HelixTaskResult; import org.apache.helix.messaging.handling.MessageHandler; import org.apache.helix.messaging.handling.MessageHandlerFactory; import org.apache.helix.model.Message; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/integration/ZkStandAloneCMTestBase.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/ZkStandAloneCMTestBase.java b/helix-core/src/test/java/org/apache/helix/integration/ZkStandAloneCMTestBase.java index d0609ac..bec6003 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/ZkStandAloneCMTestBase.java +++ b/helix-core/src/test/java/org/apache/helix/integration/ZkStandAloneCMTestBase.java @@ -27,9 +27,9 @@ import org.apache.helix.InstanceType; import org.apache.helix.integration.manager.ClusterControllerManager; import org.apache.helix.integration.manager.MockParticipantManager; import org.apache.helix.tools.ClusterSetup; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier.BestPossAndExtViewZkVerifier; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier.MasterNbInExtViewVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier.BestPossAndExtViewZkVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier.MasterNbInExtViewVerifier; import org.apache.log4j.Logger; import org.testng.Assert; import org.testng.annotations.AfterClass; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/integration/manager/TestConsecutiveZkSessionExpiry.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/TestConsecutiveZkSessionExpiry.java b/helix-core/src/test/java/org/apache/helix/integration/manager/TestConsecutiveZkSessionExpiry.java index 2ffe516..7ffe520 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/manager/TestConsecutiveZkSessionExpiry.java +++ b/helix-core/src/test/java/org/apache/helix/integration/manager/TestConsecutiveZkSessionExpiry.java @@ -35,8 +35,8 @@ import org.apache.helix.manager.zk.ZKHelixDataAccessor; import org.apache.helix.manager.zk.ZkBaseDataAccessor; import org.apache.helix.mock.participant.MockMSModelFactory; import org.apache.helix.model.LiveInstance; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier.BestPossAndExtViewZkVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier.BestPossAndExtViewZkVerifier; import org.apache.log4j.Logger; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/integration/manager/TestControllerManager.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/TestControllerManager.java b/helix-core/src/test/java/org/apache/helix/integration/manager/TestControllerManager.java index 4ee8817..0203348 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/manager/TestControllerManager.java +++ b/helix-core/src/test/java/org/apache/helix/integration/manager/TestControllerManager.java @@ -25,8 +25,8 @@ import java.util.concurrent.TimeUnit; import org.apache.helix.TestHelper; import org.apache.helix.ZkTestHelper; import org.apache.helix.ZkUnitTestBase; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier.BestPossAndExtViewZkVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier.BestPossAndExtViewZkVerifier; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/integration/manager/TestDistributedControllerManager.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/TestDistributedControllerManager.java b/helix-core/src/test/java/org/apache/helix/integration/manager/TestDistributedControllerManager.java index 5fd6d7a..9604c7a 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/manager/TestDistributedControllerManager.java +++ b/helix-core/src/test/java/org/apache/helix/integration/manager/TestDistributedControllerManager.java @@ -35,8 +35,8 @@ import org.apache.helix.manager.zk.ZKHelixManager; import org.apache.helix.manager.zk.ZkBaseDataAccessor; import org.apache.helix.mock.participant.MockMSModelFactory; import org.apache.helix.model.LiveInstance; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier.BestPossAndExtViewZkVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier.BestPossAndExtViewZkVerifier; import org.apache.log4j.Logger; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/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 e7f5d76..0f3ee63 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 @@ -41,8 +41,8 @@ import org.apache.helix.manager.zk.ZkBaseDataAccessor; import org.apache.helix.mock.participant.MockMSModelFactory; import org.apache.helix.mock.participant.MockTransition; import org.apache.helix.model.Message; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier.BestPossAndExtViewZkVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier.BestPossAndExtViewZkVerifier; import org.apache.log4j.Logger; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/integration/manager/TestStateModelLeak.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/TestStateModelLeak.java b/helix-core/src/test/java/org/apache/helix/integration/manager/TestStateModelLeak.java index ac77274..a74021a 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/manager/TestStateModelLeak.java +++ b/helix-core/src/test/java/org/apache/helix/integration/manager/TestStateModelLeak.java @@ -34,8 +34,8 @@ import org.apache.helix.mock.participant.ErrTransition; import org.apache.helix.participant.HelixStateMachineEngine; import org.apache.helix.participant.statemachine.StateModel; import org.apache.helix.participant.statemachine.StateModelFactory; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier.BestPossAndExtViewZkVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier.BestPossAndExtViewZkVerifier; import org.apache.log4j.Logger; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/integration/manager/TestZkCallbackHandlerLeak.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/TestZkCallbackHandlerLeak.java b/helix-core/src/test/java/org/apache/helix/integration/manager/TestZkCallbackHandlerLeak.java index 68703bd..61e78f0 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/manager/TestZkCallbackHandlerLeak.java +++ b/helix-core/src/test/java/org/apache/helix/integration/manager/TestZkCallbackHandlerLeak.java @@ -33,7 +33,7 @@ import org.apache.helix.TestHelper; import org.apache.helix.ZkTestHelper; import org.apache.helix.ZkUnitTestBase; import org.apache.helix.model.CurrentState; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; import org.apache.log4j.Logger; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/integration/task/TaskTestBase.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TaskTestBase.java b/helix-core/src/test/java/org/apache/helix/integration/task/TaskTestBase.java index 137d990..0d0f763 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/task/TaskTestBase.java +++ b/helix-core/src/test/java/org/apache/helix/integration/task/TaskTestBase.java @@ -22,7 +22,7 @@ package org.apache.helix.integration.task; import org.apache.helix.integration.manager.ClusterControllerManager; import org.apache.helix.task.TaskSynchronizedTestBase; import org.apache.helix.tools.ClusterSetup; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerStopResume.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerStopResume.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerStopResume.java index 2b0d38c..d5425fc 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerStopResume.java +++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerStopResume.java @@ -44,7 +44,7 @@ import org.apache.helix.task.TaskUtil; import org.apache.helix.task.Workflow; import org.apache.helix.task.WorkflowConfig; import org.apache.helix.task.WorkflowContext; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; import org.apache.log4j.Logger; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/manager/zk/TestLiveInstanceBounce.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestLiveInstanceBounce.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestLiveInstanceBounce.java index 18bd137..7fb9746 100644 --- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestLiveInstanceBounce.java +++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestLiveInstanceBounce.java @@ -21,7 +21,7 @@ package org.apache.helix.manager.zk; import org.apache.helix.integration.ZkStandAloneCMTestBase; import org.apache.helix.integration.manager.MockParticipantManager; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/messaging/handling/TestResourceThreadpoolSize.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/messaging/handling/TestResourceThreadpoolSize.java b/helix-core/src/test/java/org/apache/helix/messaging/handling/TestResourceThreadpoolSize.java index 2fff872..33f1c55 100644 --- a/helix-core/src/test/java/org/apache/helix/messaging/handling/TestResourceThreadpoolSize.java +++ b/helix-core/src/test/java/org/apache/helix/messaging/handling/TestResourceThreadpoolSize.java @@ -34,7 +34,7 @@ import org.apache.helix.messaging.DefaultMessagingService; import org.apache.helix.model.Message.MessageType; import org.apache.helix.model.builder.FullAutoModeISBuilder; import org.apache.helix.model.builder.HelixConfigScopeBuilder; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/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 fcdb4aa..735325f 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 @@ -35,8 +35,8 @@ import org.apache.helix.integration.manager.MockParticipantManager; import org.apache.helix.model.IdealState; import org.apache.helix.monitoring.mbeans.ClusterMBeanObserver; import org.apache.helix.tools.ClusterSetup; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier.BestPossAndExtViewZkVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier.BestPossAndExtViewZkVerifier; import org.apache.log4j.Logger; import org.testng.Assert; import org.testng.annotations.AfterClass; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestResetClusterMetrics.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestResetClusterMetrics.java b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestResetClusterMetrics.java index c775c20..937f87b 100644 --- a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestResetClusterMetrics.java +++ b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestResetClusterMetrics.java @@ -31,7 +31,7 @@ import org.apache.helix.ZkUnitTestBase; import org.apache.helix.integration.manager.ClusterControllerManager; import org.apache.helix.integration.manager.MockParticipantManager; import org.apache.helix.model.IdealState.RebalanceMode; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/tools/TestClusterStateVerifier.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/tools/TestClusterStateVerifier.java b/helix-core/src/test/java/org/apache/helix/tools/TestClusterStateVerifier.java index 27e3b07..d684efc 100644 --- a/helix-core/src/test/java/org/apache/helix/tools/TestClusterStateVerifier.java +++ b/helix-core/src/test/java/org/apache/helix/tools/TestClusterStateVerifier.java @@ -28,8 +28,8 @@ import org.apache.helix.integration.manager.ClusterControllerManager; import org.apache.helix.integration.manager.MockParticipantManager; import org.apache.helix.model.IdealState; import org.apache.helix.model.IdealState.RebalanceMode; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier.BestPossAndExtViewZkVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier.BestPossAndExtViewZkVerifier; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/helix-core/src/test/java/org/apache/helix/tools/TestClusterVerifier.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/tools/TestClusterVerifier.java b/helix-core/src/test/java/org/apache/helix/tools/TestClusterVerifier.java index 5e251c8..cfbf112 100644 --- a/helix-core/src/test/java/org/apache/helix/tools/TestClusterVerifier.java +++ b/helix-core/src/test/java/org/apache/helix/tools/TestClusterVerifier.java @@ -28,9 +28,9 @@ import org.apache.helix.integration.manager.MockParticipantManager; import org.apache.helix.model.BuiltInStateModelDefinitions; import org.apache.helix.model.IdealState; import org.apache.helix.model.IdealState.RebalanceMode; -import org.apache.helix.tools.ClusterStateVerifier.BestPossibleExternalViewVerifier; -import org.apache.helix.tools.ClusterStateVerifier.HelixClusterVerifier; -import org.apache.helix.tools.ClusterStateVerifier.StrictMatchExternalViewVerifier; +import org.apache.helix.tools.ClusterVerifiers.BestPossibleExternalViewVerifier; +import org.apache.helix.tools.ClusterVerifiers.HelixClusterVerifier; +import org.apache.helix.tools.ClusterVerifiers.StrictMatchExternalViewVerifier; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/helix/blob/015a73ce/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 97f78c0..a34f279 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 @@ -39,9 +39,9 @@ import org.apache.helix.model.IdealState; import org.apache.helix.model.InstanceConfig; import org.apache.helix.model.LiveInstance; import org.apache.helix.store.ZNRecordJsonSerializer; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier.BestPossAndExtViewZkVerifier; -import org.apache.helix.tools.ClusterStateVerifier.ClusterStateVerifier.MasterNbInExtViewVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier.BestPossAndExtViewZkVerifier; +import org.apache.helix.tools.ClusterVerifiers.ClusterStateVerifier.MasterNbInExtViewVerifier; import org.testng.Assert; import org.testng.annotations.Test;
