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

FullJetPsiCheckerTest -> JetLiteFixture

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-10-27 18:12:24 +02:00
parent e52cfef3a9
commit 655d2bd632
3 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/JetLiteFixture.java
+1 -1
View File
@@ -26,7 +26,7 @@ import java.io.IOException;
public abstract class JetLiteFixture extends UsefulTestCase { public abstract class JetLiteFixture extends UsefulTestCase {
@NonNls @NonNls
protected final String myFullDataPath; protected final String myFullDataPath;
protected PsiFile myFile; protected JetFile myFile;
private JetCoreEnvironment myEnvironment; private JetCoreEnvironment myEnvironment;
public JetLiteFixture(@NonNls String dataPath) { public JetLiteFixture(@NonNls String dataPath) {
compiler/tests/org/jetbrains/jet/checkers/FullJetPsiCheckerTest.java
+13 -23
View File
@@ -2,39 +2,34 @@ package org.jetbrains.jet.checkers;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.CharsetToolkit;
import com.intellij.testFramework.LightPlatformCodeInsightTestCase;
import junit.framework.Test; import junit.framework.Test;
import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetLiteFixture;
import org.jetbrains.jet.JetTestCaseBase; import org.jetbrains.jet.JetTestCaseBase;
import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacade; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacade;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.regex.Pattern;
/** /**
* @author abreslav * @author abreslav
*/ */
public class FullJetPsiCheckerTest extends JetTestCaseBase { public class FullJetPsiCheckerTest extends JetLiteFixture {
private final String myDataPath;
private String myName;
public FullJetPsiCheckerTest(@NonNls String dataPath, String name) { public FullJetPsiCheckerTest(@NonNls String dataPath, String name) {
super(dataPath, name); myDataPath = dataPath;
myName = name;
} }
@Override @Override
public void runTest() throws Exception { public void runTest() throws Exception {
String fileName = name + ".jet"; String fileName = myName + ".jet";
String fullPath = getTestDataPath() + getTestFilePath(); String fullPath = myDataPath + "/" + fileName;
String expectedText = loadFile(fullPath); String expectedText = loadFile(fullPath);
@@ -42,9 +37,8 @@ public class FullJetPsiCheckerTest extends JetTestCaseBase {
List<CheckerTestUtil.DiagnosedRange> diagnosedRanges = Lists.newArrayList(); List<CheckerTestUtil.DiagnosedRange> diagnosedRanges = Lists.newArrayList();
String clearText = CheckerTestUtil.parseDiagnosedRanges(expectedText, diagnosedRanges); String clearText = CheckerTestUtil.parseDiagnosedRanges(expectedText, diagnosedRanges);
configureFromFileText(fileName, clearText); myFile = createPsiFile(myName, clearText);
JetFile jetFile = (JetFile) myFile; BindingContext bindingContext = AnalyzerFacade.analyzeFileWithCache(myFile);
BindingContext bindingContext = AnalyzerFacade.analyzeFileWithCache(jetFile);
CheckerTestUtil.diagnosticsDiff(diagnosedRanges, bindingContext.getDiagnostics(), new CheckerTestUtil.DiagnosticDiffCallbacks() { CheckerTestUtil.diagnosticsDiff(diagnosedRanges, bindingContext.getDiagnostics(), new CheckerTestUtil.DiagnosticDiffCallbacks() {
@Override @Override
@@ -60,7 +54,7 @@ public class FullJetPsiCheckerTest extends JetTestCaseBase {
} }
}); });
String actualText = CheckerTestUtil.addDiagnosticMarkersToText(jetFile, bindingContext).toString(); String actualText = CheckerTestUtil.addDiagnosticMarkersToText(myFile, bindingContext).toString();
assertEquals(expectedText, actualText); assertEquals(expectedText, actualText);
@@ -69,12 +63,7 @@ public class FullJetPsiCheckerTest extends JetTestCaseBase {
// convert(new File(myFullDataPath + "/../../checker/"), new File(myFullDataPath)); // convert(new File(myFullDataPath + "/../../checker/"), new File(myFullDataPath));
} }
private String loadFile(String fullPath) throws IOException { /*
final File ioFile = new File(fullPath);
String fileText = FileUtil.loadFile(ioFile, CharsetToolkit.UTF8);
return StringUtil.convertLineSeparators(fileText);
}
private void convert(File src, File dest) throws IOException { private void convert(File src, File dest) throws IOException {
File[] files = src.listFiles(); File[] files = src.listFiles();
for (File file : files) { for (File file : files) {
@@ -105,6 +94,7 @@ public class FullJetPsiCheckerTest extends JetTestCaseBase {
} }
} }
} }
*/
public static Test suite() { public static Test suite() {
return JetTestCaseBase.suiteForDirectory(JetTestCaseBase.getTestDataPathBase(), "/checkerWithErrorTypes/full/", true, new JetTestCaseBase.NamedTestFactory() { return JetTestCaseBase.suiteForDirectory(JetTestCaseBase.getTestDataPathBase(), "/checkerWithErrorTypes/full/", true, new JetTestCaseBase.NamedTestFactory() {
compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java
-1
View File
@@ -20,7 +20,6 @@ import java.util.Map;
*/ */
public abstract class CodegenTestCase extends JetLiteFixture { public abstract class CodegenTestCase extends JetLiteFixture {
private MyClassLoader myClassLoader; private MyClassLoader myClassLoader;
private JetFile myFile;
protected static void assertThrows(Method foo, Class<? extends Throwable> exceptionClass, Object instance, Object... args) throws IllegalAccessException { protected static void assertThrows(Method foo, Class<? extends Throwable> exceptionClass, Object instance, Object... args) throws IllegalAccessException {
boolean caught = false; boolean caught = false;