Remove leftovers of platformName and platformStatic in test data

Drop unnecessary imports, rename some tests
This commit is contained in:
Alexander Udalov
2016-03-02 16:47:04 +03:00
parent beb11e7ac1
commit 8e77e16bbd
55 changed files with 168 additions and 191 deletions
@@ -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) {
@@ -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<*>
}
@@ -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() {}
}
}
@@ -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 }
}