[helix] branch master updated: Issue-2296 Fixed Possible Json Ordering Permutations Problem in Tests (#2297)

[jxue]

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 f1b7b658d Issue-2296 Fixed Possible Json Ordering Permutations Problem 
in Tests (#2297)
f1b7b658d is described below

commit f1b7b658de6946a99f57f3e031fc16b70b6b1d80
Author: BoyuLi4 <112122577+boyu...@users.noreply.github.com>
AuthorDate: Tue Dec 6 13:17:16 2022 -0600

    Issue-2296 Fixed Possible Json Ordering Permutations Problem in Tests 
(#2297)
---
 .../org/apache/helix/rest/server/json/cluster/TestClusterInfo.java    | 4 ++--
 .../apache/helix/rest/server/json/cluster/TestClusterTopology.java    | 4 ++--
 .../apache/helix/rest/server/json/instance/TestStoppableCheck.java    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/helix-rest/src/test/java/org/apache/helix/rest/server/json/cluster/TestClusterInfo.java
 
b/helix-rest/src/test/java/org/apache/helix/rest/server/json/cluster/TestClusterInfo.java
index 89c0ee01d..bba16f70c 100644
--- 
a/helix-rest/src/test/java/org/apache/helix/rest/server/json/cluster/TestClusterInfo.java
+++ 
b/helix-rest/src/test/java/org/apache/helix/rest/server/json/cluster/TestClusterInfo.java
@@ -39,7 +39,7 @@ public class TestClusterInfo {
     ObjectMapper mapper = new ObjectMapper();
     String result = mapper.writeValueAsString(clusterInfo);
 
-    Assert.assertEquals(result,
-        
"{\"id\":\"cluster0\",\"controller\":\"controller\",\"paused\":true,\"maintenance\":true,\"resources\":[\"idealState0\"],\"instances\":[\"instance0\"],\"liveInstances\":[\"instance0\"]}");
+    Assert.assertEquals(mapper.readTree(result),
+                        
mapper.readTree("{\"id\":\"cluster0\",\"controller\":\"controller\",\"paused\":true,\"maintenance\":true,\"resources\":[\"idealState0\"],\"instances\":[\"instance0\"],\"liveInstances\":[\"instance0\"]}"));
   }
 }
diff --git 
a/helix-rest/src/test/java/org/apache/helix/rest/server/json/cluster/TestClusterTopology.java
 
b/helix-rest/src/test/java/org/apache/helix/rest/server/json/cluster/TestClusterTopology.java
index f7dc67199..45465d0b7 100644
--- 
a/helix-rest/src/test/java/org/apache/helix/rest/server/json/cluster/TestClusterTopology.java
+++ 
b/helix-rest/src/test/java/org/apache/helix/rest/server/json/cluster/TestClusterTopology.java
@@ -42,7 +42,7 @@ public class TestClusterTopology {
     ObjectMapper mapper = new ObjectMapper();
     String result = mapper.writeValueAsString(clusterTopology);
 
-    Assert.assertEquals(result,
-        
"{\"id\":\"cluster0\",\"zones\":[{\"id\":\"zone\",\"instances\":[{\"id\":\"instance\"}]}],\"allInstances\":[]}");
+    Assert.assertEquals(mapper.readTree(result),
+                        
mapper.readTree("{\"id\":\"cluster0\",\"zones\":[{\"id\":\"zone\",\"instances\":[{\"id\":\"instance\"}]}],\"allInstances\":[]}"));
   }
 }
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 c04b65a0c..49f78d373 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(mapper.readTree(result), 
mapper.readTree("{\"stoppable\":false,\"failedChecks\":[\"HELIX:check\"]}"));
   }
 
   @Test