Remove leftovers of platformName and platformStatic in test data
Drop unnecessary imports, rename some tests
This commit is contained in:
Vendored
+2
-2
@@ -1,13 +1,13 @@
|
||||
import kotlin.reflect.*
|
||||
import kotlin.reflect.jvm.*
|
||||
import kotlin.jvm.JvmStatic as static
|
||||
|
||||
class A {
|
||||
private var foo: String = ""
|
||||
}
|
||||
|
||||
object O {
|
||||
private @static var bar: String = ""
|
||||
@JvmStatic
|
||||
private var bar: String = ""
|
||||
}
|
||||
|
||||
class CounterTest<T>(t: T) {
|
||||
|
||||
+4
-3
@@ -1,4 +1,3 @@
|
||||
import kotlin.jvm.JvmStatic as static
|
||||
import kotlin.reflect.jvm.isAccessible
|
||||
import kotlin.reflect.KCallable
|
||||
import kotlin.reflect.KFunction
|
||||
@@ -11,9 +10,11 @@ class A(private var bar: String = "") {
|
||||
}
|
||||
|
||||
object O {
|
||||
private @static var baz: String = ""
|
||||
@JvmStatic
|
||||
private var baz: String = ""
|
||||
|
||||
@static fun getBaz() = (O::class.members.single { it.name == "baz" } as KMutableProperty<*>).apply { isAccessible = true }
|
||||
@JvmStatic
|
||||
fun getBaz() = (O::class.members.single { it.name == "baz" } as KMutableProperty<*>).apply { isAccessible = true }
|
||||
|
||||
fun getGetBaz() = O::class.members.single { it.name == "getBaz" } as KFunction<*>
|
||||
}
|
||||
|
||||
+4
-4
@@ -1,12 +1,12 @@
|
||||
import kotlin.jvm.JvmStatic as static
|
||||
|
||||
object Obj {
|
||||
@static fun foo() {}
|
||||
@JvmStatic
|
||||
fun foo() {}
|
||||
}
|
||||
|
||||
class C {
|
||||
companion object {
|
||||
@static fun bar() {}
|
||||
@JvmStatic
|
||||
fun bar() {}
|
||||
}
|
||||
}
|
||||
|
||||
+8
-5
@@ -1,9 +1,12 @@
|
||||
import kotlin.jvm.JvmStatic as static
|
||||
|
||||
object Obj {
|
||||
@static fun foo(s: String) {}
|
||||
@static fun bar() {}
|
||||
@static fun sly(obj: Obj) {}
|
||||
@JvmStatic
|
||||
fun foo(s: String) {}
|
||||
|
||||
@JvmStatic
|
||||
fun bar() {}
|
||||
|
||||
@JvmStatic
|
||||
fun sly(obj: Obj) {}
|
||||
|
||||
operator fun get(name: String) = Obj::class.members.single { it.name == name }
|
||||
}
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
import kotlin.jvm.JvmStatic as static
|
||||
import kotlin.test.assertEquals
|
||||
|
||||
object Obj {
|
||||
@static fun foo(a: String, b: String = "b") = a + b
|
||||
@JvmStatic
|
||||
fun foo(a: String, b: String = "b") = a + b
|
||||
}
|
||||
|
||||
fun box(): String {
|
||||
+2
-2
@@ -1,11 +1,11 @@
|
||||
import kotlin.jvm.JvmStatic as static
|
||||
import kotlin.reflect.KFunction
|
||||
import kotlin.reflect.jvm.*
|
||||
import kotlin.test.*
|
||||
|
||||
class C {
|
||||
companion object {
|
||||
@static fun foo(s: String): Int = s.length
|
||||
@JvmStatic
|
||||
fun foo(s: String): Int = s.length
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,10 +1,10 @@
|
||||
import kotlin.jvm.JvmStatic as static
|
||||
import kotlin.reflect.KFunction
|
||||
import kotlin.reflect.jvm.*
|
||||
import kotlin.test.assertEquals
|
||||
|
||||
object O {
|
||||
@static fun foo(s: String): Int = s.length
|
||||
@JvmStatic
|
||||
fun foo(s: String): Int = s.length
|
||||
}
|
||||
|
||||
fun box(): String {
|
||||
+2
-2
@@ -1,4 +1,3 @@
|
||||
import kotlin.jvm.JvmStatic as static
|
||||
import kotlin.reflect.jvm.javaType
|
||||
import kotlin.test.assertEquals
|
||||
|
||||
@@ -7,7 +6,8 @@ class A {
|
||||
}
|
||||
|
||||
object O {
|
||||
@static fun bar(a: A): String = ""
|
||||
@JvmStatic
|
||||
fun bar(a: A): String = ""
|
||||
}
|
||||
|
||||
fun box(): String {
|
||||
|
||||
+2
-2
@@ -1,7 +1,6 @@
|
||||
// FULL_JDK
|
||||
|
||||
import java.lang.reflect.ParameterizedType
|
||||
import kotlin.jvm.JvmStatic as static
|
||||
import kotlin.reflect.*
|
||||
import kotlin.reflect.jvm.javaType
|
||||
import kotlin.test.assertEquals
|
||||
@@ -9,7 +8,8 @@ import kotlin.test.assertEquals
|
||||
class A(private var foo: List<String>)
|
||||
|
||||
object O {
|
||||
private @static var bar: List<String> = listOf()
|
||||
@JvmStatic
|
||||
private var bar: List<String> = listOf()
|
||||
}
|
||||
|
||||
fun topLevel(): List<String> = listOf()
|
||||
|
||||
+2
-2
@@ -1,4 +1,3 @@
|
||||
import kotlin.jvm.JvmStatic as static
|
||||
import kotlin.reflect.KMutableProperty
|
||||
import kotlin.reflect.jvm.javaType
|
||||
import kotlin.test.assertEquals
|
||||
@@ -6,7 +5,8 @@ import kotlin.test.assertEquals
|
||||
class A(private var foo: String)
|
||||
|
||||
object O {
|
||||
private @static var bar: String = ""
|
||||
@JvmStatic
|
||||
private var bar: String = ""
|
||||
}
|
||||
|
||||
fun box(): String {
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
import kotlin.reflect.*
|
||||
import kotlin.reflect.jvm.*
|
||||
import kotlin.jvm.JvmStatic as static
|
||||
|
||||
object Obj {
|
||||
private @static var result: String = "Fail"
|
||||
@JvmStatic
|
||||
private var result: String = "Fail"
|
||||
}
|
||||
|
||||
fun box(): String {
|
||||
Reference in New Issue
Block a user