KT-1973 added tests.

#KT-1973 Fixed
Frostman · Oct 3, 2012 · 22e62c5 · 22e62c5
1 parent f33669b
commit 22e62c5
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 0 deletions.
diff --git a/compiler/testData/loadKotlin/class/NamedObject.kt b/compiler/testData/loadKotlin/class/NamedObject.kt
@@ -0,0 +1,6 @@
+package test
+
+public object Obj {
+    public val v: String = "val"
+    public fun f(): String = "fun"
+}
diff --git a/compiler/testData/loadKotlin/class/NamedObject.txt b/compiler/testData/loadKotlin/class/NamedObject.txt
@@ -0,0 +1,8 @@
+namespace test
+
+public final object test.Obj : jet.Any {
+    private final /*constructor*/ fun <init>(): test.Obj
+    public final fun f(): jet.String
+    public final val v: jet.String
+}
+public final val Obj: test.Obj
diff --git a/compiler/testData/loadKotlin/class/NamedObjectWithAnotherTopLevelProperty.kt b/compiler/testData/loadKotlin/class/NamedObjectWithAnotherTopLevelProperty.kt
@@ -0,0 +1,8 @@
+package test
+
+public object Obj {
+    public val v: String = "val"
+    public fun f(): String = "fun"
+}
+
+val x = 5
diff --git a/compiler/testData/loadKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt b/compiler/testData/loadKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
@@ -0,0 +1,9 @@
+namespace test
+
+public final object test.Obj : jet.Any {
+    private final /*constructor*/ fun <init>(): test.Obj
+    public final fun f(): jet.String
+    public final val v: jet.String
+}
+public final val Obj: test.Obj
+internal final val x: jet.Int
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java
@@ -135,6 +135,16 @@ public void testInnerClassExtendInnerClass() throws Exception {
             doTest("compiler/testData/loadKotlin/class/InnerClassExtendInnerClass.kt");
         }
 
+        @TestMetadata("NamedObject.kt")
+        public void testNamedObject() throws Exception {
+            doTest("compiler/testData/loadKotlin/class/NamedObject.kt");
+        }
+
+        @TestMetadata("NamedObjectWithAnotherTopLevelProperty.kt")
+        public void testNamedObjectWithAnotherTopLevelProperty() throws Exception {
+            doTest("compiler/testData/loadKotlin/class/NamedObjectWithAnotherTopLevelProperty.kt");
+        }
+
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
             doTest("compiler/testData/loadKotlin/class/Trait.kt");

diff --git a/...tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/...tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
@@ -137,6 +137,16 @@ public void testInnerClassExtendInnerClass() throws Exception {
                 doTestSinglePackage("compiler/testData/loadKotlin/class/InnerClassExtendInnerClass.kt");
             }
 
+            @TestMetadata("NamedObject.kt")
+            public void testNamedObject() throws Exception {
+                doTestSinglePackage("compiler/testData/loadKotlin/class/NamedObject.kt");
+            }
+
+            @TestMetadata("NamedObjectWithAnotherTopLevelProperty.kt")
+            public void testNamedObjectWithAnotherTopLevelProperty() throws Exception {
+                doTestSinglePackage("compiler/testData/loadKotlin/class/NamedObjectWithAnotherTopLevelProperty.kt");
+            }
+
             @TestMetadata("Trait.kt")
             public void testTrait() throws Exception {
                 doTestSinglePackage("compiler/testData/loadKotlin/class/Trait.kt");