From 073019fa541d17c16c6ca8e628f5e7a48285e639 Mon Sep 17 00:00:00 2001 From: Stephan Schmitz Date: Mon, 18 Nov 2013 13:31:07 +0100 Subject: [PATCH] Merge of cross-platform fix for smali's AnalysisTest.java Merge https://github.com/JesusFreke/smali/pull/20 into fork: 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/brut.apktool.smali/baksmali/src/test/java/org/jf/baksmali/AnalysisTest.java b/brut.apktool.smali/baksmali/src/test/java/org/jf/baksmali/AnalysisTest.java index 9e1b11f0..a3b58254 100644 --- a/brut.apktool.smali/baksmali/src/test/java/org/jf/baksmali/AnalysisTest.java +++ b/brut.apktool.smali/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())); } }