From a2075f51a84676c4fac7eb697a21255abddf143a Mon Sep 17 00:00:00 2001
From: YiweiLi4 <70746497+YiweiLi4@users.noreply.github.com>
Date: Thu, 17 Nov 2022 07:10:53 -0600
Subject: [PATCH] HBASE-27479 fix flaky test testClone in TestTaskMonitor
 (#4876)

Signed-off-by: Duo Zhang <zhangduo@apache.org>
---
 hbase-server/pom.xml                                       | 5 +++++
 .../apache/hadoop/hbase/monitoring/TestTaskMonitor.java    | 3 ++-
 pom.xml                                                    | 7 +++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 8a6cd299772..0dba4aa9833 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -333,6 +333,11 @@
       <artifactId>bcpkix-jdk15on</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.skyscreamer</groupId>
+      <artifactId>jsonassert</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <!-- Make sure resources get added before they are processed by placing this first
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
index ee5ea621eaa..17a998a1164 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
@@ -38,6 +38,7 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.skyscreamer.jsonassert.JSONAssert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -238,7 +239,7 @@ public class TestTaskMonitor {
     assertEquals(clone.getStatus(), monitor.getStatus());
     assertEquals(clone.toString(), monitor.toString());
     assertEquals(clone.toMap(), monitor.toMap());
-    assertEquals(clone.toJSON(), monitor.toJSON());
+    JSONAssert.assertEquals(clone.toJSON(), monitor.toJSON(), true);
 
     // mark complete and make param dirty
     monitor.markComplete("complete RPC");
diff --git a/pom.xml b/pom.xml
index 1e83ca1c190..3baadbceafe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -827,6 +827,7 @@
     <jcodings.version>1.0.56</jcodings.version>
     <spy.version>2.12.2</spy.version>
     <bouncycastle.version>1.70</bouncycastle.version>
+    <skyscreamer.version>1.5.1</skyscreamer.version>
     <kerby.version>1.0.1</kerby.version>
     <commons-crypto.version>1.1.0</commons-crypto.version>
     <curator.version>4.2.0</curator.version>
@@ -1570,6 +1571,12 @@
         <version>${bouncycastle.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.skyscreamer</groupId>
+        <artifactId>jsonassert</artifactId>
+        <version>${skyscreamer.version}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
         <artifactId>bcpkix-jdk15on</artifactId>