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,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
}
}
@@ -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 {
@@ -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 {
@@ -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()
@@ -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 {