From 55ff4ae941e12c170a5e49801e599827e6461e27 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Wed, 11 Jul 2012 17:53:34 +0400
Subject: [PATCH] Abstract Lazy test for gianostics

---
 .../AbstractDiagnosticsTestWithEagerResolve.java       |  8 +-------
 .../jet/checkers/AbstractJetDiagnosticsTest.java       | 10 ++++++++++
 .../lazy/AbstractLazyResolveDiagnosticsTest.java       |  9 +++++++++
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractDiagnosticsTestWithEagerResolve.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractDiagnosticsTestWithEagerResolve.java
index 58a0b7bbe6a..77b940858ad 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/AbstractDiagnosticsTestWithEagerResolve.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractDiagnosticsTestWithEagerResolve.java
@@ -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(),
diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java
index 4498b788303..224b863d6a3 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java
@@ -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;
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDiagnosticsTest.java
index fec99cb68aa..72a492a53e8 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDiagnosticsTest.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDiagnosticsTest.java
@@ -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 {