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

added CHECK_TYPE directive to diagnostic tests

Browse Source
This commit is contained in:
Svetlana Isakova
2013-12-18 16:11:56 +04:00
parent c9a600a405
commit dd6940be41
14 changed files with 95 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/JetTestUtils.java
+3 -3
View File
@@ -87,10 +87,10 @@ import static org.jetbrains.jet.cli.jvm.JVMConfigurationKeys.CLASSPATH_KEY;
public class JetTestUtils {
private static final Pattern KT_FILES = Pattern.compile(".*?.kt");
private static List<File> filesToDelete = new ArrayList<File>();
private static final List<File> filesToDelete = new ArrayList<File>();
public static final Pattern FILE_PATTERN = Pattern.compile("//\\s*FILE:\\s*(.*)$", Pattern.MULTILINE);
public static final Pattern DIRECTIVE_PATTERN = Pattern.compile("^//\\s*!(\\w+):\\s*(.*)$", Pattern.MULTILINE);
public static final Pattern DIRECTIVE_PATTERN = Pattern.compile("^//\\s*!(\\w+)(:\\s*(.*)$)?", Pattern.MULTILINE);
public static final BindingTrace DUMMY_TRACE = new BindingTrace() {
@@ -453,7 +453,7 @@ public class JetTestUtils {
Assert.fail("Directives should only occur at the beginning of a file: " + directiveMatcher.group());
}
String name = directiveMatcher.group(1);
String value = directiveMatcher.group(2);
String value = directiveMatcher.group(3);
String oldValue = directives.put(name, value);
Assert.assertNull("Directive overwritten: " + name + " old value: " + oldValue + " new value: " + value, oldValue);
start = directiveMatcher.end() + 1;
compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java
+27 -9
View File
@@ -24,7 +24,10 @@ import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.Conditions;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiFileFactory;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -61,6 +64,9 @@ public abstract class AbstractJetDiagnosticsTest extends JetLiteFixture {
CheckerTestUtil.DebugInfoDiagnosticFactory.MISSING_UNRESOLVED,
CheckerTestUtil.DebugInfoDiagnosticFactory.UNRESOLVED_WITH_TARGET
);
public static final String CHECK_TYPE_DIRECTIVE = "CHECK_TYPE";
private static final String CHECK_TYPE_DECLARATIONS = "\nclass _<T>" +
"\nfun <T> T.checkType(f: (_<T>) -> Unit) = f";
@Override
protected JetCoreEnvironment createEnvironment() {
@@ -103,7 +109,7 @@ public abstract class AbstractJetDiagnosticsTest extends JetLiteFixture {
if (fileName.endsWith(".java")) {
writeJavaFile(fileName, text, javaFilesDir);
}
return new TestFile(fileName, text, parseDiagnosticFilterDirective(directives));
return new TestFile(fileName, text, directives);
}
});
@@ -125,8 +131,8 @@ public abstract class AbstractJetDiagnosticsTest extends JetLiteFixture {
return jetFiles;
}
public static Condition<Diagnostic> parseDiagnosticFilterDirective(Map<String, String> diagnostics) {
String directives = diagnostics.get(DIAGNOSTICS_DIRECTIVE);
public static Condition<Diagnostic> parseDiagnosticFilterDirective(Map<String, String> directiveMap) {
String directives = directiveMap.get(DIAGNOSTICS_DIRECTIVE);
if (directives == null) {
return Conditions.alwaysTrue();
}
@@ -197,9 +203,15 @@ public abstract class AbstractJetDiagnosticsTest extends JetLiteFixture {
private final String clearText;
private final JetFile jetFile;
private final Condition<Diagnostic> whatDiagnosticsToConsider;
private final boolean declareCheckType;
public TestFile(String fileName, String textWithMarkers, Condition<Diagnostic> whatDiagnosticsToConsider) {
this.whatDiagnosticsToConsider = whatDiagnosticsToConsider;
public TestFile(
String fileName,
String textWithMarkers,
Map<String, String> directives
) {
this.whatDiagnosticsToConsider = parseDiagnosticFilterDirective(directives);
this.declareCheckType = directives.containsKey(CHECK_TYPE_DIRECTIVE);
if (fileName.endsWith(".java")) {
PsiFileFactory.getInstance(getProject()).createFileFromText(fileName, JavaLanguage.INSTANCE, textWithMarkers);
// TODO: check there's not syntax errors
@@ -209,13 +221,15 @@ public abstract class AbstractJetDiagnosticsTest extends JetLiteFixture {
else {
expectedText = textWithMarkers;
clearText = CheckerTestUtil.parseDiagnosedRanges(expectedText, diagnosedRanges);
this.jetFile = createCheckAndReturnPsiFile(null, fileName, clearText);
this.jetFile = createCheckAndReturnPsiFile(
null, fileName, declareCheckType ? clearText + CHECK_TYPE_DECLARATIONS : clearText);
for (CheckerTestUtil.DiagnosedRange diagnosedRange : diagnosedRanges) {
diagnosedRange.setFile(jetFile);
}
}
}
@Nullable
public JetFile getJetFile() {
return jetFile;
@@ -250,10 +264,14 @@ public abstract class AbstractJetDiagnosticsTest extends JetLiteFixture {
}
});
actualText.append(CheckerTestUtil.addDiagnosticMarkersToText(jetFile, diagnostics));
actualText.append(CheckerTestUtil.addDiagnosticMarkersToText(jetFile, diagnostics, new Function<PsiFile, String>() {
@Override
public String fun(PsiFile file) {
String text = file.getText();
return declareCheckType ? StringUtil.trimEnd(text, CHECK_TYPE_DECLARATIONS) : text;
}
}));
return ok[0];
}
}
}
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+5
View File
@@ -119,6 +119,11 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
doTest("compiler/testData/diagnostics/tests/CharacterLiterals.kt");
}
@TestMetadata("checkType.kt")
public void testCheckType() throws Exception {
doTest("compiler/testData/diagnostics/tests/checkType.kt");
}
@TestMetadata("CompareToWithErrorType.kt")
public void testCompareToWithErrorType() throws Exception {
doTest("compiler/testData/diagnostics/tests/CompareToWithErrorType.kt");