Minor, restructure reflection tests a little

To allow their usage in https://github.com/udalov/kotlin-obfuscation-test-app

compiler/testData/codegen/box/reflection/classes/jvmName.kt

@@ -17,22 +17,6 @@ fun box(): String {
     assertEquals("Klass\$Nested", Klass.Nested::class.jvmName)
     assertEquals("Klass\$Companion", Klass.Companion::class.jvmName)
 
-    assertEquals("java.lang.Object", Any::class.jvmName)
-    assertEquals("int", Int::class.jvmName)
-    assertEquals("[I", IntArray::class.jvmName)
-    assertEquals("java.util.List", List::class.jvmName)
-    assertEquals("java.util.List", MutableList::class.jvmName)
-    assertEquals("java.lang.String", String::class.jvmName)
-    assertEquals("java.lang.String", java.lang.String::class.jvmName)
-
-    assertEquals("[Ljava.lang.Object;", Array<Any>::class.jvmName)
-    assertEquals("[Ljava.lang.Integer;", Array<Int>::class.jvmName)
-    assertEquals("[[Ljava.lang.String;", Array<Array<String>>::class.jvmName)
-
-    assertEquals("java.util.Date", java.util.Date::class.jvmName)
-    assertEquals("kotlin.jvm.internal.Ref\$ObjectRef", kotlin.jvm.internal.Ref.ObjectRef::class.jvmName)
-    assertEquals("java.lang.Void", java.lang.Void::class.jvmName)
-
     class Local
     val l = Local::class.jvmName
     assertTrue(l != null && l.startsWith("JvmNameKt\$") && "\$box\$" in l && l.endsWith("\$Local"))

compiler/testData/codegen/box/reflection/classes/jvmNameOfStandardClasses.kt

@@ -0,0 +1,27 @@
+// TODO: muted automatically, investigate should it be ran for JS or not
+// IGNORE_BACKEND: JS, NATIVE
+
+// WITH_REFLECT
+
+import kotlin.test.assertEquals
+import kotlin.reflect.jvm.jvmName
+
+fun box(): String {
+    assertEquals("java.lang.Object", Any::class.jvmName)
+    assertEquals("int", Int::class.jvmName)
+    assertEquals("[I", IntArray::class.jvmName)
+    assertEquals("java.util.List", List::class.jvmName)
+    assertEquals("java.util.List", MutableList::class.jvmName)
+    assertEquals("java.lang.String", String::class.jvmName)
+    assertEquals("java.lang.String", java.lang.String::class.jvmName)
+
+    assertEquals("[Ljava.lang.Object;", Array<Any>::class.jvmName)
+    assertEquals("[Ljava.lang.Integer;", Array<Int>::class.jvmName)
+    assertEquals("[[Ljava.lang.String;", Array<Array<String>>::class.jvmName)
+
+    assertEquals("java.util.Date", java.util.Date::class.jvmName)
+    assertEquals("kotlin.jvm.internal.Ref\$ObjectRef", kotlin.jvm.internal.Ref.ObjectRef::class.jvmName)
+    assertEquals("java.lang.Void", java.lang.Void::class.jvmName)
+
+    return "OK"
+}

compiler/testData/codegen/box/reflection/classes/qualifiedName.kt

@@ -15,22 +15,6 @@ fun box(): String {
     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.collections.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.Ref.ObjectRef", kotlin.jvm.internal.Ref.ObjectRef::class.qualifiedName)
-    assertEquals("java.lang.Void", java.lang.Void::class.qualifiedName)
-
     class Local
     assertEquals(null, Local::class.qualifiedName)
 

compiler/testData/codegen/box/reflection/classes/qualifiedNameOfStandardClasses.kt

@@ -0,0 +1,26 @@
+// TODO: muted automatically, investigate should it be ran for JS or not
+// IGNORE_BACKEND: JS, NATIVE
+
+// WITH_REFLECT
+
+import kotlin.test.assertEquals
+
+fun box(): String {
+    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.collections.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.Ref.ObjectRef", kotlin.jvm.internal.Ref.ObjectRef::class.qualifiedName)
+    assertEquals("java.lang.Void", java.lang.Void::class.qualifiedName)
+
+    return "OK"
+}

compiler/testData/codegen/box/reflection/mapping/extensionProperty.kt

@@ -14,14 +14,16 @@ var K.ext: Double
         this.value = value.toLong()
     }
 
+val fileFacadeClass = object {}::class.java.enclosingClass
+
 fun box(): String {
     val p = K::ext
 
     val getter = p.javaGetter!!
     val setter = p.javaSetter!!
 
-    assertEquals(getter, Class.forName("ExtensionPropertyKt").getMethod("getExt", K::class.java))
+    assertEquals(getter, fileFacadeClass.getMethod("getExt", K::class.java))
-    assertEquals(setter, Class.forName("ExtensionPropertyKt").getMethod("setExt", K::class.java, Double::class.java))
+    assertEquals(setter, fileFacadeClass.getMethod("setExt", K::class.java, Double::class.java))
 
     val k = K(42L)
     assert(getter.invoke(null, k) == 42.0) { "Fail k getter" }

compiler/testData/codegen/box/reflection/mapping/topLevelProperty.kt

@@ -8,19 +8,20 @@ import kotlin.test.assertEquals
 
 var topLevel = "123"
 
+val fileFacadeClass = object {}::class.java.enclosingClass
+
 fun box(): String {
     val p = ::topLevel
 
     assert(p.javaField != null) { "Fail p field" }
     val field = p.javaField!!
-    val className = field.getDeclaringClass().getName()
+    assertEquals(fileFacadeClass, field.getDeclaringClass())
-    assertEquals("TopLevelPropertyKt", className)
 
     val getter = p.javaGetter!!
     val setter = p.javaSetter!!
 
-    assertEquals(getter, Class.forName("TopLevelPropertyKt").getMethod("getTopLevel"))
+    assertEquals(getter, fileFacadeClass.getMethod("getTopLevel"))
-    assertEquals(setter, Class.forName("TopLevelPropertyKt").getMethod("setTopLevel", String::class.java))
+    assertEquals(setter, fileFacadeClass.getMethod("setTopLevel", String::class.java))
 
     assert(getter.invoke(null) == "123") { "Fail k getter" }
     setter.invoke(null, "456")

compiler/testData/codegen/box/reflection/mapping/types/typeParameters.kt

@@ -18,7 +18,7 @@ fun box(): String {
     if (t !is TypeVariable<*>) return "Fail, t should be a type variable: $t"
 
     assertEquals("T", t.name)
-    assertEquals("A", (t.genericDeclaration as Class<*>).name)
+    assertEquals(A::class.java, (t.genericDeclaration as Class<*>))
 
     return "OK"
 }

compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java

@@ -17025,6 +17025,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                 runTest("compiler/testData/codegen/box/reflection/classes/jvmName.kt");
             }
 
+            @TestMetadata("jvmNameOfStandardClasses.kt")
+            public void testJvmNameOfStandardClasses() throws Exception {
+                runTest("compiler/testData/codegen/box/reflection/classes/jvmNameOfStandardClasses.kt");
+            }
+
             @TestMetadata("localClassSimpleName.kt")
             public void testLocalClassSimpleName() throws Exception {
                 runTest("compiler/testData/codegen/box/reflection/classes/localClassSimpleName.kt");
@@ -17055,6 +17060,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                 runTest("compiler/testData/codegen/box/reflection/classes/qualifiedName.kt");
             }
 
+            @TestMetadata("qualifiedNameOfStandardClasses.kt")
+            public void testQualifiedNameOfStandardClasses() throws Exception {
+                runTest("compiler/testData/codegen/box/reflection/classes/qualifiedNameOfStandardClasses.kt");
+            }
+
             @TestMetadata("starProjectedType.kt")
             public void testStarProjectedType() throws Exception {
                 runTest("compiler/testData/codegen/box/reflection/classes/starProjectedType.kt");

compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java

@@ -17025,6 +17025,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 runTest("compiler/testData/codegen/box/reflection/classes/jvmName.kt");
             }
 
+            @TestMetadata("jvmNameOfStandardClasses.kt")
+            public void testJvmNameOfStandardClasses() throws Exception {
+                runTest("compiler/testData/codegen/box/reflection/classes/jvmNameOfStandardClasses.kt");
+            }
+
             @TestMetadata("localClassSimpleName.kt")
             public void testLocalClassSimpleName() throws Exception {
                 runTest("compiler/testData/codegen/box/reflection/classes/localClassSimpleName.kt");
@@ -17055,6 +17060,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 runTest("compiler/testData/codegen/box/reflection/classes/qualifiedName.kt");
             }
 
+            @TestMetadata("qualifiedNameOfStandardClasses.kt")
+            public void testQualifiedNameOfStandardClasses() throws Exception {
+                runTest("compiler/testData/codegen/box/reflection/classes/qualifiedNameOfStandardClasses.kt");
+            }
+
             @TestMetadata("starProjectedType.kt")
             public void testStarProjectedType() throws Exception {
                 runTest("compiler/testData/codegen/box/reflection/classes/starProjectedType.kt");

compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java

@@ -17025,6 +17025,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 runTest("compiler/testData/codegen/box/reflection/classes/jvmName.kt");
             }
 
+            @TestMetadata("jvmNameOfStandardClasses.kt")
+            public void testJvmNameOfStandardClasses() throws Exception {
+                runTest("compiler/testData/codegen/box/reflection/classes/jvmNameOfStandardClasses.kt");
+            }
+
             @TestMetadata("localClassSimpleName.kt")
             public void testLocalClassSimpleName() throws Exception {
                 runTest("compiler/testData/codegen/box/reflection/classes/localClassSimpleName.kt");
@@ -17055,6 +17060,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 runTest("compiler/testData/codegen/box/reflection/classes/qualifiedName.kt");
             }
 
+            @TestMetadata("qualifiedNameOfStandardClasses.kt")
+            public void testQualifiedNameOfStandardClasses() throws Exception {
+                runTest("compiler/testData/codegen/box/reflection/classes/qualifiedNameOfStandardClasses.kt");
+            }
+
             @TestMetadata("starProjectedType.kt")
             public void testStarProjectedType() throws Exception {
                 runTest("compiler/testData/codegen/box/reflection/classes/starProjectedType.kt");

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java

@@ -15206,6 +15206,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
                 runTest("compiler/testData/codegen/box/reflection/classes/jvmName.kt");
             }
 
+            @TestMetadata("jvmNameOfStandardClasses.kt")
+            public void testJvmNameOfStandardClasses() throws Exception {
+                runTest("compiler/testData/codegen/box/reflection/classes/jvmNameOfStandardClasses.kt");
+            }
+
             @TestMetadata("localClassSimpleName.kt")
             public void testLocalClassSimpleName() throws Exception {
                 runTest("compiler/testData/codegen/box/reflection/classes/localClassSimpleName.kt");
@@ -15236,6 +15241,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
                 runTest("compiler/testData/codegen/box/reflection/classes/qualifiedName.kt");
             }
 
+            @TestMetadata("qualifiedNameOfStandardClasses.kt")
+            public void testQualifiedNameOfStandardClasses() throws Exception {
+                runTest("compiler/testData/codegen/box/reflection/classes/qualifiedNameOfStandardClasses.kt");
+            }
+
             @TestMetadata("starProjectedType.kt")
             public void testStarProjectedType() throws Exception {
                 runTest("compiler/testData/codegen/box/reflection/classes/starProjectedType.kt");