diff --git a/jadx-core/src/test/java/jadx/core/xmlgen/ResXmlGenTest.java b/jadx-core/src/test/java/jadx/core/xmlgen/ResXmlGenTest.java index c5296f550..90cbdfd4e 100644 --- a/jadx-core/src/test/java/jadx/core/xmlgen/ResXmlGenTest.java +++ b/jadx-core/src/test/java/jadx/core/xmlgen/ResXmlGenTest.java @@ -27,12 +27,12 @@ class ResXmlGenTest { List files = resXmlGen.makeResourcesXml(); assertEquals(1, files.size()); - assertEquals("res/values/attrs.xml", files.get(0).getFileName()); + assertEquals("res/values/attrs.xml", files.get(0).getName()); assertEquals("\n" + "\n" + " \n" + " \n" - + "", files.get(0).getText().toString()); + + "", adaptLineEndings(files.get(0).getText().toString())); } @Test @@ -48,13 +48,13 @@ class ResXmlGenTest { List files = resXmlGen.makeResourcesXml(); assertEquals(1, files.size()); - assertEquals("res/values/attrs.xml", files.get(0).getFileName()); + assertEquals("res/values/attrs.xml", files.get(0).getName()); assertEquals("\n" + "\n" + " \n" + " \n" + " \n" - + "", files.get(0).getText().toString()); + + "", adaptLineEndings(files.get(0).getText().toString())); } @Test @@ -70,13 +70,13 @@ class ResXmlGenTest { List files = resXmlGen.makeResourcesXml(); assertEquals(1, files.size()); - assertEquals("res/values/attrs.xml", files.get(0).getFileName()); + assertEquals("res/values/attrs.xml", files.get(0).getName()); assertEquals("\n" + "\n" + " \n" + " \n" + " \n" - + "", files.get(0).getText().toString()); + + "", adaptLineEndings(files.get(0).getText().toString())); } @Test @@ -92,12 +92,12 @@ class ResXmlGenTest { List files = resXmlGen.makeResourcesXml(); assertEquals(1, files.size()); - assertEquals("res/values/attrs.xml", files.get(0).getFileName()); + assertEquals("res/values/attrs.xml", files.get(0).getName()); assertEquals("\n" + "\n" + " \n" + " \n" - + "", files.get(0).getText().toString()); + + "", adaptLineEndings(files.get(0).getText().toString())); } @Test @@ -116,7 +116,7 @@ class ResXmlGenTest { List files = resXmlGen.makeResourcesXml(); assertEquals(1, files.size()); - assertEquals("res/values/styles.xml", files.get(0).getFileName()); + assertEquals("res/values/styles.xml", files.get(0).getName()); assertEquals("\n" + "\n" + " \n" + " \n" - + "", files.get(0).getText().toString()); + + "", adaptLineEndings(files.get(0).getText().toString())); } @Test @@ -142,11 +142,11 @@ class ResXmlGenTest { List files = resXmlGen.makeResourcesXml(); assertEquals(1, files.size()); - assertEquals("res/values/strings.xml", files.get(0).getFileName()); + assertEquals("res/values/strings.xml", files.get(0).getName()); assertEquals("\n" + "\n" + " Jadx Decompiler App\n" - + "", files.get(0).getText().toString()); + + "", adaptLineEndings(files.get(0).getText().toString())); } @Test @@ -164,11 +164,11 @@ class ResXmlGenTest { List files = resXmlGen.makeResourcesXml(); assertEquals(1, files.size()); - assertEquals("res/values/strings.xml", files.get(0).getFileName()); + assertEquals("res/values/strings.xml", files.get(0).getName()); assertEquals("\n" + "\n" + " %s at %s\n" - + "", files.get(0).getText().toString()); + + "", adaptLineEndings(files.get(0).getText().toString())); } @Test @@ -186,12 +186,19 @@ class ResXmlGenTest { List files = resXmlGen.makeResourcesXml(); assertEquals(1, files.size()); - assertEquals("res/values/arrays.xml", files.get(0).getFileName()); + assertEquals("res/values/arrays.xml", files.get(0).getName()); assertEquals("\n" + "\n" + " \n" + " Let\\'s go\n" + " \n" - + "", files.get(0).getText().toString()); + + "", adaptLineEndings(files.get(0).getText().toString())); + } + + private static String adaptLineEndings(String input) { + if (System.lineSeparator().equals("\n")) { + return input; // no adaption necessary + } + return input.replaceAll(System.lineSeparator(), "\n"); } }