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

Abstract Lazy test for gianostics

Browse Source
This commit is contained in:
Andrey Breslav
2012-07-11 17:53:34 +04:00
parent a65453a1bd
commit 55ff4ae941
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/checkers/AbstractDiagnosticsTestWithEagerResolve.java
+1 -7
View File
@@ -17,7 +17,6 @@
package org.jetbrains.jet.checkers;
import com.google.common.base.Predicates;
import com.google.common.collect.Lists;
import com.intellij.psi.PsiFile;
import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode;
import org.jetbrains.jet.lang.psi.JetFile;
@@ -39,12 +38,7 @@ import java.util.List;
public abstract class AbstractDiagnosticsTestWithEagerResolve extends AbstractJetDiagnosticsTest {
protected void analyzeAndCheck(String expectedText, List<TestFile> testFiles) {
List<JetFile> jetFiles = Lists.newArrayList();
for (TestFile testFile : testFiles) {
if (testFile.getJetFile() != null) {
jetFiles.add(testFile.getJetFile());
}
}
List<JetFile> jetFiles = getJetFiles(testFiles);
BindingContext bindingContext = AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(
getProject(), jetFiles, Collections.<AnalyzerScriptParameter>emptyList(),
compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java
+10
View File
@@ -91,6 +91,16 @@ public abstract class AbstractJetDiagnosticsTest extends JetLiteFixture {
protected abstract void analyzeAndCheck(String expectedText, List<TestFile> files);
protected static List<JetFile> getJetFiles(List<TestFile> testFiles) {
List<JetFile> jetFiles = Lists.newArrayList();
for (TestFile testFile : testFiles) {
if (testFile.getJetFile() != null) {
jetFiles.add(testFile.getJetFile());
}
}
return jetFiles;
}
protected class TestFile {
private final List<CheckerTestUtil.DiagnosedRange> diagnosedRanges = Lists.newArrayList();
private final String expectedText;
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDiagnosticsTest.java
+9
View File
@@ -16,10 +16,15 @@
package org.jetbrains.jet.lang.resolve.lazy;
import com.google.common.base.Predicates;
import junit.framework.TestCase;
import org.jetbrains.jet.ConfigurationKind;
import org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest;
import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.jvm.compiler.NamespaceComparator;
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.test.generator.SimpleTestClassModel;
import org.jetbrains.jet.test.generator.TestGenerator;
@@ -39,7 +44,11 @@ public abstract class AbstractLazyResolveDiagnosticsTest extends AbstractJetDiag
@Override
protected void analyzeAndCheck(String expectedText, List<TestFile> files) {
List<JetFile> jetFiles = getJetFiles(files);
ModuleDescriptor lazyModule = LazyResolveTestUtil.resolveLazily(jetFiles, getEnvironment());
ModuleDescriptor eagerModule = LazyResolveTestUtil.resolveEagerly(jetFiles, getEnvironment());
NamespaceComparator.assertNamespacesEqual(eagerModule.getRootNamespace(), lazyModule.getRootNamespace(), false, Predicates.<NamespaceDescriptor>alwaysTrue());
}
public static void main(String[] args) throws IOException {