This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 634b6bd Fixed Possible Json Ordering Permutations (#3005)
634b6bd is described below
commit 634b6bd91ad3c51352c6bfa09212a57935178411
Author: Kaiyao Ke <[email protected]>
AuthorDate: Wed Mar 9 10:55:08 2022 +0800
Fixed Possible Json Ordering Permutations (#3005)
---
.../test/java/org/apache/shenyu/common/utils/GsonUtilsTest.java | 5 ++++-
.../test/java/org/apache/shenyu/common/utils/JsonUtilsTest.java | 7 ++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git
a/shenyu-common/src/test/java/org/apache/shenyu/common/utils/GsonUtilsTest.java
b/shenyu-common/src/test/java/org/apache/shenyu/common/utils/GsonUtilsTest.java
index 3d167f1..069f147 100644
---
a/shenyu-common/src/test/java/org/apache/shenyu/common/utils/GsonUtilsTest.java
+++
b/shenyu-common/src/test/java/org/apache/shenyu/common/utils/GsonUtilsTest.java
@@ -66,8 +66,11 @@ public class GsonUtilsTest {
@Test
public void testToJson() {
TestObject testObject = generateTestObject();
+ JsonParser parser = new JsonParser();
+ JsonElement expectedJson = parser.parse(EXPECTED_JSON);
+ JsonElement objectJson =
parser.parse(GsonUtils.getInstance().toJson(testObject));
- assertEquals(EXPECTED_JSON,
GsonUtils.getInstance().toJson(testObject));
+ assertEquals(expectedJson, objectJson);
}
/**
diff --git
a/shenyu-common/src/test/java/org/apache/shenyu/common/utils/JsonUtilsTest.java
b/shenyu-common/src/test/java/org/apache/shenyu/common/utils/JsonUtilsTest.java
index dcc9e0c..e0eb96a 100644
---
a/shenyu-common/src/test/java/org/apache/shenyu/common/utils/JsonUtilsTest.java
+++
b/shenyu-common/src/test/java/org/apache/shenyu/common/utils/JsonUtilsTest.java
@@ -18,6 +18,8 @@
package org.apache.shenyu.common.utils;
import org.apache.shenyu.common.constant.Constants;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
import org.junit.jupiter.api.Test;
import java.util.HashMap;
@@ -73,7 +75,10 @@ public final class JsonUtilsTest {
}
})
.build();
- assertEquals(EXPECTED_JSON, JsonUtils.toJson(object));
+ JsonParser parser = new JsonParser();
+ JsonElement expectedJson = parser.parse(EXPECTED_JSON);
+ JsonElement objectJson = parser.parse(JsonUtils.toJson(object));
+ assertEquals(expectedJson, objectJson);
Object o = new Object();
assertEquals(Constants.EMPTY_JSON, JsonUtils.toJson(o));