From 1d597910e295c459dc2c4b6c9b33bed331328990 Mon Sep 17 00:00:00 2001 From: Ben Gruver Date: Sat, 19 Jul 2014 20:33:37 -0700 Subject: [PATCH] Improve the readability of the newline normalization stuff for tests --- .../src/test/java/org/jf/baksmali/AnalysisTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 1fae6ae7..bf353e83 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 @@ -40,6 +40,7 @@ import org.jf.dexlib2.analysis.ClassPath; import org.jf.dexlib2.iface.ClassDef; import org.jf.dexlib2.iface.DexFile; import org.jf.util.IndentingWriter; +import org.jf.util.TextUtils; import org.junit.Test; import javax.annotation.Nonnull; @@ -105,9 +106,8 @@ public class AnalysisTest { className.substring(1, className.length() - 1)); String smaliContents = readResource(smaliPath); - String newline = System.getProperty("line.separator"); - Assert.assertEquals(smaliContents.replace("\r", "").replace("\n", newline), - stringWriter.toString().replace("\r", "").replace("\n", newline)); + Assert.assertEquals(TextUtils.normalizeNewlines(smaliContents), + TextUtils.normalizeNewlines(stringWriter.toString())); } }