ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-05-11 11:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix newline issue for smali tests on Windows"

Browse Source 
This reverts commit 097b40531b24f197436b4b1f51d586332cfe1fda.
This commit is contained in:
Ben Gruver 2012-10-06 12:32:03 -07:00
parent 598dcde6c9
commit 671e5c7ea5
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
smali/src/test/java/LexerTest.java
View File

@ -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()));
}
}