From 0d0d1ed3007edbb6236bcd7b9193ec89cbd6aea4 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Fri, 7 Jun 2013 19:45:50 +0400
Subject: [PATCH] Allow error types in some cases for lazy resolve tests

---
 ...bstractLazyResolveNamespaceComparingTest.java | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java
index 9b8368f3500..3aee75d6546 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java
@@ -44,18 +44,18 @@ public abstract class AbstractLazyResolveNamespaceComparingTest extends KotlinTe
     }
 
     protected void doTestCheckingPrimaryConstructors(String testFileName) throws IOException {
-        doTest(testFileName, true, false);
+        doTest(testFileName, true, false, true);
     }
 
     protected void doTestCheckingPrimaryConstructorsAndAccessors(String testFileName) throws IOException {
-        doTest(testFileName, true, true);
+        doTest(testFileName, true, true, false);
     }
 
     protected void doTestNotCheckingPrimaryConstructors(String testFileName) throws IOException {
-        doTest(testFileName, false, false);
+        doTest(testFileName, false, false, false);
     }
 
-    private void doTest(String testFileName, boolean checkPrimaryConstructors, boolean checkPropertyAccessors) throws IOException {
+    private void doTest(String testFileName, boolean checkPrimaryConstructors, boolean checkPropertyAccessors, boolean allowErrorTypes) throws IOException {
         List<JetFile> files = JetTestUtils
                 .createTestFiles(testFileName, FileUtil.loadFile(new File(testFileName), true),
                                  new JetTestUtils.TestFileFactory<JetFile>() {
@@ -78,7 +78,13 @@ public abstract class AbstractLazyResolveNamespaceComparingTest extends KotlinTe
 
         File serializeResultsTo = new File(FileUtil.getNameWithoutExtension(testFileName) + ".txt");
 
-        DescriptorValidator.validate(expected, actual);
+        if (allowErrorTypes) {
+            DescriptorValidator.validateIgnoringErrorTypes(expected, actual);
+        }
+        else {
+            DescriptorValidator.validate(expected, actual);
+        }
+
 
         NamespaceComparator.compareNamespaces(
                 expected, actual, NamespaceComparator.DONT_INCLUDE_METHODS_OF_OBJECT.filterRecursion(