From 0a840d01747a86b37c99ca9b0238eeaa289fcb64 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Tue, 27 Dec 2016 21:52:19 +0300
Subject: [PATCH] Migrate 1.1 reflection API usages in tests.

---
 .../testData/codegen/box/reflection/classes/createInstance.kt | 2 +-
 .../codegen/box/reflection/classes/declaredMembers.kt         | 2 +-
 .../codegen/box/reflection/classes/starProjectedType.kt       | 4 ++--
 .../box/reflection/isInstance/isInstanceCastAndSafeCast.kt    | 4 ++--
 .../codegen/box/reflection/mapping/types/withNullability.kt   | 2 +-
 .../codegen/box/reflection/parameters/findParameterByName.kt  | 2 +-
 .../parameters/instanceExtensionReceiverAndValueParameters.kt | 2 +-
 .../box/reflection/supertypes/builtInClassSupertypes.kt       | 4 +++-
 .../codegen/box/reflection/supertypes/genericSubstitution.kt  | 2 +-
 .../box/reflection/supertypes/isSubclassOfIsSuperclassOf.kt   | 3 ++-
 .../testData/codegen/box/reflection/supertypes/primitives.kt  | 2 +-
 .../codegen/box/reflection/supertypes/simpleSupertypes.kt     | 2 +-
 .../codegen/box/reflection/types/createType/equality.kt       | 2 +-
 .../codegen/box/reflection/types/createType/innerGeneric.kt   | 2 +-
 .../box/reflection/types/createType/simpleCreateType.kt       | 2 +-
 .../codegen/box/reflection/types/createType/typeParameter.kt  | 2 +-
 .../box/reflection/types/createType/wrongNumberOfArguments.kt | 2 +-
 .../codegen/box/reflection/types/subtyping/platformType.kt    | 3 ++-
 .../box/reflection/types/subtyping/simpleGenericTypes.kt      | 2 +-
 .../box/reflection/types/subtyping/simpleSubtypeSupertype.kt  | 3 ++-
 .../codegen/box/reflection/types/subtyping/typeProjection.kt  | 2 +-
 .../testData/codegen/box/reflection/types/withNullability.kt  | 2 +-
 22 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/compiler/testData/codegen/box/reflection/classes/createInstance.kt b/compiler/testData/codegen/box/reflection/classes/createInstance.kt
index f86471b5718..eb9735b9859 100644
--- a/compiler/testData/codegen/box/reflection/classes/createInstance.kt
+++ b/compiler/testData/codegen/box/reflection/classes/createInstance.kt
@@ -3,7 +3,7 @@
 
 // WITH_REFLECT
 
-import kotlin.reflect.createInstance
+import kotlin.reflect.full.createInstance
 import kotlin.test.assertTrue
 import kotlin.test.fail
 
diff --git a/compiler/testData/codegen/box/reflection/classes/declaredMembers.kt b/compiler/testData/codegen/box/reflection/classes/declaredMembers.kt
index 0d24868316a..b28ab68a537 100644
--- a/compiler/testData/codegen/box/reflection/classes/declaredMembers.kt
+++ b/compiler/testData/codegen/box/reflection/classes/declaredMembers.kt
@@ -22,7 +22,7 @@ public class J extends I {
 
 // FILE: K.kt
 
-import kotlin.reflect.declaredMembers
+import kotlin.reflect.full.declaredMembers
 import kotlin.test.assertEquals
 
 open class K : J() {
diff --git a/compiler/testData/codegen/box/reflection/classes/starProjectedType.kt b/compiler/testData/codegen/box/reflection/classes/starProjectedType.kt
index 68244f942bf..7be7d8ba0ec 100644
--- a/compiler/testData/codegen/box/reflection/classes/starProjectedType.kt
+++ b/compiler/testData/codegen/box/reflection/classes/starProjectedType.kt
@@ -4,8 +4,8 @@
 // WITH_REFLECT
 
 import kotlin.reflect.KTypeProjection
-import kotlin.reflect.createType
-import kotlin.reflect.starProjectedType
+import kotlin.reflect.full.createType
+import kotlin.reflect.full.starProjectedType
 import kotlin.test.assertEquals
 
 class Foo<K, V>
diff --git a/compiler/testData/codegen/box/reflection/isInstance/isInstanceCastAndSafeCast.kt b/compiler/testData/codegen/box/reflection/isInstance/isInstanceCastAndSafeCast.kt
index 45d17a948dd..0692b7d19e0 100644
--- a/compiler/testData/codegen/box/reflection/isInstance/isInstanceCastAndSafeCast.kt
+++ b/compiler/testData/codegen/box/reflection/isInstance/isInstanceCastAndSafeCast.kt
@@ -4,8 +4,8 @@
 // WITH_REFLECT
 
 import kotlin.reflect.KClass
-import kotlin.reflect.cast
-import kotlin.reflect.safeCast
+import kotlin.reflect.full.cast
+import kotlin.reflect.full.safeCast
 import kotlin.test.*
 
 fun testInstance(value: Any?, klass: KClass<*>) {
diff --git a/compiler/testData/codegen/box/reflection/mapping/types/withNullability.kt b/compiler/testData/codegen/box/reflection/mapping/types/withNullability.kt
index 7a3f9e533e7..4cac34036ee 100644
--- a/compiler/testData/codegen/box/reflection/mapping/types/withNullability.kt
+++ b/compiler/testData/codegen/box/reflection/mapping/types/withNullability.kt
@@ -3,7 +3,7 @@
 
 // WITH_REFLECT
 
-import kotlin.reflect.withNullability
+import kotlin.reflect.full.withNullability
 import kotlin.reflect.jvm.javaType
 import kotlin.test.assertEquals
 
diff --git a/compiler/testData/codegen/box/reflection/parameters/findParameterByName.kt b/compiler/testData/codegen/box/reflection/parameters/findParameterByName.kt
index 977c11a6fa6..808f3dc072b 100644
--- a/compiler/testData/codegen/box/reflection/parameters/findParameterByName.kt
+++ b/compiler/testData/codegen/box/reflection/parameters/findParameterByName.kt
@@ -10,7 +10,7 @@ public class J {
 
 // FILE: K.kt
 
-import kotlin.reflect.findParameterByName
+import kotlin.reflect.full.findParameterByName
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
 
diff --git a/compiler/testData/codegen/box/reflection/parameters/instanceExtensionReceiverAndValueParameters.kt b/compiler/testData/codegen/box/reflection/parameters/instanceExtensionReceiverAndValueParameters.kt
index e181489f67c..c44fd9c4b66 100644
--- a/compiler/testData/codegen/box/reflection/parameters/instanceExtensionReceiverAndValueParameters.kt
+++ b/compiler/testData/codegen/box/reflection/parameters/instanceExtensionReceiverAndValueParameters.kt
@@ -3,7 +3,7 @@
 
 // WITH_REFLECT
 
-import kotlin.reflect.*
+import kotlin.reflect.full.*
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
diff --git a/compiler/testData/codegen/box/reflection/supertypes/builtInClassSupertypes.kt b/compiler/testData/codegen/box/reflection/supertypes/builtInClassSupertypes.kt
index 4efe2b52a28..0aed2bbd5d4 100644
--- a/compiler/testData/codegen/box/reflection/supertypes/builtInClassSupertypes.kt
+++ b/compiler/testData/codegen/box/reflection/supertypes/builtInClassSupertypes.kt
@@ -4,7 +4,9 @@
 // WITH_REFLECT
 
 import java.io.Serializable
-import kotlin.reflect.*
+import kotlin.reflect.KClass
+import kotlin.reflect.KCallable
+import kotlin.reflect.full.*
 import kotlin.test.assertEquals
 
 inline fun <reified T : Any> check(vararg callables: KCallable<*>) {
diff --git a/compiler/testData/codegen/box/reflection/supertypes/genericSubstitution.kt b/compiler/testData/codegen/box/reflection/supertypes/genericSubstitution.kt
index b6ef67fe41d..d3f609e4bb0 100644
--- a/compiler/testData/codegen/box/reflection/supertypes/genericSubstitution.kt
+++ b/compiler/testData/codegen/box/reflection/supertypes/genericSubstitution.kt
@@ -3,7 +3,7 @@
 
 // WITH_REFLECT
 
-import kotlin.reflect.allSupertypes
+import kotlin.reflect.full.allSupertypes
 import kotlin.test.assertEquals
 
 interface A<A1, A2>
diff --git a/compiler/testData/codegen/box/reflection/supertypes/isSubclassOfIsSuperclassOf.kt b/compiler/testData/codegen/box/reflection/supertypes/isSubclassOfIsSuperclassOf.kt
index 7d093ea96b5..fec97be73d4 100644
--- a/compiler/testData/codegen/box/reflection/supertypes/isSubclassOfIsSuperclassOf.kt
+++ b/compiler/testData/codegen/box/reflection/supertypes/isSubclassOfIsSuperclassOf.kt
@@ -3,7 +3,8 @@
 
 // WITH_REFLECT
 
-import kotlin.reflect.*
+import kotlin.reflect.KClass
+import kotlin.reflect.full.*
 import kotlin.test.assertTrue
 import kotlin.test.assertFalse
 
diff --git a/compiler/testData/codegen/box/reflection/supertypes/primitives.kt b/compiler/testData/codegen/box/reflection/supertypes/primitives.kt
index 138faccb0c8..ccbafb2e66e 100644
--- a/compiler/testData/codegen/box/reflection/supertypes/primitives.kt
+++ b/compiler/testData/codegen/box/reflection/supertypes/primitives.kt
@@ -3,7 +3,7 @@
 
 // WITH_REFLECT
 
-import kotlin.reflect.isSubclassOf
+import kotlin.reflect.full.isSubclassOf
 import kotlin.test.assertTrue
 import kotlin.test.assertFalse
 
diff --git a/compiler/testData/codegen/box/reflection/supertypes/simpleSupertypes.kt b/compiler/testData/codegen/box/reflection/supertypes/simpleSupertypes.kt
index 036363283bd..d9189c68722 100644
--- a/compiler/testData/codegen/box/reflection/supertypes/simpleSupertypes.kt
+++ b/compiler/testData/codegen/box/reflection/supertypes/simpleSupertypes.kt
@@ -3,7 +3,7 @@
 
 // WITH_REFLECT
 
-import kotlin.reflect.*
+import kotlin.reflect.full.*
 import kotlin.test.assertEquals
 
 open class Simple
diff --git a/compiler/testData/codegen/box/reflection/types/createType/equality.kt b/compiler/testData/codegen/box/reflection/types/createType/equality.kt
index 5f1a5784f9b..b164b459a24 100644
--- a/compiler/testData/codegen/box/reflection/types/createType/equality.kt
+++ b/compiler/testData/codegen/box/reflection/types/createType/equality.kt
@@ -3,7 +3,7 @@
 
 // WITH_REFLECT
 
-import kotlin.reflect.createType
+import kotlin.reflect.full.createType
 import kotlin.reflect.KTypeProjection
 import kotlin.test.assertEquals
 import kotlin.test.assertNotEquals
diff --git a/compiler/testData/codegen/box/reflection/types/createType/innerGeneric.kt b/compiler/testData/codegen/box/reflection/types/createType/innerGeneric.kt
index b7a98201ae6..a1e75cb8349 100644
--- a/compiler/testData/codegen/box/reflection/types/createType/innerGeneric.kt
+++ b/compiler/testData/codegen/box/reflection/types/createType/innerGeneric.kt
@@ -3,7 +3,7 @@
 
 // WITH_REFLECT
 
-import kotlin.reflect.createType
+import kotlin.reflect.full.createType
 import kotlin.reflect.KClass
 import kotlin.reflect.KTypeProjection
 import kotlin.test.assertEquals
diff --git a/compiler/testData/codegen/box/reflection/types/createType/simpleCreateType.kt b/compiler/testData/codegen/box/reflection/types/createType/simpleCreateType.kt
index 1a84c501a99..fb1189f49d6 100644
--- a/compiler/testData/codegen/box/reflection/types/createType/simpleCreateType.kt
+++ b/compiler/testData/codegen/box/reflection/types/createType/simpleCreateType.kt
@@ -3,7 +3,7 @@
 
 // WITH_REFLECT
 
-import kotlin.reflect.createType
+import kotlin.reflect.full.createType
 import kotlin.reflect.KTypeProjection
 import kotlin.test.assertEquals
 
diff --git a/compiler/testData/codegen/box/reflection/types/createType/typeParameter.kt b/compiler/testData/codegen/box/reflection/types/createType/typeParameter.kt
index abd2d609154..25e837694a5 100644
--- a/compiler/testData/codegen/box/reflection/types/createType/typeParameter.kt
+++ b/compiler/testData/codegen/box/reflection/types/createType/typeParameter.kt
@@ -3,7 +3,7 @@
 
 // WITH_REFLECT
 
-import kotlin.reflect.createType
+import kotlin.reflect.full.createType
 import kotlin.test.assertEquals
 
 class Foo<T> {
diff --git a/compiler/testData/codegen/box/reflection/types/createType/wrongNumberOfArguments.kt b/compiler/testData/codegen/box/reflection/types/createType/wrongNumberOfArguments.kt
index b8de7198d67..73c044da3ad 100644
--- a/compiler/testData/codegen/box/reflection/types/createType/wrongNumberOfArguments.kt
+++ b/compiler/testData/codegen/box/reflection/types/createType/wrongNumberOfArguments.kt
@@ -3,7 +3,7 @@
 
 // WITH_REFLECT
 
-import kotlin.reflect.createType
+import kotlin.reflect.full.createType
 import kotlin.reflect.KClassifier
 import kotlin.reflect.KTypeProjection
 
diff --git a/compiler/testData/codegen/box/reflection/types/subtyping/platformType.kt b/compiler/testData/codegen/box/reflection/types/subtyping/platformType.kt
index 2ebde1b0403..0901242ee2a 100644
--- a/compiler/testData/codegen/box/reflection/types/subtyping/platformType.kt
+++ b/compiler/testData/codegen/box/reflection/types/subtyping/platformType.kt
@@ -10,7 +10,8 @@ public interface J {
 
 // FILE: K.kt
 
-import kotlin.reflect.*
+import kotlin.reflect.KCallable
+import kotlin.reflect.full.*
 import kotlin.test.assertTrue
 
 fun string(): String = null!!
diff --git a/compiler/testData/codegen/box/reflection/types/subtyping/simpleGenericTypes.kt b/compiler/testData/codegen/box/reflection/types/subtyping/simpleGenericTypes.kt
index adcbe09a695..0a9f07aa0a1 100644
--- a/compiler/testData/codegen/box/reflection/types/subtyping/simpleGenericTypes.kt
+++ b/compiler/testData/codegen/box/reflection/types/subtyping/simpleGenericTypes.kt
@@ -3,7 +3,7 @@
 
 // WITH_REFLECT
 
-import kotlin.reflect.*
+import kotlin.reflect.full.*
 import kotlin.test.assertTrue
 import kotlin.test.assertFalse
 
diff --git a/compiler/testData/codegen/box/reflection/types/subtyping/simpleSubtypeSupertype.kt b/compiler/testData/codegen/box/reflection/types/subtyping/simpleSubtypeSupertype.kt
index 7921199a56d..3b2032ddccc 100644
--- a/compiler/testData/codegen/box/reflection/types/subtyping/simpleSubtypeSupertype.kt
+++ b/compiler/testData/codegen/box/reflection/types/subtyping/simpleSubtypeSupertype.kt
@@ -3,7 +3,8 @@
 
 // WITH_REFLECT
 
-import kotlin.reflect.*
+import kotlin.reflect.KCallable
+import kotlin.reflect.full.*
 import kotlin.test.assertTrue
 import kotlin.test.assertFalse
 
diff --git a/compiler/testData/codegen/box/reflection/types/subtyping/typeProjection.kt b/compiler/testData/codegen/box/reflection/types/subtyping/typeProjection.kt
index 7a73e3157af..4cae206d8d6 100644
--- a/compiler/testData/codegen/box/reflection/types/subtyping/typeProjection.kt
+++ b/compiler/testData/codegen/box/reflection/types/subtyping/typeProjection.kt
@@ -3,7 +3,7 @@
 
 // WITH_REFLECT
 
-import kotlin.reflect.isSubtypeOf
+import kotlin.reflect.full.isSubtypeOf
 import kotlin.test.assertTrue
 import kotlin.test.assertFalse
 
diff --git a/compiler/testData/codegen/box/reflection/types/withNullability.kt b/compiler/testData/codegen/box/reflection/types/withNullability.kt
index 7882c94ed0b..2bf550e7aa9 100644
--- a/compiler/testData/codegen/box/reflection/types/withNullability.kt
+++ b/compiler/testData/codegen/box/reflection/types/withNullability.kt
@@ -10,7 +10,7 @@ public interface J {
 
 // FILE: K.kt
 
-import kotlin.reflect.withNullability
+import kotlin.reflect.full.withNullability
 import kotlin.test.assertEquals
 
 fun nonNull(): String = ""