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

utilize JetTestUtils.createFile() in tests

Browse Source
This commit is contained in:
Alexander Udalov
2012-08-20 20:53:08 +04:00
parent b85300d90a
commit d38b965bf1
11 changed files with 15 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/JetLiteFixture.java
+1 -1
View File
@@ -75,7 +75,7 @@ public abstract class JetLiteFixture extends KotlinTestWithEnvironment {
Assert.assertNotNull(testName);
fileName = testName + ".jet";
}
return (JetFile) JetTestUtils.createFile(fileName, text, getProject());
return JetTestUtils.createFile(fileName, text, getProject());
}
protected JetFile loadPsiFile(String name) {
compiler/tests/org/jetbrains/jet/JetTestUtils.java
+2 -2
View File
@@ -263,10 +263,10 @@ public class JetTestUtils {
public static final Pattern FILE_PATTERN = Pattern.compile("//\\s*FILE:\\s*(.*)$", Pattern.MULTILINE);
public static PsiFile createFile(@NonNls String name, String text, @NotNull Project project) {
public static JetFile createFile(@NonNls String name, String text, @NotNull Project project) {
LightVirtualFile virtualFile = new LightVirtualFile(name, JetLanguage.INSTANCE, text);
virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET);
return ((PsiFileFactoryImpl) PsiFileFactory.getInstance(project)).trySetupPsiForFile(virtualFile, JetLanguage.INSTANCE, true, false);
return (JetFile) ((PsiFileFactoryImpl) PsiFileFactory.getInstance(project)).trySetupPsiForFile(virtualFile, JetLanguage.INSTANCE, true, false);
}
public static String doLoadFile(String myFullDataPath, String name) throws IOException {
compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTest.java
+1 -4
View File
@@ -67,10 +67,7 @@ public class CheckLocalVariablesTableTest extends TestCaseWithTmpdir {
String text = FileUtil.loadFile(ktFile);
LightVirtualFile virtualFile = new LightVirtualFile(ktFile.getName(), JetLanguage.INSTANCE, text);
virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET);
JetFile psiFile = (JetFile) ((PsiFileFactoryImpl) PsiFileFactory.getInstance(jetCoreEnvironment.getProject()))
.trySetupPsiForFile(virtualFile, JetLanguage.INSTANCE, true, false);
JetFile psiFile = JetTestUtils.createFile(ktFile.getName(), text, jetCoreEnvironment.getProject());
assert psiFile != null;
final ClassFileFactory factory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile);
compiler/tests/org/jetbrains/jet/codegen/CodegenTestFiles.java
+2 -2
View File
@@ -96,7 +96,7 @@ public class CodegenTestFiles {
String content = JetTestUtils.doLoadFile(JetParsingTest.getTestDataDir() + "/codegen/", name);
int i = name.lastIndexOf('/');
name = name.substring(i+1);
JetFile file = (JetFile) JetTestUtils.createFile(name, content, project);
JetFile file = JetTestUtils.createFile(name, content, project);
files.add(file);
} catch (IOException e) {
throw new RuntimeException(e);
@@ -107,7 +107,7 @@ public class CodegenTestFiles {
@NotNull
public static CodegenTestFiles create(@NotNull String fileName, @NotNull String content, @NotNull Project project) {
JetFile file = (JetFile) JetTestUtils.createFile(fileName, content, project);
JetFile file = JetTestUtils.createFile(fileName, content, project);
List<Pair<String, String>> expectedValues = Lists.newArrayList();
compiler/tests/org/jetbrains/jet/codegen/WriteAccessFlagsTest.java
+1 -4
View File
@@ -66,10 +66,7 @@ public class WriteAccessFlagsTest extends TestCaseWithTmpdir {
String text = FileUtil.loadFile(ktFile);
LightVirtualFile virtualFile = new LightVirtualFile(ktFile.getName(), JetLanguage.INSTANCE, text);
virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET);
JetFile psiFile = (JetFile) ((PsiFileFactoryImpl) PsiFileFactory.getInstance(jetCoreEnvironment.getProject()))
.trySetupPsiForFile(virtualFile, JetLanguage.INSTANCE, true, false);
JetFile psiFile = JetTestUtils.createFile(ktFile.getName(), text, jetCoreEnvironment.getProject());
assert psiFile != null;
final ClassFileFactory factory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile);
compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractReadJavaBinaryClassTest.java
+1 -4
View File
@@ -66,10 +66,7 @@ public abstract class AbstractReadJavaBinaryClassTest extends TestCaseWithTmpdir
String text = FileUtil.loadFile(ktFile);
LightVirtualFile virtualFile = new LightVirtualFile(ktFile.getName(), JetLanguage.INSTANCE, text);
virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET);
JetFile psiFile = (JetFile) ((PsiFileFactoryImpl) PsiFileFactory.getInstance(jetCoreEnvironment.getProject())).trySetupPsiForFile(
virtualFile, JetLanguage.INSTANCE, true, false);
JetFile psiFile = JetTestUtils.createFile(ktFile.getName(), text, jetCoreEnvironment.getProject());
BindingContext bindingContext = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegrationAndCheckForErrors(
psiFile, Collections.<AnalyzerScriptParameter>emptyList(), BuiltinsScopeExtensionMode.ALL).getBindingContext();
compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTest.java
+1 -4
View File
@@ -71,12 +71,9 @@ public class CompileJavaAgainstKotlinTest extends TestCaseWithTmpdir {
protected void runTest() throws Throwable {
jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable);
String text = FileUtil.loadFile(ktFile);
LightVirtualFile virtualFile = new LightVirtualFile(ktFile.getName(), JetLanguage.INSTANCE, text);
virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET);
JetFile psiFile = (JetFile) ((PsiFileFactoryImpl) PsiFileFactory.getInstance(jetCoreEnvironment.getProject())).trySetupPsiForFile(virtualFile, JetLanguage.INSTANCE, true, false);
JetFile psiFile = JetTestUtils.createFile(ktFile.getName(), text, jetCoreEnvironment.getProject());
ClassFileFactory classFileFactory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile);
compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTest.java
+3 -7
View File
@@ -90,10 +90,8 @@ public class CompileKotlinAgainstKotlinTest extends TestCaseWithTmpdir {
String text = FileUtil.loadFile(ktAFile);
LightVirtualFile virtualFile = new LightVirtualFile(ktAFile.getName(), JetLanguage.INSTANCE, text);
virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET);
JetFile psiFile = (JetFile) ((PsiFileFactoryImpl) PsiFileFactory.getInstance(jetCoreEnvironment.getProject())).trySetupPsiForFile(virtualFile, JetLanguage.INSTANCE, true, false);
JetFile psiFile = JetTestUtils.createFile(ktAFile.getName(), text, jetCoreEnvironment.getProject());
ClassFileFactory classFileFactory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile);
CompileEnvironmentUtil.writeToOutputDirectory(classFileFactory, aDir);
@@ -107,9 +105,7 @@ public class CompileKotlinAgainstKotlinTest extends TestCaseWithTmpdir {
String text = FileUtil.loadFile(ktBFile);
LightVirtualFile virtualFile = new LightVirtualFile(ktBFile.getName(), JetLanguage.INSTANCE, text);
virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET);
JetFile psiFile = (JetFile) ((PsiFileFactoryImpl) PsiFileFactory.getInstance(jetCoreEnvironment.getProject())).trySetupPsiForFile(virtualFile, JetLanguage.INSTANCE, true, false);
JetFile psiFile = JetTestUtils.createFile(ktBFile.getName(), text, jetCoreEnvironment.getProject());
ClassFileFactory classFileFactory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile);
compiler/tests/org/jetbrains/jet/jvm/compiler/ReadKotlinBinaryClassTest.java
+1 -3
View File
@@ -71,9 +71,7 @@ public class ReadKotlinBinaryClassTest extends TestCaseWithTmpdir {
String text = FileUtil.loadFile(testFile);
LightVirtualFile virtualFile = new LightVirtualFile(testFile.getName(), JetLanguage.INSTANCE, text);
virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET);
JetFile psiFile = (JetFile) ((PsiFileFactoryImpl) PsiFileFactory.getInstance(jetCoreEnvironment.getProject())).trySetupPsiForFile(virtualFile, JetLanguage.INSTANCE, true, false);
JetFile psiFile = JetTestUtils.createFile(testFile.getName(), text, jetCoreEnvironment.getProject());
GenerationState state = GenerationUtils.compileFileGetGenerationStateForTest(psiFile);
compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTest.java
+1 -4
View File
@@ -75,12 +75,9 @@ public class WriteSignatureTest extends TestCaseWithTmpdir {
protected void runTest() throws Throwable {
jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable);
String text = FileUtil.loadFile(ktFile);
LightVirtualFile virtualFile = new LightVirtualFile(ktFile.getName(), JetLanguage.INSTANCE, text);
virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET);
JetFile psiFile = (JetFile) ((PsiFileFactoryImpl) PsiFileFactory.getInstance(jetCoreEnvironment.getProject())).trySetupPsiForFile(virtualFile, JetLanguage.INSTANCE, true, false);
JetFile psiFile = JetTestUtils.createFile(ktFile.getName(), text, jetCoreEnvironment.getProject());
ClassFileFactory classFileFactory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile);
idea/tests/org/jetbrains/jet/plugin/debugger/PositionManagerTestCase.java
+1 -1
View File
@@ -118,7 +118,7 @@ public abstract class PositionManagerTestCase extends PlatformTestCase {
catch (IOException e) {
throw ExceptionUtils.rethrow(e);
}
final JetFile jetFile = (JetFile)JetTestUtils.createFile(file.getAbsolutePath(), fileContent, getProject());
final JetFile jetFile = JetTestUtils.createFile(file.getAbsolutePath(), fileContent, getProject());
files.add(jetFile);
breakpoints.addAll(extractBreakpointsInfo(jetFile, fileContent));