Skip to content

Commit

Permalink
Merge pull request #734 from superMaaax/fix_flaky
Browse files Browse the repository at this point in the history
Fixed Flaky Tests Caused by JSON permutations
  • Loading branch information
stleary committed Mar 27, 2023
2 parents 8353b9c + 48fb526 commit 0578285
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions src/test/java/org/json/junit/XMLTest.java
Expand Up @@ -1111,6 +1111,7 @@ public void testIndentComplicatedJsonObject(){
"}" ;
JSONObject jsonObject = new JSONObject(str);
String actualIndentedXmlString = XML.toString(jsonObject, 1);
JSONObject actualJsonObject = XML.toJSONObject(actualIndentedXmlString);
String expected = "<success>true</success>\n" +
"<response>\n" +
" <dateTimeISO>2022-10-05T00:00:00+03:00</dateTimeISO>\n" +
Expand Down Expand Up @@ -1170,7 +1171,8 @@ public void testIndentComplicatedJsonObject(){
" <timestamp>1664917200</timestamp>\n" +
"</response>\n" +
"<error>null</error>\n";
assertEquals(actualIndentedXmlString, expected);
JSONObject expectedJsonObject = XML.toJSONObject(expected);
assertTrue(expectedJsonObject.similar(actualJsonObject));


}
Expand All @@ -1183,14 +1185,16 @@ public void testIndentSimpleJsonObject(){
" }}";
JSONObject jsonObject = new JSONObject(str);
String actual = XML.toString(jsonObject, "Test", 2);
JSONObject actualJsonObject = XML.toJSONObject(actual);
String expected = "<Test>\n" +
" <employee>\n" +
" <name>sonoo</name>\n" +
" <salary>56000</salary>\n" +
" <married>true</married>\n" +
" </employee>\n" +
"</Test>\n";
assertEquals(actual, expected);
JSONObject expectedJsonObject = XML.toJSONObject(expected);
assertTrue(expectedJsonObject.similar(actualJsonObject));
}

@Test
Expand All @@ -1201,6 +1205,7 @@ public void testIndentSimpleJsonArray(){
"] ";
JSONArray jsonObject = new JSONArray(str);
String actual = XML.toString(jsonObject, 2);
JSONObject actualJsonObject = XML.toJSONObject(actual);
String expected = "<array>\n" +
" <name>Ram</name>\n" +
" <email>Ram@gmail.com</email>\n" +
Expand All @@ -1209,7 +1214,8 @@ public void testIndentSimpleJsonArray(){
" <name>Bob</name>\n" +
" <email>bob32@gmail.com</email>\n" +
"</array>\n";
assertEquals(actual, expected);
JSONObject expectedJsonObject = XML.toJSONObject(expected);
assertTrue(expectedJsonObject.similar(actualJsonObject));


}
Expand Down

0 comments on commit 0578285

Please sign in to comment.