azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

force UTF-8 encoding in CodegenTestCase.loadFileByFullPath

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-09-30 20:17:14 +03:00
parent 361448de8b
commit 6466facffa
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
+2 -1
View File
@@ -20,6 +20,7 @@ import com.google.common.collect.Lists;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import com.intellij.testFramework.TestDataFile; import com.intellij.testFramework.TestDataFile;
import com.intellij.testFramework.UsefulTestCase; import com.intellij.testFramework.UsefulTestCase;
import kotlin.Charsets;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFile;
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
@@ -97,7 +98,7 @@ public abstract class CodegenTestCase extends UsefulTestCase {
protected String loadFileByFullPath(@NotNull String fullPath) { protected String loadFileByFullPath(@NotNull String fullPath) {
try { try {
File file = new File(fullPath); File file = new File(fullPath);
String content = FileUtil.loadFile(file, true); String content = FileUtil.loadFile(file, Charsets.UTF_8.name(), true);
myFiles = CodegenTestFiles.create(file.getName(), content, myEnvironment.getProject()); myFiles = CodegenTestFiles.create(file.getName(), content, myEnvironment.getProject());
return content; return content;
} catch (IOException e) { } catch (IOException e) {