[helix] branch master updated: Add failure message for TestClusterAccessor (#1794)

[jx...@apache.org]

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 d9e9dca  Add failure message for TestClusterAccessor  (#1794)
d9e9dca is described below

commit d9e9dcaa29357573b356c7d3f601dca612958731
Author: xyuanlu <xy...@gmail.com>
AuthorDate: Mon Jun 14 11:12:52 2021 -0700

    Add failure message for TestClusterAccessor  (#1794)
    
    * make all test run on by one
    * add message when audit log mismatch
---
 .../org/apache/helix/rest/server/TestClusterAccessor.java | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

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 @@ public class TestClusterAccessor extends AbstractTestClass {
     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 @@ public class TestClusterAccessor extends AbstractTestClass {
 
     // 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 @@ public class TestClusterAccessor extends AbstractTestClass {
 
     // 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 @@ public class TestClusterAccessor extends AbstractTestClass {
     }
   }
 
-  @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 @@ public class TestClusterAccessor extends AbstractTestClass {
     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);