From 671e5c7ea5040c0705f3c4aa637d4c255f3ed6b5 Mon Sep 17 00:00:00 2001
From: Ben Gruver <bgruv@google.com>
Date: Sat, 6 Oct 2012 12:32:03 -0700
Subject: [PATCH] Revert "Fix newline issue for smali tests on Windows"

This reverts commit 097b40531b24f197436b4b1f51d586332cfe1fda.
---
 smali/src/test/java/LexerTest.java | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/smali/src/test/java/LexerTest.java b/smali/src/test/java/LexerTest.java
index f9397894..074b32ed 100644
--- a/smali/src/test/java/LexerTest.java
+++ b/smali/src/test/java/LexerTest.java
@@ -30,6 +30,7 @@ import org.antlr.runtime.ANTLRInputStream;
 import org.antlr.runtime.CommonToken;
 import org.antlr.runtime.CommonTokenStream;
 import org.antlr.runtime.RecognitionException;
+import org.jf.dexlib.Util.Utf8Utils;
 import org.jf.smali.*;
 import static org.jf.smali.expectedTokensTestGrammarParser.ExpectedToken;
 import org.junit.Assert;
@@ -42,21 +43,12 @@ import java.util.List;
 public class LexerTest {
     private static final HashMap<String, Integer> tokenTypesByName;
 
-    private static final String newlineReplacement;
-
     static {
         tokenTypesByName = new HashMap<String, Integer>();
 
         for (int i=0; i<smaliParser.tokenNames.length; i++) {
             tokenTypesByName.put(smaliParser.tokenNames[i], i);
         }
-
-        String newLine = System.getProperty("line.separator");
-        if (!"\n".equals(newLine)) {
-            newlineReplacement = newLine;
-        } else {
-            newlineReplacement = null;
-        }
     }
 
     @Test
@@ -198,13 +190,9 @@ public class LexerTest {
             }
 
             if (expectedToken.tokenText != null) {
-                String expectedTokenText = expectedToken.tokenText;
-                if (newlineReplacement != null) {
-                    expectedTokenText = expectedTokenText.replace("\n", newlineReplacement);
-                }
-
-                if (!expectedTokenText.equals(token.getText())) {
-                    Assert.fail(String.format("Invalid token text at index %d. Expecting text \"%s\", got \"%s\"",
+                if (!expectedToken.tokenText.equals(token.getText())) {
+                    Assert.fail(
+                            String.format("Invalid token text at index %d. Expecting text \"%s\", got \"%s\"",
                                     expectedTokenIndex - 1, expectedToken.tokenText, token.getText()));
                 }
             }