Cleanup deprecated symbol usages in testData

2016-01-16 20:10:40 +03:00
parent eefbd72a64
commit 25c4453dc5
403 changed files with 933 additions and 921 deletions
@@ -3,7 +3,7 @@ package regressions
 class Kt1619Test {

    fun doSomething(list: List<String?>): Int {
-        return list.size()
+        return list.size
    }

    fun testCollectionNotNullCanBeUsedForNullables(): Int {
@@ -17,5 +17,5 @@ fun box(): String {
  list.add("Munich")

  val m: ArrayList<String> = list.findAll<String>({ name: String -> name.startsWith("M")})
-  return if (m.size() == 2) "OK" else "fail"
+  return if (m.size == 2) "OK" else "fail"
 }
@@ -11,14 +11,14 @@ class ClassWithGenericSuperInterface: java.util.Comparator<String> {
 fun check(klass: Class<*>) {
    val interfaces = klass.getInterfaces().toList()
    val genericInterfaces = klass.getGenericInterfaces().toList()
-    if (interfaces.size() != genericInterfaces.size()) {
+    if (interfaces.size != genericInterfaces.size) {
        throw AssertionError("interfaces=$interfaces, genericInterfaces=$genericInterfaces")
    }
 }

 fun box(): String {
-    check(javaClass<SimpleClass>())
-    check(javaClass<ClassWithNonGenericSuperInterface>())
-    check(javaClass<ClassWithGenericSuperInterface>())
+    check(SimpleClass::class.java)
+    check(ClassWithNonGenericSuperInterface::class.java)
+    check(ClassWithGenericSuperInterface::class.java)
    return "OK"
 }
@@ -10,7 +10,7 @@ class Test() {

 fun box(): String {
    val test = Test()
-    for (method in javaClass<Test>().getMethods()!!) {
+    for (method in Test::class.java.getMethods()!!) {
        val anns = method?.getAnnotations() as Array<Annotation>
        if (!anns.isEmpty()) {
            for (ann in anns) {
@@ -1,11 +1,11 @@
 fun box(): String {
-    javaClass<Boolean>()
-    javaClass<Byte>()
-    javaClass<Short>()
-    javaClass<Char>()
-    javaClass<Int>()
-    javaClass<Long>()
-    javaClass<Float>()
-    javaClass<Double>()
+    Boolean::class.java
+    Byte::class.java
+    Short::class.java
+    Char::class.java
+    Int::class.java
+    Long::class.java
+    Float::class.java
+    Double::class.java
    return "OK"
 }
@@ -1,20 +1,20 @@
 fun box(): String {
  val bool = true
-  if (bool.javaClass != javaClass<Boolean>()) return "javaClass function on boolean fails"
+  if (bool.javaClass != Boolean::class.java) return "javaClass function on boolean fails"
  val b = 1.toByte()
-  if (b.javaClass != javaClass<Byte>()) return "javaClass function on byte fails"
+  if (b.javaClass != Byte::class.java) return "javaClass function on byte fails"
  val s = 1.toShort()
-  if (s.javaClass != javaClass<Short>()) return "javaClass function on short fails"
+  if (s.javaClass != Short::class.java) return "javaClass function on short fails"
  val c = 'c'
-  if (c.javaClass != javaClass<Char>()) return "javaClass function on char fails"
+  if (c.javaClass != Char::class.java) return "javaClass function on char fails"
  val i = 1
-  if (i.javaClass != javaClass<Int>()) return "javaClass function on int fails"
+  if (i.javaClass != Int::class.java) return "javaClass function on int fails"
  val l = 1.toLong()
-  if (l.javaClass != javaClass<Long>()) return "javaClass function on long fails"
+  if (l.javaClass != Long::class.java) return "javaClass function on long fails"
  val f = 1.toFloat()
-  if (f.javaClass != javaClass<Float>()) return "javaClass function on float fails"
+  if (f.javaClass != Float::class.java) return "javaClass function on float fails"
  val d = 1.0
-  if (d.javaClass != javaClass<Double>()) return "javaClass function on double fails"
+  if (d.javaClass != Double::class.java) return "javaClass function on double fails"

  return "OK"
 }
@@ -1,6 +1,6 @@
 fun box(): String {
    val s: String? = "a"
-    val o: Char? = s?.charAt(0)
+    val o: Char? = s?.get(0)
    val c: Any? = o?.javaClass
    return if (c !=  null) "OK"  else "fail"
 }
@@ -4,7 +4,7 @@ fun <E : Enum<E>> Byte.toEnum(clazz : Class<E>) : E =
 enum class Letters { A, B, C }

 fun box(): String {
-    val clazz = javaClass<Letters>()
+    val clazz = Letters::class.java
    val r = 1.toByte().toEnum(clazz)
    return if (r == Letters.B) "OK" else "Fail: $r"
 }
@@ -7,7 +7,7 @@ class C(val nums: Map<E, Int>) {
    val normalizedNums = loadNormalizedNums()

    private fun loadNormalizedNums(): Map<E, Float> {
-        val vals = nums.values()
+        val vals = nums.values
        val min = vals.min()!!
        val max = vals.max()!!
        val rangeDiff = (max - min).toFloat()
@@ -23,6 +23,6 @@ class C(val nums: Map<E, Int>) {
 }

 fun box(): String {
-    val res = C(hashMapOf(E.VALUE to 11, E.VALUE2 to 12)).normalizedNums.values().sorted().joinToString()
+    val res = C(hashMapOf(E.VALUE to 11, E.VALUE2 to 12)).normalizedNums.values.sorted().joinToString()
    return  if ("0.0, 1.0" == res) "OK" else "fail $res"
 }
@@ -1,5 +1,8 @@
 import kotlin.*

+@Suppress("REIFIED_TYPE_PARAMETER_NO_INLINE")
+inline fun <reified T: Any> javaClass(): Class<T> = T::class.java
+
 val test = "lala".javaClass

 val test2 = javaClass<Iterator<Int>> ()
@@ -8,5 +8,5 @@ fun box() : String {
    val a = ArrayList<Int>();
    a.add(1)
    a.add(2)
-    return if((a.size() == 2) && (a.get(1) == 2) && (a.get(0) == 1)) "OK" else "fail"
+    return if((a.size == 2) && (a.get(1) == 2) && (a.get(0) == 1)) "OK" else "fail"
 }
@@ -5,7 +5,7 @@ fun box(): String {

    class MyClass() {
        init {
-            accessedFromConstructor = javaClass<MyClass>()
+            accessedFromConstructor = MyClass::class.java
        }
    }

@@ -9,7 +9,7 @@ fun box(): String {
        a as Array<String>
    }
    catch (e: TypeCastException) {
-        if (e.getMessage() != "null cannot be cast to non-null type kotlin.Array<kotlin.String>") {
+        if (e.message != "null cannot be cast to non-null type kotlin.Array<kotlin.String>") {
            return "Fail 1: $e"
        }
    }
@@ -19,7 +19,7 @@ fun box(): String {
        x as String
    }
    catch (e: TypeCastException) {
-        if (e.getMessage() != "null cannot be cast to non-null type kotlin.String") {
+        if (e.message != "null cannot be cast to non-null type kotlin.String") {
            return "Fail 2: $e"
        }
    }