From 4d9d58829b6abde1b0c2c6088449d102bc1810e0 Mon Sep 17 00:00:00 2001 From: Stephan Schmitz Date: Mon, 18 Nov 2013 10:01:55 +0100 Subject: [PATCH] Make AnalysisTest.java cross-platform compatible Use System.lineSeparator() for cross-platform compatible line endings for runTest() method in AnalysisTest.java. The patch fixes build failures of type `org.jf.baksmali.AnalysisTest > DuplicateTest FAILED [junit.framework.ComparisonFailure at AnalysisTest.java:107]` on Windows systems. --- baksmali/src/test/java/org/jf/baksmali/AnalysisTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/baksmali/src/test/java/org/jf/baksmali/AnalysisTest.java b/baksmali/src/test/java/org/jf/baksmali/AnalysisTest.java index 9e1b11f0..a3b58254 100644 --- a/baksmali/src/test/java/org/jf/baksmali/AnalysisTest.java +++ b/baksmali/src/test/java/org/jf/baksmali/AnalysisTest.java @@ -104,7 +104,8 @@ public class AnalysisTest { className.substring(1, className.length() - 1)); String smaliContents = readResource(smaliPath); - Assert.assertEquals(smaliContents.replace("\r\n", "\n"), stringWriter.toString().replace("\r\n", "\n")); + Assert.assertEquals(smaliContents.replace("\r", "").replace("\n", System.lineSeparator()), + stringWriter.toString().replace("\r", "").replace("\n", System.lineSeparator())); } }