Add failure message for TestClusterAccessor (#1794)
* make all test run on by one
* add message when audit log mismatch
diff --git a/helix-rest/src/test/java/org/apache/helix/rest/server/TestClusterAccessor.java b/helix-rest/src/test/java/org/apache/helix/rest/server/TestClusterAccessor.java
index d0593e4..cca5284 100644
--- a/helix-rest/src/test/java/org/apache/helix/rest/server/TestClusterAccessor.java
+++ b/helix-rest/src/test/java/org/apache/helix/rest/server/TestClusterAccessor.java
@@ -92,7 +92,7 @@
Assert.assertEquals(clusters, _clusters,
"clusters from response: " + clusters + " vs clusters actually: " + _clusters);
- Assert.assertEquals(_auditLogger.getAuditLogs().size(), 1);
+ validateAuditLogSize(1);
AuditLog auditLog = _auditLogger.getAuditLogs().get(0);
validateAuditLog(auditLog, HTTPMethods.GET.name(), "clusters",
Response.Status.OK.getStatusCode(), body);
@@ -345,7 +345,7 @@
// verify the cluster has been deleted.
Assert.assertFalse(_baseAccessor.exists("/" + cluster, 0));
- Assert.assertEquals(_auditLogger.getAuditLogs().size(), 3);
+ validateAuditLogSize(3);
System.out.println("End test :" + TestHelper.getTestMethodName());
}
@@ -370,7 +370,7 @@
// verify the cluster is paused.
Assert.assertFalse(_baseAccessor.exists(keyBuilder.pause().getPath(), 0));
- Assert.assertEquals(_auditLogger.getAuditLogs().size(), 2);
+ validateAuditLogSize(2);
System.out.println("End test :" + TestHelper.getTestMethodName());
}
@@ -718,7 +718,7 @@
}
}
- @Test
+ @Test(dependsOnMethods = "testEnableWagedRebalanceForAllResources")
public void testCreateRESTConfig() throws IOException {
System.out.println("Start test :" + TestHelper.getTestMethodName());
String cluster = _clusters.iterator().next();
@@ -1305,12 +1305,17 @@
post("clusters/" + cluster + "/configs", ImmutableMap.of("command", command.name()), entity,
Response.Status.OK.getStatusCode());
- Assert.assertEquals(_auditLogger.getAuditLogs().size(), 1);
+ validateAuditLogSize(1);
AuditLog auditLog = _auditLogger.getAuditLogs().get(0);
validateAuditLog(auditLog, HTTPMethods.POST.name(), "clusters/" + cluster + "/configs",
Response.Status.OK.getStatusCode(), null);
}
+ private void validateAuditLogSize(int expected) {
+ Assert.assertEquals(_auditLogger.getAuditLogs().size(), expected,
+ "AuditLog:" + _auditLogger.getAuditLogs().toString());
+ }
+
private ClusterConfig createClusterConfig(String cluster) {
ClusterConfig clusterConfig = _configAccessor.getClusterConfig(cluster);