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

Cleanup

Browse Source
This commit is contained in:
Andrey Breslav
2012-07-11 16:41:04 +04:00
parent be6464d068
commit dbca884b85
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java
+7 -7
View File
@@ -76,7 +76,7 @@ public abstract class AbstractJetDiagnosticsTest extends JetLiteFixture {
String expectedText = JetTestUtils.doLoadFile(file); String expectedText = JetTestUtils.doLoadFile(file);
final Ref<Boolean> hasJavaFiles = new Ref<Boolean>(false); final Ref<Boolean> hasJavaFiles = new Ref<Boolean>(false);
List<TestFile> testFileFiles = List<TestFile> testFiles =
JetTestUtils.createTestFiles(file.getName(), expectedText, new JetTestUtils.TestFileFactory<TestFile>() { JetTestUtils.createTestFiles(file.getName(), expectedText, new JetTestUtils.TestFileFactory<TestFile>() {
@Override @Override
public TestFile create(String fileName, String text) { public TestFile create(String fileName, String text) {
@@ -94,9 +94,9 @@ public abstract class AbstractJetDiagnosticsTest extends JetLiteFixture {
} }
List<JetFile> jetFiles = Lists.newArrayList(); List<JetFile> jetFiles = Lists.newArrayList();
for (TestFile testFileFile : testFileFiles) { for (TestFile testFile : testFiles) {
if (testFileFile.jetFile != null) { if (testFile.jetFile != null) {
jetFiles.add(testFileFile.jetFile); jetFiles.add(testFile.jetFile);
} }
} }
@@ -107,13 +107,13 @@ public abstract class AbstractJetDiagnosticsTest extends JetLiteFixture {
boolean ok = true; boolean ok = true;
StringBuilder actualText = new StringBuilder(); StringBuilder actualText = new StringBuilder();
for (TestFile testFileFile : testFileFiles) { for (TestFile testFileFile : testFiles) {
ok &= 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); assertTrue("Diagnostics mismatch. See the output above", ok);
} }
private class TestFile { private class TestFile {
@@ -148,7 +148,7 @@ public abstract class AbstractJetDiagnosticsTest extends JetLiteFixture {
return true; return true;
} }
final boolean ok[] = { true }; 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