Backups/JSON-java
1
0
Fork 0
mirror of https://github.com/stleary/JSON-java.git synced 2025-08-03 11:25:30 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #778 from Madjosz/fix_xml_test

Browse Source 
Fix XMLTest.testIndentComplicatedJsonObjectWithArrayAndWithConfig() for Windows - in the test
This commit is contained in:
Sean Leary 2023-10-08 17:06:55 -05:00 committed by GitHub
commit 776b5ccb85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/test/java/org/json/junit/XMLTest.java
View File

@ -1223,33 +1223,18 @@ public class XMLTest {
@Test @Test
public void testIndentComplicatedJsonObjectWithArrayAndWithConfig(){ public void testIndentComplicatedJsonObjectWithArrayAndWithConfig(){
try { try (InputStream jsonStream = XMLTest.class.getClassLoader().getResourceAsStream("Issue593.json")) {
InputStream jsonStream = null; final JSONObject object = new JSONObject(new JSONTokener(jsonStream));
try { String actualString = XML.toString(object, null, XMLParserConfiguration.KEEP_STRINGS, 2);
jsonStream = XMLTest.class.getClassLoader().getResourceAsStream("Issue593.json"); try (InputStream xmlStream = XMLTest.class.getClassLoader().getResourceAsStream("Issue593.xml")) {
final JSONObject object = new JSONObject(new JSONTokener(jsonStream)); int bufferSize = 1024;
String actualString = XML.toString(object, null, XMLParserConfiguration.KEEP_STRINGS,2); char[] buffer = new char[bufferSize];
InputStream xmlStream = null; StringBuilder expected = new StringBuilder();
try { Reader in = new InputStreamReader(xmlStream, "UTF-8");
xmlStream = XMLTest.class.getClassLoader().getResourceAsStream("Issue593.xml"); for (int numRead; (numRead = in.read(buffer, 0, buffer.length)) > 0; ) {
int bufferSize = 1024; expected.append(buffer, 0, numRead);
char[] buffer = new char[bufferSize];
StringBuilder expected = new StringBuilder();
Reader in = new InputStreamReader(xmlStream, "UTF-8");
for (int numRead; (numRead = in.read(buffer, 0, buffer.length)) > 0; ) {
expected.append(buffer, 0, numRead);
}
assertEquals(expected.toString().replaceAll("\\n|\\r\\n", System.lineSeparator()),
actualString.replaceAll("\\n|\\r\\n", System.lineSeparator()));
} finally {
if (xmlStream != null) {
xmlStream.close();
}
}
} finally {
if (jsonStream != null) {
jsonStream.close();
} }
assertEquals(expected.toString(), actualString);
} }
} catch (IOException e) { } catch (IOException e) {
fail("file writer error: " +e.getMessage()); fail("file writer error: " +e.getMessage());