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
@@ -6,7 +6,7 @@ Compile bytecode for arrayOf(1, 2).map { it.toString() }
 Compile bytecode for arrayOf(1, 2, 101, 102).filter { it > 100 }
 Compile bytecode for arrayOf(1, 2).none()
 Compile bytecode for arrayOf(1, 2).count()
-Compile bytecode for arrayOf(1, 2).size()
+Compile bytecode for arrayOf(1, 2).size
 Compile bytecode for arrayOf(1, 2).first()
 Compile bytecode for arrayOf(1, 2).last()
 Compile bytecode for intArrayOf(1, 2).max()
@@ -31,12 +31,12 @@ clearCache.kt:52
 Compile bytecode for o.test()
 clearCache.kt:60
 clearCache.kt:78
-Compile bytecode for c.size()
+Compile bytecode for c.size
 clearCache.kt:86
 clearCache.kt:95
 clearCache.kt:105
 clearCache.kt:113
-Compile bytecode for c.size()
+Compile bytecode for c.size
 clearCache.kt:123
 Compile bytecode for o.test()
 clearCache.kt:131
@@ -6,11 +6,11 @@ Compile bytecode for arrayListOf(1, 2).map { it.toString() }
 Compile bytecode for arrayListOf(1, 2, 101, 102).filter { it > 100 }
 Compile bytecode for arrayListOf(1, 2).max()
 Compile bytecode for arrayListOf(1, 2).count()
-Compile bytecode for arrayListOf(1, 2).size()
+Compile bytecode for arrayListOf(1, 2).size
 Compile bytecode for arrayListOf(1, 2).drop(1)
 Compile bytecode for ar.map { if (it > 50) "big" else "small" }
  .filter { it == "small" }
-  .size()
+  .size

 // RESULT: 2: I
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
@@ -10,7 +10,7 @@ import kotlin.reflect.KProperty
 fun main(args: Array<String>) {
    val a = A()
    //Breakpoint!
-    args.size()
+    args.size
 }

 class A {
@@ -28,6 +28,7 @@ class MyDelegateThrowsException {

 // PRINT_FRAME

+Compile bytecode for args.size
 frame    = main():9, DelegatedPropertyInClassKt {delegatedPropertyInClass}
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = delegatedPropertyInClass.kt, 6)
   local    = a: delegatedPropertyInClass.A = {delegatedPropertyInClass.A@uniqueID} (sp = delegatedPropertyInClass.kt, 7)
@@ -40,6 +41,7 @@ class MyDelegateThrowsException {
       field    = detailMessage: java.lang.String = null (sp = Throwable.!EXT!)
       field    = cause: java.lang.Throwable = {java.lang.IllegalStateException@uniqueID}java.lang.IllegalStateException (sp = Throwable.!EXT!)
       field    = stackTrace: java.lang.StackTraceElement[] = null (sp = Throwable.!EXT!)
+   extra    = args.size
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'

 Process finished with exit code 0
@@ -10,7 +10,7 @@ import kotlin.reflect.KProperty
 fun main(args: Array<String>) {
    val a = A()
    //Breakpoint!
-    args.size()
+    args.size
 }

 class A {
@@ -24,11 +24,13 @@ class MyDelegate {
 // RENDER_DELEGATED_PROPERTIES: false
 // PRINT_FRAME

+Compile bytecode for args.size
 frame    = main():9, DelegatedPropertyInClassWoRendererKt {delegatedPropertyInClassWoRenderer}
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 6)
   local    = a: delegatedPropertyInClassWoRenderer.A = {delegatedPropertyInClassWoRenderer.A@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 7)
     field    = prop: int = {delegatedPropertyInClassWoRenderer.MyDelegate@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 13)
                - Class has no fields
+   extra    = args.size
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'

 Process finished with exit code 0
@@ -4,7 +4,7 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 extractLocalVariables.kt:7
 Compile bytecode for a
 Compile bytecode for klass.f1(1)
-Compile bytecode for args.size()
+Compile bytecode for args.size
 Compile bytecode for klass.b
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'

@@ -5,7 +5,7 @@ simple.kt:6
 Compile bytecode for 1
 Compile bytecode for 1 + 1
 Compile bytecode for val a = 1
-a + args.size()
+a + args.size

 // RESULT: 1: I

@@ -5,11 +5,11 @@ stdlib.kt:5
 Compile bytecode for arrayOf(100, 101)
 Compile bytecode for arrayOf("a", "b", "c")
 Compile bytecode for intArrayOf(1, 2)
-Compile bytecode for javaClass<String>()
-Compile bytecode for javaClass<Int>()
+Compile bytecode for String::class.java
+Compile bytecode for Int::class.java
 Compile bytecode for 100.toInt()
 Compile bytecode for 100.toLong()
-Compile bytecode for args.sortedBy { it }.size()
+Compile bytecode for args.sortedBy { it }.size
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'

 Process finished with exit code 0
@@ -7,7 +7,7 @@ package toStringRenderer
 fun main(args: Array<String>) {
    val a = A()
    //Breakpoint!
-    args.size()
+    args.size
 }

 class A {
@@ -15,10 +15,12 @@ class A {
 }

 // PRINT_FRAME
+Compile bytecode for args.size
 frame    = main():6, ToStringRendererKt {toStringRenderer}
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = toStringRenderer.kt, 3)
   local    = a: toStringRenderer.A = {toStringRenderer.A@uniqueID}myA (sp = toStringRenderer.kt, 4)
              - Class has no fields
+   extra    = args.size
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'

 Process finished with exit code 0
@@ -72,7 +72,7 @@ class Derived: Base() {
 fun subTypePlatform() {
    if (true) {
        val c: MutableList<String> = ArrayList<String>()
-        // EXPRESSION: c.size()
+        // EXPRESSION: c.size
        // RESULT: 0: I
        //Breakpoint!
        val b = 1
@@ -80,7 +80,7 @@ fun subTypePlatform() {

    if (true) {
        val c: List<String> = ArrayList<String>()
-        // EXPRESSION: c.size()
+        // EXPRESSION: c.size
        // RESULT: 0: I
        //Breakpoint!
        val b = 1
@@ -89,7 +89,7 @@ fun subTypePlatform() {
    if (true) {
        val c = ArrayList<String>()
        c.add("a")
-        // EXPRESSION: c.size()
+        // EXPRESSION: c.size
        // RESULT: 1: I
        //Breakpoint!
        val b = 1
@@ -99,7 +99,7 @@ fun subTypePlatform() {
        val c = ArrayList<Int>()
        c.add(1)
        c.add(2)
-        // EXPRESSION: c.size()
+        // EXPRESSION: c.size
        // RESULT: 2: I
        //Breakpoint!
        val b = 1
@@ -107,7 +107,7 @@ fun subTypePlatform() {

    if (true) {
        val c = HashSet<Int>()
-        // EXPRESSION: c.size()
+        // EXPRESSION: c.size
        // RESULT: 0: I
        //Breakpoint!
        val b = 1
@@ -2,7 +2,7 @@

 fun main(args: Array<String>) {
    //Breakpoint!
-    args.size()
+    args.size
 }

 class Test(val a: Int)
@@ -2,7 +2,7 @@ package abstractFunCall

 fun main(args: Array<String>) {
    //Breakpoint!
-    args.size()
+    args.size
 }

 // EXPRESSION: (1 as java.lang.Number).intValue()
@@ -2,7 +2,7 @@ package arrays

 fun main(args: Array<String>) {
    //Breakpoint!
-    args.size()
+    args.size
 }

 // EXPRESSION: arrayOf(1, 2).map { it.toString() }
@@ -17,7 +17,7 @@ fun main(args: Array<String>) {
 // EXPRESSION: arrayOf(1, 2).count()
 // RESULT: 2: I

-// EXPRESSION: arrayOf(1, 2).size()
+// EXPRESSION: arrayOf(1, 2).size
 // RESULT: 2: I

 // EXPRESSION: arrayOf(1, 2).first()
@@ -4,7 +4,7 @@ import forTests.MyJavaClass

 fun main(args: Array<String>) {
    //Breakpoint!
-    args.size()
+    args.size
 }

 // EXPRESSION: MyJavaClass()
@@ -3,7 +3,7 @@ package collections
 fun main(args: Array<String>) {
    val ar = intArrayOf(1, 2, 100, 200)
    //Breakpoint!
-    args.size()
+    args.size
 }

 // EXPRESSION: arrayListOf(1, 2).map { it.toString() }
@@ -18,7 +18,7 @@ fun main(args: Array<String>) {
 // EXPRESSION: arrayListOf(1, 2).count()
 // RESULT: 2: I

-// EXPRESSION: arrayListOf(1, 2).size()
+// EXPRESSION: arrayListOf(1, 2).size
 // RESULT: 2: I

 // EXPRESSION: arrayListOf(1, 2).drop(1)
@@ -1,5 +1,5 @@
 ar.map { if (it > 50) "big" else "small" }
  .filter { it == "small" }
-  .size()
+  .size

 // RESULT: 2: I
@@ -3,7 +3,7 @@ package ceLambda
 fun main(args: Array<String>) {
    val a = 1
    //Breakpoint!
-    args.size()
+    args.size
 }

 fun foo(p: () -> Int) = p()
@@ -3,6 +3,6 @@ package ceLocalClass
 fun main(args: Array<String>) {
    val a = 1
    //Breakpoint!
-    args.size()
+    args.size
 }

@@ -2,7 +2,7 @@ package ceObject

 fun main(args: Array<String>) {
    //Breakpoint!
-    args.size()
+    args.size
 }

 interface T {
@@ -2,7 +2,7 @@ package ceSeveralLambdas

 fun main(args: Array<String>) {
    //Breakpoint!
-    args.size()
+    args.size
 }

 fun foo(p: () -> Int) = p()
@@ -4,7 +4,7 @@ import kotlin.reflect.KProperty

 fun main(args: Array<String>) {
    //Breakpoint!
-    args.size()
+    args.size
 }

 class TestClass {
@@ -4,7 +4,7 @@ fun main(args: Array<String>) {
    val d1 = 1.0
    val d2 = 3.0
    //Breakpoint!
-    args.size()
+    args.size
 }

 // EXPRESSION: d1 + d2
@@ -4,7 +4,7 @@ import enums.MyEnum.A

 fun main(args: Array<String>) {
    //Breakpoint!
-    args.size()
+    args.size
 }

 enum class MyEnum { A }
@@ -18,7 +18,7 @@ class MyClass {
 // EXPRESSION: klass.f1(1)
 // RESULT: 1: I

-// EXPRESSION: args.size()
+// EXPRESSION: args.size
 // RESULT: 0: I

 // EXPRESSION: klass.b
@@ -8,11 +8,11 @@ fun main(args: Array<String>) {
    val c = 0
 }

-fun f1(i: Int, s: String) = i + s.length()
-infix fun Int.f2(s: String) = this + s.length()
+fun f1(i: Int, s: String) = i + s.length
+infix fun Int.f2(s: String) = this + s.length

 class MyClass {
-    fun f1(i: Int, s: String) = i + s.length()
+    fun f1(i: Int, s: String) = i + s.length
 }

 // EXPRESSION: f1(a, s)
@@ -6,7 +6,7 @@ import kotlin.reflect.KProperty
 fun main(args: Array<String>) {
    val a = A()
    //Breakpoint!
-    args.size()
+    args.size
 }

 class A {
@@ -6,7 +6,7 @@ import kotlin.reflect.KProperty
 fun main(args: Array<String>) {
    val a = A()
    //Breakpoint!
-    args.size()
+    args.size
 }

 class A {
@@ -7,7 +7,7 @@ import java.util.HashMap as JHashMap

 fun main(args: Array<String>) {
    //Breakpoint!
-    args.size()
+    args.size
 }

 // EXPRESSION: Collections.emptyList<String>()
@@ -7,7 +7,7 @@ import java.util.HashMap as JHashMap

 fun main(args: Array<String>) {
    //Breakpoint! (lambdaOrdinal = 0)
-    arrayOf(1).map { args.size() }
+    arrayOf(1).map { args.size }
 }

 // EXPRESSION: Collections.emptyList<String>()
@@ -2,7 +2,7 @@ package kt5554OnlyIntsShouldBeCoerced

 fun main(args: Array<String>) {
    //Breakpoint!
-    args.size()
+    args.size
 }

 // EXPRESSION: Class.forName("java.lang.Object").getGenericInterfaces()
@@ -2,7 +2,7 @@ package methodWithBreakpoint

 fun main(args: Array<String>) {
    //Breakpoint!
-    args.size()
+    args.size
 }

 fun foo(): Int {
@@ -3,7 +3,7 @@ package multilineExpressionAtBreakpoint
 fun main(args: Array<String>) {
    //Breakpoint!
    args
-        .size()
+        .size
        .downTo(0)
 }

@@ -3,7 +3,7 @@ package `package`
 // Check that package fq-name is correctly escaped
 fun main(args: Array<String>) {
    //Breakpoint!
-    args.size()
+    args.size
 }

 // EXPRESSION: 1
@@ -6,7 +6,7 @@ fun main(args: Array<String>) {
    val derivedAsBase: Base = Derived()

    //Breakpoint!
-    args.size()
+    args.size
 }

 class MyClass {
@@ -2,7 +2,7 @@ package protectedMember

 fun main(args: Array<String>) {
    //Breakpoint!
-    args.size()
+    args.size
 }

 class MyClass {
@@ -3,7 +3,7 @@ package toStringRenderer
 fun main(args: Array<String>) {
    val a = A()
    //Breakpoint!
-    args.size()
+    args.size
 }

 class A {
@@ -3,7 +3,7 @@ package simple
 // this test is used also to check more than one file for package in JetPositionManager:prepareTypeMapper. see forTests/simple.kt
 fun main(args: Array<String>) {
    //Breakpoint!
-    args.size()
+    args.size
 }

 // EXPRESSION: 1
@@ -1,4 +1,4 @@
 val a = 1
-a + args.size()
+a + args.size

 // RESULT: 1: I
@@ -2,7 +2,7 @@ package stdlib

 fun main(args: Array<String>) {
    //Breakpoint!
-    args.size()
+    args.size
 }

 // EXPRESSION: arrayOf(100, 101)
@@ -14,10 +14,10 @@ fun main(args: Array<String>) {
 // EXPRESSION: intArrayOf(1, 2)
 // RESULT: instance of int[2] (id=ID): [I

-// EXPRESSION: javaClass<String>()
+// EXPRESSION: String::class.java
 // RESULT: instance of java.lang.Class(reflected class=java.lang.String, id=ID): Ljava/lang/Class;

-// EXPRESSION: javaClass<Int>()
+// EXPRESSION: Int::class.java
 // RESULT: instance of java.lang.Class(reflected class=int, id=ID): Ljava/lang/Class;

 // EXPRESSION: 100.toInt()
@@ -26,5 +26,5 @@ fun main(args: Array<String>) {
 // EXPRESSION: 100.toLong()
 // RESULT: 100: J

-// EXPRESSION: args.sortedBy { it }.size()
+// EXPRESSION: args.sortedBy { it }.size
 // RESULT: 0: I
@@ -5,7 +5,7 @@ fun main(args: Array<String>) {
    val s1: String? = "a"
    val s2: String? = null
    //Breakpoint!
-    args.size()
+    args.size
 }

 // EXPRESSION: s1.length
@@ -4,7 +4,7 @@ fun main(args: Array<String>) {
    var a = 1
    a += 1
    //Breakpoint!
-    args.size()
+    args.size
 }

 // EXPRESSION: a
@@ -2,7 +2,7 @@ package simpleConditionalBreakpoint

 fun main(args: Array<String>) {
    //Breakpoint! (condition = 1 == 1)
-    args.size()
+    args.size
 }

 // RESUME: 1
@@ -1,7 +1,7 @@
 package doNotSkipClassloader

 fun main(args: Array<String>) {
-    val loader = javaClass<A>().getClassLoader()!!
+    val loader = A::class.java.getClassLoader()!!
    try {
        //Breakpoint!
        val aaa = loader.loadClass("skipClassloader.A")
@@ -1,7 +1,7 @@
 package skipClassloader

 fun main(args: Array<String>) {
-    val loader = javaClass<A>().getClassLoader()!!
+    val loader = A::class.java.getClassLoader()!!
    try {
        //Breakpoint!
        val aaa = loader.loadClass("skipClassloader.A")