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

catch error of string comparison in JetDiagnosticTest

Browse Source
This commit is contained in:
Stepan Koltsov
2011-12-31 00:53:22 +04:00
parent 0b93c1f8e8
commit b644e53725
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java
+10 -2
View File
@@ -53,7 +53,8 @@ public class JetDiagnosticsTest extends JetLiteFixture {
} }
} }
public void getActualText(BindingContext bindingContext, StringBuilder actualText) { public boolean getActualText(BindingContext bindingContext, StringBuilder actualText) {
final boolean ok[] = { true };
CheckerTestUtil.diagnosticsDiff(diagnosedRanges, CheckerTestUtil.getDiagnosticsIncludingSyntaxErrors(bindingContext, jetFile), new CheckerTestUtil.DiagnosticDiffCallbacks() { CheckerTestUtil.diagnosticsDiff(diagnosedRanges, CheckerTestUtil.getDiagnosticsIncludingSyntaxErrors(bindingContext, jetFile), new CheckerTestUtil.DiagnosticDiffCallbacks() {
@NotNull @NotNull
@Override @Override
@@ -65,16 +66,19 @@ public class JetDiagnosticsTest extends JetLiteFixture {
public void missingDiagnostic(String type, int expectedStart, int expectedEnd) { public void missingDiagnostic(String type, int expectedStart, int expectedEnd) {
String message = "Missing " + type + DiagnosticUtils.atLocation(jetFile, new TextRange(expectedStart, expectedEnd)); String message = "Missing " + type + DiagnosticUtils.atLocation(jetFile, new TextRange(expectedStart, expectedEnd));
System.err.println(message); System.err.println(message);
ok[0] = false;
} }
@Override @Override
public void unexpectedDiagnostic(String type, int actualStart, int actualEnd) { public void unexpectedDiagnostic(String type, int actualStart, int actualEnd) {
String message = "Unexpected " + type + DiagnosticUtils.atLocation(jetFile, new TextRange(actualStart, actualEnd)); String message = "Unexpected " + type + DiagnosticUtils.atLocation(jetFile, new TextRange(actualStart, actualEnd));
System.err.println(message); System.err.println(message);
ok[0] = false;
} }
}); });
actualText.append(CheckerTestUtil.addDiagnosticMarkersToText(jetFile, bindingContext, AnalyzingUtils.getSyntaxErrorRanges(jetFile))); actualText.append(CheckerTestUtil.addDiagnosticMarkersToText(jetFile, bindingContext, AnalyzingUtils.getSyntaxErrorRanges(jetFile)));
return ok[0];
} }
} }
@@ -108,12 +112,16 @@ public class JetDiagnosticsTest extends JetLiteFixture {
bindingContext = AnalyzingUtils.analyzeFiles(getProject(), Configuration.EMPTY, jetFiles, Predicates.<PsiFile>alwaysTrue(), JetControlFlowDataTraceFactory.EMPTY); bindingContext = AnalyzingUtils.analyzeFiles(getProject(), Configuration.EMPTY, jetFiles, Predicates.<PsiFile>alwaysTrue(), JetControlFlowDataTraceFactory.EMPTY);
} }
boolean ok = true;
StringBuilder actualText = new StringBuilder(); StringBuilder actualText = new StringBuilder();
for (TestFile testFileFile : testFileFiles) { for (TestFile testFileFile : testFileFiles) {
testFileFile.getActualText(bindingContext, actualText); ok &= testFileFile.getActualText(bindingContext, actualText);
} }
assertEquals(expectedText, actualText.toString()); assertEquals(expectedText, actualText.toString());
assertTrue("something is wrong is this test", ok);
} }
// private void convert(File src, File dest) throws IOException { // private void convert(File src, File dest) throws IOException {