From 17e25efa87dc6eea3b1e098619a07a65f0b3f8e8 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Mon, 16 Feb 2015 15:55:49 +0100
Subject: represent java.lang.Object as 'Any'

---
 test/data/java/javaLangObject.java | 5 +++++
 test/src/model/JavaTest.kt         | 7 +++++++
 2 files changed, 12 insertions(+)
 create mode 100644 test/data/java/javaLangObject.java

(limited to 'test')

diff --git a/test/data/java/javaLangObject.java b/test/data/java/javaLangObject.java
new file mode 100644
index 00000000..8f16629c
--- /dev/null
+++ b/test/data/java/javaLangObject.java
@@ -0,0 +1,5 @@
+package test;
+
+class Test {
+  public Object fn() { return null; }
+}
diff --git a/test/src/model/JavaTest.kt b/test/src/model/JavaTest.kt
index ff04c90c..cdb0ba44 100644
--- a/test/src/model/JavaTest.kt
+++ b/test/src/model/JavaTest.kt
@@ -160,4 +160,11 @@ public class JavaTest {
             }
         }
     }
+
+    Test fun javaLangObject() {
+        verifyPackageMember("test/data/java/javaLangObject.java") { cls ->
+            val fn = cls.members(DocumentationNode.Kind.Function).single()
+            assertEquals("Any", fn.detail(DocumentationNode.Kind.Type).name)
+        }
+    }
 }
-- 
cgit