This is an automated email from the ASF dual-hosted git repository.
jxue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git
The following commit(s) were added to refs/heads/master by this push:
new a4b87b4 Fix rest tests with prefix
a4b87b4 is described below
commit a4b87b4b8f40b0c1ae25ef519ea896a524b6bad3
Author: Junkai Xue <[email protected]>
AuthorDate: Thu Jun 4 20:43:35 2020 -0700
Fix rest tests with prefix
---
.../server/resources/helix/InstancesAccessor.java | 2 +-
.../helix/rest/server/TestInstancesAccessor.java | 20 ++++++++++----------
.../helix/rest/server/TestPerInstanceAccessor.java | 2 +-
.../server/json/instance/TestStoppableCheck.java | 4 ++--
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/helix-rest/src/main/java/org/apache/helix/rest/server/resources/helix/InstancesAccessor.java
b/helix-rest/src/main/java/org/apache/helix/rest/server/resources/helix/InstancesAccessor.java
index 4578172..4535c2f 100644
---
a/helix-rest/src/main/java/org/apache/helix/rest/server/resources/helix/InstancesAccessor.java
+++
b/helix-rest/src/main/java/org/apache/helix/rest/server/resources/helix/InstancesAccessor.java
@@ -63,7 +63,7 @@ public class InstancesAccessor extends AbstractHelixResource {
// This type does not belongs to real HealthCheck failed reason. Also if we
add this type
// to HealthCheck enum, it could introduce more unnecessary check step since
the InstanceServiceImpl
// loops all the types to do corresponding checks.
- private final static String INSTANCE_NOT_EXIST = "Helix:INSTANCE_NOT_EXIST";
+ private final static String INSTANCE_NOT_EXIST = "HELIX:INSTANCE_NOT_EXIST";
public enum InstancesProperties {
instances,
online,
diff --git
a/helix-rest/src/test/java/org/apache/helix/rest/server/TestInstancesAccessor.java
b/helix-rest/src/test/java/org/apache/helix/rest/server/TestInstancesAccessor.java
index 6ffd1e5..8844d24 100644
---
a/helix-rest/src/test/java/org/apache/helix/rest/server/TestInstancesAccessor.java
+++
b/helix-rest/src/test/java/org/apache/helix/rest/server/TestInstancesAccessor.java
@@ -67,19 +67,19 @@ public class TestInstancesAccessor extends
AbstractTestClass {
JsonNode nonStoppableInstances = jsonNode
.get(InstancesAccessor.InstancesProperties.instance_not_stoppable_with_reasons.name());
Assert.assertEquals(getStringSet(nonStoppableInstances, "instance0"),
- ImmutableSet.of("Helix:MIN_ACTIVE_REPLICA_CHECK_FAILED"));
+ ImmutableSet.of("HELIX:MIN_ACTIVE_REPLICA_CHECK_FAILED"));
Assert.assertEquals(getStringSet(nonStoppableInstances, "instance1"),
- ImmutableSet.of("Helix:EMPTY_RESOURCE_ASSIGNMENT",
"Helix:INSTANCE_NOT_ENABLED",
- "Helix:INSTANCE_NOT_STABLE"));
+ ImmutableSet.of("HELIX:EMPTY_RESOURCE_ASSIGNMENT",
"HELIX:INSTANCE_NOT_ENABLED",
+ "HELIX:INSTANCE_NOT_STABLE"));
Assert.assertEquals(getStringSet(nonStoppableInstances, "instance2"),
- ImmutableSet.of("Helix:MIN_ACTIVE_REPLICA_CHECK_FAILED"));
+ ImmutableSet.of("HELIX:MIN_ACTIVE_REPLICA_CHECK_FAILED"));
Assert.assertEquals(getStringSet(nonStoppableInstances, "instance3"),
- ImmutableSet.of("Helix:HAS_DISABLED_PARTITION",
"Helix:MIN_ACTIVE_REPLICA_CHECK_FAILED"));
+ ImmutableSet.of("HELIX:HAS_DISABLED_PARTITION",
"HELIX:MIN_ACTIVE_REPLICA_CHECK_FAILED"));
Assert.assertEquals(getStringSet(nonStoppableInstances, "instance4"),
- ImmutableSet.of("Helix:EMPTY_RESOURCE_ASSIGNMENT",
"Helix:INSTANCE_NOT_ALIVE",
- "Helix:INSTANCE_NOT_STABLE"));
+ ImmutableSet.of("HELIX:EMPTY_RESOURCE_ASSIGNMENT",
"HELIX:INSTANCE_NOT_ALIVE",
+ "HELIX:INSTANCE_NOT_STABLE"));
Assert.assertEquals(getStringSet(nonStoppableInstances, "invalidInstance"),
- ImmutableSet.of("Helix:INSTANCE_NOT_EXIST"));
+ ImmutableSet.of("HELIX:INSTANCE_NOT_EXIST"));
System.out.println("End test :" + TestHelper.getTestMethodName());
}
@@ -103,7 +103,7 @@ public class TestInstancesAccessor extends
AbstractTestClass {
JsonNode jsonResult =
OBJECT_MAPPER.readTree(response.readEntity(String.class));
Assert.assertFalse(jsonResult.get("stoppable").asBoolean());
Assert.assertEquals(getStringSet(jsonResult, "failedChecks"),
-
ImmutableSet.of("Helix:HAS_DISABLED_PARTITION","Helix:INSTANCE_NOT_ENABLED","Helix:INSTANCE_NOT_STABLE","Helix:MIN_ACTIVE_REPLICA_CHECK_FAILED"));
+
ImmutableSet.of("HELIX:HAS_DISABLED_PARTITION","HELIX:INSTANCE_NOT_ENABLED","HELIX:INSTANCE_NOT_STABLE","HELIX:MIN_ACTIVE_REPLICA_CHECK_FAILED"));
// Reenable instance0, it should passed the check
instanceConfig.setInstanceEnabled(true);
@@ -117,7 +117,7 @@ public class TestInstancesAccessor extends
AbstractTestClass {
jsonResult = OBJECT_MAPPER.readTree(response.readEntity(String.class));
Assert.assertFalse(jsonResult.get("stoppable").asBoolean());
- Assert.assertEquals(getStringSet(jsonResult, "failedChecks"),
ImmutableSet.of("Helix:MIN_ACTIVE_REPLICA_CHECK_FAILED"));
+ Assert.assertEquals(getStringSet(jsonResult, "failedChecks"),
ImmutableSet.of("HELIX:MIN_ACTIVE_REPLICA_CHECK_FAILED"));
System.out.println("End test :" + TestHelper.getTestMethodName());
}
diff --git
a/helix-rest/src/test/java/org/apache/helix/rest/server/TestPerInstanceAccessor.java
b/helix-rest/src/test/java/org/apache/helix/rest/server/TestPerInstanceAccessor.java
index 68a4e85..926e0dd 100644
---
a/helix-rest/src/test/java/org/apache/helix/rest/server/TestPerInstanceAccessor.java
+++
b/helix-rest/src/test/java/org/apache/helix/rest/server/TestPerInstanceAccessor.java
@@ -63,7 +63,7 @@ public class TestPerInstanceAccessor extends
AbstractTestClass {
.format(STOPPABLE_CLUSTER, "instance1").post(this, entity);
String stoppableCheckResult = response.readEntity(String.class);
Assert.assertEquals(stoppableCheckResult,
-
"{\"stoppable\":false,\"failedChecks\":[\"Helix:EMPTY_RESOURCE_ASSIGNMENT\",\"Helix:INSTANCE_NOT_ENABLED\",\"Helix:INSTANCE_NOT_STABLE\"]}");
+
"{\"stoppable\":false,\"failedChecks\":[\"HELIX:EMPTY_RESOURCE_ASSIGNMENT\",\"HELIX:INSTANCE_NOT_ENABLED\",\"HELIX:INSTANCE_NOT_STABLE\"]}");
System.out.println("End test :" + TestHelper.getTestMethodName());
}
diff --git
a/helix-rest/src/test/java/org/apache/helix/rest/server/json/instance/TestStoppableCheck.java
b/helix-rest/src/test/java/org/apache/helix/rest/server/json/instance/TestStoppableCheck.java
index 18fcd75..fa6e9b1 100644
---
a/helix-rest/src/test/java/org/apache/helix/rest/server/json/instance/TestStoppableCheck.java
+++
b/helix-rest/src/test/java/org/apache/helix/rest/server/json/instance/TestStoppableCheck.java
@@ -36,7 +36,7 @@ public class TestStoppableCheck {
ObjectMapper mapper = new ObjectMapper();
String result = mapper.writeValueAsString(stoppableCheck);
- Assert.assertEquals(result,
"{\"stoppable\":false,\"failedChecks\":[\"Helix:check\"]}");
+ Assert.assertEquals(result,
"{\"stoppable\":false,\"failedChecks\":[\"HELIX:check\"]}");
}
@Test
@@ -45,6 +45,6 @@ public class TestStoppableCheck {
new StoppableCheck(ImmutableMap.of("a", true, "c", false, "b", false),
StoppableCheck.Category.HELIX_OWN_CHECK);
Assert.assertFalse(stoppableCheck.isStoppable());
- Assert.assertEquals(stoppableCheck.getFailedChecks(),
ImmutableList.of("Helix:b", "Helix:c"));
+ Assert.assertEquals(stoppableCheck.getFailedChecks(),
ImmutableList.of("HELIX:b", "HELIX:c"));
}
}
