Skip to content

Commit 0578285

Browse files
authored
Merge pull request #734 from superMaaax/fix_flaky
Fixed Flaky Tests Caused by JSON permutations
2 parents 8353b9c + 48fb526 commit 0578285

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/test/java/org/json/junit/XMLTest.java

+9-3
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,7 @@ public void testIndentComplicatedJsonObject(){
11111111
"}" ;
11121112
JSONObject jsonObject = new JSONObject(str);
11131113
String actualIndentedXmlString = XML.toString(jsonObject, 1);
1114+
JSONObject actualJsonObject = XML.toJSONObject(actualIndentedXmlString);
11141115
String expected = "<success>true</success>\n" +
11151116
"<response>\n" +
11161117
" <dateTimeISO>2022-10-05T00:00:00+03:00</dateTimeISO>\n" +
@@ -1170,7 +1171,8 @@ public void testIndentComplicatedJsonObject(){
11701171
" <timestamp>1664917200</timestamp>\n" +
11711172
"</response>\n" +
11721173
"<error>null</error>\n";
1173-
assertEquals(actualIndentedXmlString, expected);
1174+
JSONObject expectedJsonObject = XML.toJSONObject(expected);
1175+
assertTrue(expectedJsonObject.similar(actualJsonObject));
11741176

11751177

11761178
}
@@ -1183,14 +1185,16 @@ public void testIndentSimpleJsonObject(){
11831185
" }}";
11841186
JSONObject jsonObject = new JSONObject(str);
11851187
String actual = XML.toString(jsonObject, "Test", 2);
1188+
JSONObject actualJsonObject = XML.toJSONObject(actual);
11861189
String expected = "<Test>\n" +
11871190
" <employee>\n" +
11881191
" <name>sonoo</name>\n" +
11891192
" <salary>56000</salary>\n" +
11901193
" <married>true</married>\n" +
11911194
" </employee>\n" +
11921195
"</Test>\n";
1193-
assertEquals(actual, expected);
1196+
JSONObject expectedJsonObject = XML.toJSONObject(expected);
1197+
assertTrue(expectedJsonObject.similar(actualJsonObject));
11941198
}
11951199

11961200
@Test
@@ -1201,6 +1205,7 @@ public void testIndentSimpleJsonArray(){
12011205
"] ";
12021206
JSONArray jsonObject = new JSONArray(str);
12031207
String actual = XML.toString(jsonObject, 2);
1208+
JSONObject actualJsonObject = XML.toJSONObject(actual);
12041209
String expected = "<array>\n" +
12051210
" <name>Ram</name>\n" +
12061211
" <email>[email protected]</email>\n" +
@@ -1209,7 +1214,8 @@ public void testIndentSimpleJsonArray(){
12091214
" <name>Bob</name>\n" +
12101215
" <email>[email protected]</email>\n" +
12111216
"</array>\n";
1212-
assertEquals(actual, expected);
1217+
JSONObject expectedJsonObject = XML.toJSONObject(expected);
1218+
assertTrue(expectedJsonObject.similar(actualJsonObject));
12131219

12141220

12151221
}

0 commit comments

Comments
 (0)