BlocksMod/FernFlower
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

java-decompiler: fix for broken Git checkout on Windows

Browse Source
This commit is contained in:
Roman Shevchenko 2014-09-12 19:26:15 +04:00
parent e90f1de039
commit e1d1425f22
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/org/jetbrains/java/decompiler/SingleClassesTest.java
View File

@ -16,6 +16,7 @@
package org.jetbrains.java.decompiler; package org.jetbrains.java.decompiler;
import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler; import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
import org.jetbrains.java.decompiler.util.InterpreterUtil;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@ -79,9 +80,7 @@ public class SingleClassesTest {
File referenceFile = new File(fixture.getTestDataDir(), "results/" + testName + ".dec"); File referenceFile = new File(fixture.getTestDataDir(), "results/" + testName + ".dec");
assertTrue(referenceFile.isFile()); assertTrue(referenceFile.isFile());
String decompiledContent = getContent(decompiledFile); compareContent(decompiledFile, referenceFile);
String referenceContent = getContent(referenceFile);
assertEquals(referenceContent, decompiledContent);
} }
catch (Exception e) { catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
@ -107,19 +106,14 @@ public class SingleClassesTest {
return files; return files;
} }
private static String getContent(File file) throws IOException { private static void compareContent(File decompiledFile, File referenceFile) throws IOException {
Reader reader = new InputStreamReader(new FileInputStream(file), "UTF-8"); String decompiledContent = new String(InterpreterUtil.getBytes(decompiledFile), "UTF-8");
try {
char[] buff = new char[16 * 1024]; String referenceContent = new String(InterpreterUtil.getBytes(referenceFile), "UTF-8");
StringBuilder content = new StringBuilder(); if (InterpreterUtil.IS_WINDOWS && !referenceContent.contains("\r\n")) {
int n; referenceContent = referenceContent.replace("\n", "\r\n"); // fix for broken Git checkout on Windows
while ((n = reader.read(buff)) > 0) {
content.append(buff, 0, n);
}
return content.toString();
}
finally {
reader.close();
} }
assertEquals(referenceContent, decompiledContent);
} }
} }