From 2923c1f32eb5c0e42244cc6341a7286a01b036d6 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Thu, 26 Jul 2012 17:41:46 +0400
Subject: [PATCH] Simple LR Tests don't need to compare all the packages in the
 world

---
 .../InnerClassNameClash.kt                    |  2 ++
 .../InnerClassNameClash.txt                   | 16 +++++++--------
 .../lazyResolve/namespaceComparator/enum.kt   |  2 ++
 .../lazyResolve/namespaceComparator/enum.txt  | 14 ++++++-------
 .../namespaceComparator/genericFunction.kt    |  2 ++
 .../namespaceComparator/genericFunction.txt   |  2 +-
 .../namespaceComparator/innerObject.kt        |  2 ++
 .../namespaceComparator/innerObject.txt       |  8 ++++----
 .../namespaceComparator/packageLevelObject.kt |  2 +-
 .../packageLevelObject.txt                    |  8 ++------
 .../namespaceComparator/simpleClass.kt        | 12 ++++++-----
 .../namespaceComparator/simpleClass.txt       | 20 +++++++++----------
 .../namespaceComparator/varargIterator.kt     |  2 ++
 .../namespaceComparator/varargIterator.txt    |  6 +++---
 ...ractLazyResolveNamespaceComparingTest.java |  2 +-
 ...esolveNamespaceComparingTestGenerated.java | 14 ++++++-------
 16 files changed, 61 insertions(+), 53 deletions(-)

diff --git a/compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.kt b/compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.kt
index fe9f8836786..89bb533a588 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.kt
+++ b/compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.kt
@@ -1,3 +1,5 @@
+package test
+
 class B {
     class B {
       fun foo(b: B.C) {
diff --git a/compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.txt b/compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.txt
index ccf22fd2d46..1fb05a22ffc 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.txt
@@ -1,12 +1,12 @@
-namespace <root>
+namespace test
 
-internal final class B : jet.Any {
-    public final /*constructor*/ fun <init>(): B
-    internal final class B.B : jet.Any {
-        public final /*constructor*/ fun <init>(): B.B
-        internal final class B.B.C : jet.Any {
-            public final /*constructor*/ fun <init>(): B.B.C
+internal final class test.B : jet.Any {
+    public final /*constructor*/ fun <init>(): test.B
+    internal final class test.B.B : jet.Any {
+        public final /*constructor*/ fun <init>(): test.B.B
+        internal final fun foo(/*0*/ b: test.B.B.C): jet.Tuple0
+        internal final class test.B.B.C : jet.Any {
+            public final /*constructor*/ fun <init>(): test.B.B.C
         }
-        internal final fun foo(/*0*/ b: B.B.C): jet.Tuple0
     }
 }
diff --git a/compiler/testData/lazyResolve/namespaceComparator/enum.kt b/compiler/testData/lazyResolve/namespaceComparator/enum.kt
index 32e77b1a5f8..bce37d628a4 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/enum.kt
+++ b/compiler/testData/lazyResolve/namespaceComparator/enum.kt
@@ -1,3 +1,5 @@
+package test
+
 enum class Test(a : Int) {
   A : Test(0)
   B(x : Int) : Test(x)
diff --git a/compiler/testData/lazyResolve/namespaceComparator/enum.txt b/compiler/testData/lazyResolve/namespaceComparator/enum.txt
index c7e0d969de5..7ba892f5636 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/enum.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/enum.txt
@@ -1,10 +1,10 @@
-namespace <root>
+namespace test
 
-internal final enum class Test : jet.Any {
-    public final /*constructor*/ fun <init>(/*0*/ a: jet.Int): Test
-    internal final class object Test.<class-object-for-Test> {
-        internal final /*constructor*/ fun <init>(): Test.<class-object-for-Test>
-        internal final val A: Test.<class-object-for-Test>.A
-        internal final val C: Test.<class-object-for-Test>.C
+internal final enum class test.Test : jet.Any {
+    public final /*constructor*/ fun <init>(/*0*/ a: jet.Int): test.Test
+    internal final class object test.Test.<class-object-for-Test> {
+        internal final /*constructor*/ fun <init>(): test.Test.<class-object-for-Test>
+        internal final val A: test.Test.<class-object-for-Test>.A
+        internal final val C: test.Test.<class-object-for-Test>.C
     }
 }
diff --git a/compiler/testData/lazyResolve/namespaceComparator/genericFunction.kt b/compiler/testData/lazyResolve/namespaceComparator/genericFunction.kt
index 1a362e79552..f42ba242e51 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/genericFunction.kt
+++ b/compiler/testData/lazyResolve/namespaceComparator/genericFunction.kt
@@ -1 +1,3 @@
+package test
+
 fun <T> foo(t : T) : T {}
\ No newline at end of file
diff --git a/compiler/testData/lazyResolve/namespaceComparator/genericFunction.txt b/compiler/testData/lazyResolve/namespaceComparator/genericFunction.txt
index 9ed2b242fef..01145831f9f 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/genericFunction.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/genericFunction.txt
@@ -1,3 +1,3 @@
-namespace <root>
+namespace test
 
 internal final fun </*0*/ T : jet.Any?>foo(/*0*/ t: T): T
diff --git a/compiler/testData/lazyResolve/namespaceComparator/innerObject.kt b/compiler/testData/lazyResolve/namespaceComparator/innerObject.kt
index e450e8587d3..5c3a9cfce8d 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/innerObject.kt
+++ b/compiler/testData/lazyResolve/namespaceComparator/innerObject.kt
@@ -1,3 +1,5 @@
+package test
+
 class B {
   object Obj {}
 }
\ No newline at end of file
diff --git a/compiler/testData/lazyResolve/namespaceComparator/innerObject.txt b/compiler/testData/lazyResolve/namespaceComparator/innerObject.txt
index ac066655782..3d5137b41d0 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/innerObject.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/innerObject.txt
@@ -1,6 +1,6 @@
-namespace <root>
+namespace test
 
-internal final class B : jet.Any {
-    public final /*constructor*/ fun <init>(): B
-    internal final val Obj: B.Obj
+internal final class test.B : jet.Any {
+    public final /*constructor*/ fun <init>(): test.B
+    internal final val Obj: test.B.Obj
 }
diff --git a/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.kt b/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.kt
index dc2194f9876..7f4b7548078 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.kt
+++ b/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.kt
@@ -1,4 +1,4 @@
-package foo
+package test
 
 object Bar {
 }
\ No newline at end of file
diff --git a/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.txt b/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.txt
index 10ca6ab510d..bff1bb4b0d3 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.txt
@@ -1,7 +1,3 @@
-namespace <root>
+namespace test
 
-// <namespace name="foo">
-namespace foo
-
-internal final val Bar: foo.Bar
-// </namespace name="foo">
+internal final val Bar: test.Bar
diff --git a/compiler/testData/lazyResolve/namespaceComparator/simpleClass.kt b/compiler/testData/lazyResolve/namespaceComparator/simpleClass.kt
index f694a892512..f8065d9a914 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/simpleClass.kt
+++ b/compiler/testData/lazyResolve/namespaceComparator/simpleClass.kt
@@ -1,17 +1,19 @@
 // FILE: a.kt
+package test
+
 class A {}
 
 // FILE: b.kt
-package p; class C {fun f() {}}
+package test.p; class C {fun f() {}}
 
 // FILE: c.kt
-package p; open class G<T> {open fun f(): T {} fun a() {}}
+package test.p; open class G<T> {open fun f(): T {} fun a() {}}
 
 // FILE: d.kt
-package p; class G2<E> : G<E> { fun g() : E {} override fun f() : E {}}
+package test.p; class G2<E> : G<E> { fun g() : E {} override fun f() : E {}}
 
 // FILE: e.kt
-package p; fun foo() {}
+package test.p; fun foo() {}
 
 // FILE: f.kt
-package p; fun foo(a: C) {}
+package test.p; fun foo(a: C) {}
diff --git a/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt b/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt
index 2684ef13b31..6412347532c 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt
@@ -1,26 +1,26 @@
-namespace <root>
+namespace test
 
 // <namespace name="p">
 namespace p
 
-internal final class p.C : jet.Any {
-    public final /*constructor*/ fun <init>(): p.C
+internal final class test.p.C : jet.Any {
+    public final /*constructor*/ fun <init>(): test.p.C
     internal final fun f(): jet.Tuple0
 }
-internal open class p.G</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): p.G<T>
+internal open class test.p.G</*0*/ T : jet.Any?> : jet.Any {
+    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.p.G<T>
     internal final fun a(): jet.Tuple0
     internal open fun f(): T
 }
-internal final class p.G2</*0*/ E : jet.Any?> : p.G<E> {
-    public final /*constructor*/ fun </*0*/ E : jet.Any?><init>(): p.G2<E>
+internal final class test.p.G2</*0*/ E : jet.Any?> : test.p.G<E> {
+    public final /*constructor*/ fun </*0*/ E : jet.Any?><init>(): test.p.G2<E>
     internal final override /*1*/ fun a(): jet.Tuple0
     internal open override /*1*/ fun f(): E
     internal final fun g(): E
 }
 internal final fun foo(): jet.Tuple0
-internal final fun foo(/*0*/ a: p.C): jet.Tuple0
+internal final fun foo(/*0*/ a: test.p.C): jet.Tuple0
 // </namespace name="p">
-internal final class A : jet.Any {
-    public final /*constructor*/ fun <init>(): A
+internal final class test.A : jet.Any {
+    public final /*constructor*/ fun <init>(): test.A
 }
diff --git a/compiler/testData/lazyResolve/namespaceComparator/varargIterator.kt b/compiler/testData/lazyResolve/namespaceComparator/varargIterator.kt
index 4f2da6df11a..6a70c934eac 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/varargIterator.kt
+++ b/compiler/testData/lazyResolve/namespaceComparator/varargIterator.kt
@@ -1,3 +1,5 @@
+package test
+
 class CompositeIterator<T>(vararg iterators: java.util.Iterator<T>){
     val iteratorsIter = iterators.iterator()
 }
diff --git a/compiler/testData/lazyResolve/namespaceComparator/varargIterator.txt b/compiler/testData/lazyResolve/namespaceComparator/varargIterator.txt
index 6ece491b5ef..8a098e477de 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/varargIterator.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/varargIterator.txt
@@ -1,6 +1,6 @@
-namespace <root>
+namespace test
 
-internal final class CompositeIterator</*0*/ T : jet.Any?> : jet.Any {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ vararg iterators: java.util.Iterator<T> /*jet.Array<java.util.Iterator<T>>*/): CompositeIterator<T>
+internal final class test.CompositeIterator</*0*/ T : jet.Any?> : jet.Any {
+    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ vararg iterators: java.util.Iterator<T> /*jet.Array<java.util.Iterator<T>>*/): test.CompositeIterator<T>
     internal final val iteratorsIter: jet.Iterator<java.util.Iterator<T>>
 }
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 d9b9056e03b..18d89d21971 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java
@@ -150,7 +150,7 @@ public abstract class AbstractLazyResolveNamespaceComparingTest extends KotlinTe
                     new SimpleTestClassModel(new File("compiler/testData/lazyResolve/namespaceComparator"),
                                              true,
                                              extension,
-                                             "doTest")
+                                             "doTestSinglePackage")
             ),
             AbstractLazyResolveNamespaceComparingTest.class
         ).generateAndSave();
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
index 85aac6a34a8..ad411ea5f69 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
@@ -1269,37 +1269,37 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
         
         @TestMetadata("enum.kt")
         public void testEnum() throws Exception {
-            doTest("compiler/testData/lazyResolve/namespaceComparator/enum.kt");
+            doTestSinglePackage("compiler/testData/lazyResolve/namespaceComparator/enum.kt");
         }
         
         @TestMetadata("genericFunction.kt")
         public void testGenericFunction() throws Exception {
-            doTest("compiler/testData/lazyResolve/namespaceComparator/genericFunction.kt");
+            doTestSinglePackage("compiler/testData/lazyResolve/namespaceComparator/genericFunction.kt");
         }
         
         @TestMetadata("InnerClassNameClash.kt")
         public void testInnerClassNameClash() throws Exception {
-            doTest("compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.kt");
+            doTestSinglePackage("compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.kt");
         }
         
         @TestMetadata("innerObject.kt")
         public void testInnerObject() throws Exception {
-            doTest("compiler/testData/lazyResolve/namespaceComparator/innerObject.kt");
+            doTestSinglePackage("compiler/testData/lazyResolve/namespaceComparator/innerObject.kt");
         }
         
         @TestMetadata("packageLevelObject.kt")
         public void testPackageLevelObject() throws Exception {
-            doTest("compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.kt");
+            doTestSinglePackage("compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.kt");
         }
         
         @TestMetadata("simpleClass.kt")
         public void testSimpleClass() throws Exception {
-            doTest("compiler/testData/lazyResolve/namespaceComparator/simpleClass.kt");
+            doTestSinglePackage("compiler/testData/lazyResolve/namespaceComparator/simpleClass.kt");
         }
         
         @TestMetadata("varargIterator.kt")
         public void testVarargIterator() throws Exception {
-            doTest("compiler/testData/lazyResolve/namespaceComparator/varargIterator.kt");
+            doTestSinglePackage("compiler/testData/lazyResolve/namespaceComparator/varargIterator.kt");
         }
         
     }