From 847d69ee2e670f547b84a16dc33f58446ba5a865 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Fri, 6 Sep 2013 11:51:36 +0400
Subject: [PATCH] Added tests for class object and nested objects.

---
 idea/testData/completion/injava/ClassObject.java  |  7 +++++++
 idea/testData/completion/injava/Nested.java       |  9 +++++++++
 .../completion/injava/NestedObjectInstance.java   |  7 +++++++
 idea/testData/completion/injava/mockLib/main.kt   |  9 +++++++++
 ...mpiledKotlinInJavaCompletionTestGenerated.java | 15 +++++++++++++++
 ...KotlinSourceInJavaCompletionTestGenerated.java | 15 +++++++++++++++
 6 files changed, 62 insertions(+)
 create mode 100644 idea/testData/completion/injava/ClassObject.java
 create mode 100644 idea/testData/completion/injava/Nested.java
 create mode 100644 idea/testData/completion/injava/NestedObjectInstance.java

diff --git a/idea/testData/completion/injava/ClassObject.java b/idea/testData/completion/injava/ClassObject.java
new file mode 100644
index 00000000000..5a3509692a3
--- /dev/null
+++ b/idea/testData/completion/injava/ClassObject.java
@@ -0,0 +1,7 @@
+public class Testing {
+    public static void test() {
+        mockLib.foo.LibClass.object$.<caret>
+    }
+}
+
+// EXIST: classObjectFun
\ No newline at end of file
diff --git a/idea/testData/completion/injava/Nested.java b/idea/testData/completion/injava/Nested.java
new file mode 100644
index 00000000000..862967b5fc4
--- /dev/null
+++ b/idea/testData/completion/injava/Nested.java
@@ -0,0 +1,9 @@
+import mockLib.foo
+
+public class Testing {
+    public static void test() {
+        new LibClass.<caret>
+    }
+}
+
+// EXIST: LibClass.Nested
diff --git a/idea/testData/completion/injava/NestedObjectInstance.java b/idea/testData/completion/injava/NestedObjectInstance.java
new file mode 100644
index 00000000000..40193306262
--- /dev/null
+++ b/idea/testData/completion/injava/NestedObjectInstance.java
@@ -0,0 +1,7 @@
+public class Testing {
+    public static void test() {
+        mockLib.foo.LibClass.object.NestedObject.<caret>
+    }
+}
+
+// EXIST: instance$
diff --git a/idea/testData/completion/injava/mockLib/main.kt b/idea/testData/completion/injava/mockLib/main.kt
index 92e2023499c..a1c9aab7bdd 100644
--- a/idea/testData/completion/injava/mockLib/main.kt
+++ b/idea/testData/completion/injava/mockLib/main.kt
@@ -3,6 +3,15 @@ package mockLib.foo
 public class LibClass {
     public fun foo() {
     }
+
+    class object {
+        fun classObjectFun() {
+        }
+
+        public object NestedObject
+    }
+
+    public class Nested
 }
 
 public trait LibTrait {
diff --git a/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java
index 3643498275a..e07b0f3df16 100644
--- a/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java
@@ -47,6 +47,11 @@ public class CompiledKotlinInJavaCompletionTestGenerated extends AbstractCompile
         doTest("idea/testData/completion/injava/ClassMembers.java");
     }
     
+    @TestMetadata("ClassObject.java")
+    public void testClassObject() throws Exception {
+        doTest("idea/testData/completion/injava/ClassObject.java");
+    }
+    
     @TestMetadata("ClassesFromNamespace.java")
     public void testClassesFromNamespace() throws Exception {
         doTest("idea/testData/completion/injava/ClassesFromNamespace.java");
@@ -57,6 +62,16 @@ public class CompiledKotlinInJavaCompletionTestGenerated extends AbstractCompile
         doTest("idea/testData/completion/injava/EnumConstants.java");
     }
     
+    @TestMetadata("Nested.java")
+    public void testNested() throws Exception {
+        doTest("idea/testData/completion/injava/Nested.java");
+    }
+    
+    @TestMetadata("NestedObjectInstance.java")
+    public void testNestedObjectInstance() throws Exception {
+        doTest("idea/testData/completion/injava/NestedObjectInstance.java");
+    }
+    
     @TestMetadata("ObjectInstance.java")
     public void testObjectInstance() throws Exception {
         doTest("idea/testData/completion/injava/ObjectInstance.java");
diff --git a/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java
index 4bb66cb0f8c..f641ca97073 100644
--- a/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java
@@ -47,6 +47,11 @@ public class KotlinSourceInJavaCompletionTestGenerated extends AbstractKotlinSou
         doTest("idea/testData/completion/injava/ClassMembers.java");
     }
     
+    @TestMetadata("ClassObject.java")
+    public void testClassObject() throws Exception {
+        doTest("idea/testData/completion/injava/ClassObject.java");
+    }
+    
     @TestMetadata("ClassesFromNamespace.java")
     public void testClassesFromNamespace() throws Exception {
         doTest("idea/testData/completion/injava/ClassesFromNamespace.java");
@@ -57,6 +62,16 @@ public class KotlinSourceInJavaCompletionTestGenerated extends AbstractKotlinSou
         doTest("idea/testData/completion/injava/EnumConstants.java");
     }
     
+    @TestMetadata("Nested.java")
+    public void testNested() throws Exception {
+        doTest("idea/testData/completion/injava/Nested.java");
+    }
+    
+    @TestMetadata("NestedObjectInstance.java")
+    public void testNestedObjectInstance() throws Exception {
+        doTest("idea/testData/completion/injava/NestedObjectInstance.java");
+    }
+    
     @TestMetadata("ObjectInstance.java")
     public void testObjectInstance() throws Exception {
         doTest("idea/testData/completion/injava/ObjectInstance.java");