Support KClass.qualifiedName for non-local classes

2015-06-10 01:34:10 +03:00
parent df07a61a08
commit 236214305f
6 changed files with 84 additions and 14 deletions
@@ -0,0 +1,37 @@
+import kotlin.test.assertEquals
+import kotlin.reflect.jvm.kotlin
+
+class Klass {
+    class Nested
+    companion object
+}
+
+fun box(): String {
+    assertEquals("Klass", Klass::class.qualifiedName)
+    assertEquals("Klass.Nested", Klass.Nested::class.qualifiedName)
+    assertEquals("Klass.Companion", Klass.Companion::class.qualifiedName)
+
+    assertEquals("kotlin.Any", Any::class.qualifiedName)
+    assertEquals("kotlin.Int", Int::class.qualifiedName)
+    assertEquals("kotlin.Int.Companion", Int.Companion::class.qualifiedName)
+    assertEquals("kotlin.IntArray", IntArray::class.qualifiedName)
+    assertEquals("kotlin.List", List::class.qualifiedName)
+    assertEquals("kotlin.String", String::class.qualifiedName)
+    assertEquals("kotlin.String", java.lang.String::class.qualifiedName)
+
+    assertEquals("kotlin.Array", Array<Any>::class.qualifiedName)
+    assertEquals("kotlin.Array", Array<Int>::class.qualifiedName)
+    assertEquals("kotlin.Array", Array<Array<String>>::class.qualifiedName)
+
+    assertEquals("java.util.Date", java.util.Date::class.qualifiedName)
+    assertEquals("kotlin.jvm.internal.KotlinSyntheticClass.Kind", kotlin.jvm.internal.KotlinSyntheticClass.Kind::class.qualifiedName)
+    assertEquals("java.lang.Void", java.lang.Void::class.qualifiedName)
+
+    class Local
+    assertEquals(null, Local::class.qualifiedName)
+
+    val o = object {}
+    assertEquals(null, o.javaClass.kotlin.qualifiedName)
+
+    return "OK"
+}
@@ -2775,24 +2775,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                doTestWithStdlib(fileName);
            }

-            @TestMetadata("classSimpleName.kt")
-            public void testClassSimpleName() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/classSimpleName.kt");
-                doTestWithStdlib(fileName);
-            }
-
            @TestMetadata("genericClass.kt")
            public void testGenericClass() throws Exception {
                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/genericClass.kt");
                doTestWithStdlib(fileName);
            }

-            @TestMetadata("localClassSimpleName.kt")
-            public void testLocalClassSimpleName() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/localClassSimpleName.kt");
-                doTestWithStdlib(fileName);
-            }
-
            @TestMetadata("simpleClassLiteral.kt")
            public void testSimpleClassLiteral() throws Exception {
                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/simpleClassLiteral.kt");
@@ -2800,6 +2788,33 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
            }
        }

+        @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classes")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Classes extends AbstractBlackBoxCodegenTest {
+            public void testAllFilesPresentInClasses() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/classes"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("classSimpleName.kt")
+            public void testClassSimpleName() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classes/classSimpleName.kt");
+                doTestWithStdlib(fileName);
+            }
+
+            @TestMetadata("localClassSimpleName.kt")
+            public void testLocalClassSimpleName() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classes/localClassSimpleName.kt");
+                doTestWithStdlib(fileName);
+            }
+
+            @TestMetadata("qualifiedName.kt")
+            public void testQualifiedName() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classes/qualifiedName.kt");
+                doTestWithStdlib(fileName);
+            }
+        }
+
        @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing")
        @TestDataPath("$PROJECT_ROOT")
        @RunWith(JUnit3RunnerWithInners.class)