Fix deprecations in testData: stepping and evaluate expression tests.

This commit is contained in:
Ilya Gorbunov
2015-09-15 17:13:57 +03:00
parent e40a5457e3
commit 74e1dbff76
33 changed files with 61 additions and 61 deletions
+9 -9
View File
@@ -2,15 +2,15 @@ LineBreakpoint created at arrays.kt:5
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! arrays.ArraysPackage !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! arrays.ArraysPackage
Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
arrays.kt:5 arrays.kt:5
Compile bytecode for array(1, 2).map { it.toString() } Compile bytecode for arrayOf(1, 2).map { it.toString() }
Compile bytecode for array(1, 2, 101, 102).filter { it > 100 } Compile bytecode for arrayOf(1, 2, 101, 102).filter { it > 100 }
Compile bytecode for array(1, 2).none() Compile bytecode for arrayOf(1, 2).none()
Compile bytecode for array(1, 2).count() Compile bytecode for arrayOf(1, 2).count()
Compile bytecode for array(1, 2).size Compile bytecode for arrayOf(1, 2).size()
Compile bytecode for array(1, 2).first() Compile bytecode for arrayOf(1, 2).first()
Compile bytecode for array(1, 2).last() Compile bytecode for arrayOf(1, 2).last()
Compile bytecode for intArray(1, 2).max() Compile bytecode for intArrayOf(1, 2).max()
Compile bytecode for array(1, 2).max() Compile bytecode for arrayOf(1, 2).max()
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
Process finished with exit code 0 Process finished with exit code 0
+2 -2
View File
@@ -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, 101, 102).filter { it > 100 }
Compile bytecode for arrayListOf(1, 2).max() Compile bytecode for arrayListOf(1, 2).max()
Compile bytecode for arrayListOf(1, 2).count() 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 arrayListOf(1, 2).drop(1)
Compile bytecode for ar.map { if (it > 50) "big" else "small" } Compile bytecode for ar.map { if (it > 50) "big" else "small" }
.filter { it == "small" } .filter { it == "small" }
.size .size()
// RESULT: 2: I // RESULT: 2: I
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
@@ -4,7 +4,7 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
extractLocalVariables.kt:7 extractLocalVariables.kt:7
Compile bytecode for a Compile bytecode for a
Compile bytecode for klass.f1(1) Compile bytecode for klass.f1(1)
Compile bytecode for args.size Compile bytecode for args.size()
Compile bytecode for klass.b Compile bytecode for klass.b
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+1 -1
View File
@@ -5,7 +5,7 @@ simple.kt:6
Compile bytecode for 1 Compile bytecode for 1
Compile bytecode for 1 + 1 Compile bytecode for 1 + 1
Compile bytecode for val a = 1 Compile bytecode for val a = 1
a + args.size a + args.size()
// RESULT: 1: I // RESULT: 1: I
+3 -3
View File
@@ -2,9 +2,9 @@ LineBreakpoint created at stdlib.kt:5
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stdlib.StdlibPackage !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stdlib.StdlibPackage
Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
stdlib.kt:5 stdlib.kt:5
Compile bytecode for array(100, 101) Compile bytecode for arrayOf(100, 101)
Compile bytecode for array("a", "b", "c") Compile bytecode for arrayOf("a", "b", "c")
Compile bytecode for intArray(1, 2) Compile bytecode for intArrayOf(1, 2)
Compile bytecode for javaClass<String>() Compile bytecode for javaClass<String>()
Compile bytecode for javaClass<Int>() Compile bytecode for javaClass<Int>()
Compile bytecode for 100.toInt() Compile bytecode for 100.toInt()
@@ -2,7 +2,7 @@
fun main(args: Array<String>) { fun main(args: Array<String>) {
//Breakpoint! //Breakpoint!
args.size args.size()
} }
// EXPRESSION: 1 + 1 // EXPRESSION: 1 + 1
@@ -2,7 +2,7 @@ package abstractFunCall
fun main(args: Array<String>) { fun main(args: Array<String>) {
//Breakpoint! //Breakpoint!
args.size args.size()
} }
// EXPRESSION: (1 as java.lang.Number).intValue() // EXPRESSION: (1 as java.lang.Number).intValue()
@@ -2,32 +2,32 @@ package arrays
fun main(args: Array<String>) { fun main(args: Array<String>) {
//Breakpoint! //Breakpoint!
args.size args.size()
} }
// EXPRESSION: array(1, 2).map { it.toString() } // EXPRESSION: arrayOf(1, 2).map { it.toString() }
// RESULT: instance of java.util.ArrayList(id=ID): Ljava/util/ArrayList; // RESULT: instance of java.util.ArrayList(id=ID): Ljava/util/ArrayList;
// EXPRESSION: array(1, 2, 101, 102).filter { it > 100 } // EXPRESSION: arrayOf(1, 2, 101, 102).filter { it > 100 }
// RESULT: instance of java.util.ArrayList(id=ID): Ljava/util/ArrayList; // RESULT: instance of java.util.ArrayList(id=ID): Ljava/util/ArrayList;
// EXPRESSION: array(1, 2).none() // EXPRESSION: arrayOf(1, 2).none()
// RESULT: 0: Z // RESULT: 0: Z
// EXPRESSION: array(1, 2).count() // EXPRESSION: arrayOf(1, 2).count()
// RESULT: 2: I // RESULT: 2: I
// EXPRESSION: array(1, 2).size // EXPRESSION: arrayOf(1, 2).size()
// RESULT: 2: I // RESULT: 2: I
// EXPRESSION: array(1, 2).first() // EXPRESSION: arrayOf(1, 2).first()
// RESULT: 1: I // RESULT: 1: I
// EXPRESSION: array(1, 2).last() // EXPRESSION: arrayOf(1, 2).last()
// RESULT: 2: I // RESULT: 2: I
// EXPRESSION: intArray(1, 2).max() // EXPRESSION: intArrayOf(1, 2).max()
// RESULT: instance of java.lang.Integer(id=ID): Ljava/lang/Integer; // RESULT: instance of java.lang.Integer(id=ID): Ljava/lang/Integer;
// EXPRESSION: array(1, 2).max() // EXPRESSION: arrayOf(1, 2).max()
// RESULT: instance of java.lang.Integer(id=ID): Ljava/lang/Integer; // RESULT: instance of java.lang.Integer(id=ID): Ljava/lang/Integer;
@@ -2,7 +2,7 @@ package callableBug
fun main(args: Array<String>) { fun main(args: Array<String>) {
val callable = 1 val callable = 1
array(1, 2).map { arrayOf(1, 2).map {
it + 1 it + 1
//Breakpoint! //Breakpoint!
}.forEach { it + 2 } }.forEach { it + 2 }
@@ -4,7 +4,7 @@ import forTests.MyJavaClass
fun main(args: Array<String>) { fun main(args: Array<String>) {
//Breakpoint! //Breakpoint!
args.size args.size()
} }
// EXPRESSION: MyJavaClass() // EXPRESSION: MyJavaClass()
@@ -1,9 +1,9 @@
package collections package collections
fun main(args: Array<String>) { fun main(args: Array<String>) {
val ar = intArray(1, 2, 100, 200) val ar = intArrayOf(1, 2, 100, 200)
//Breakpoint! //Breakpoint!
args.size args.size()
} }
// EXPRESSION: arrayListOf(1, 2).map { it.toString() } // EXPRESSION: arrayListOf(1, 2).map { it.toString() }
@@ -18,7 +18,7 @@ fun main(args: Array<String>) {
// EXPRESSION: arrayListOf(1, 2).count() // EXPRESSION: arrayListOf(1, 2).count()
// RESULT: 2: I // RESULT: 2: I
// EXPRESSION: arrayListOf(1, 2).size // EXPRESSION: arrayListOf(1, 2).size()
// RESULT: 2: I // RESULT: 2: I
// EXPRESSION: arrayListOf(1, 2).drop(1) // EXPRESSION: arrayListOf(1, 2).drop(1)
@@ -1,5 +1,5 @@
ar.map { if (it > 50) "big" else "small" } ar.map { if (it > 50) "big" else "small" }
.filter { it == "small" } .filter { it == "small" }
.size .size()
// RESULT: 2: I // RESULT: 2: I
@@ -2,7 +2,7 @@ package dependentOnFile
fun main(args: Array<String>) { fun main(args: Array<String>) {
//Breakpoint! //Breakpoint!
args.size args.size()
} }
class TestClass { class TestClass {
@@ -4,7 +4,7 @@ fun main(args: Array<String>) {
val d1 = 1.0 val d1 = 1.0
val d2 = 3.0 val d2 = 3.0
//Breakpoint! //Breakpoint!
args.size args.size()
} }
// EXPRESSION: d1 + d2 // EXPRESSION: d1 + d2
@@ -4,7 +4,7 @@ import enums.MyEnum.A
fun main(args: Array<String>) { fun main(args: Array<String>) {
//Breakpoint! //Breakpoint!
args.size args.size()
} }
enum class MyEnum { A } enum class MyEnum { A }
@@ -18,7 +18,7 @@ class MyClass {
// EXPRESSION: klass.f1(1) // EXPRESSION: klass.f1(1)
// RESULT: 1: I // RESULT: 1: I
// EXPRESSION: args.size // EXPRESSION: args.size()
// RESULT: 0: I // RESULT: 0: I
// EXPRESSION: klass.b // EXPRESSION: klass.b
@@ -8,11 +8,11 @@ fun main(args: Array<String>) {
val c = 0 val c = 0
} }
fun f1(i: Int, s: String) = i + s.size fun f1(i: Int, s: String) = i + s.length()
fun Int.f2(s: String) = this + s.size fun Int.f2(s: String) = this + s.length()
class MyClass { class MyClass {
fun f1(i: Int, s: String) = i + s.size fun f1(i: Int, s: String) = i + s.length()
} }
// EXPRESSION: f1(a, s) // EXPRESSION: f1(a, s)
@@ -7,7 +7,7 @@ import java.util.HashMap as JHashMap
fun main(args: Array<String>) { fun main(args: Array<String>) {
//Breakpoint! //Breakpoint!
args.size args.size()
} }
// EXPRESSION: Collections.emptyList<String>() // EXPRESSION: Collections.emptyList<String>()
@@ -2,7 +2,7 @@ package kt5554OnlyIntsShouldBeCoerced
fun main(args: Array<String>) { fun main(args: Array<String>) {
//Breakpoint! //Breakpoint!
args.size args.size()
} }
// EXPRESSION: Class.forName("java.lang.Object").getGenericInterfaces() // EXPRESSION: Class.forName("java.lang.Object").getGenericInterfaces()
@@ -1,7 +1,7 @@
package inlineFunctionalExpression package inlineFunctionalExpression
fun main(args: Array<String>) { fun main(args: Array<String>) {
val a = array(1) val a = arrayOf(1)
// EXPRESSION: it // EXPRESSION: it
// RESULT: 1: I // RESULT: 1: I
// RESUME: 1 // RESUME: 1
@@ -1,7 +1,7 @@
package inlineLambda package inlineLambda
fun main(args: Array<String>) { fun main(args: Array<String>) {
val a = array(1) val a = arrayOf(1)
// EXPRESSION: it // EXPRESSION: it
// RESULT: 1: I // RESULT: 1: I
// RESUME: 1 // RESUME: 1
@@ -2,7 +2,7 @@ package methodWithBreakpoint
fun main(args: Array<String>) { fun main(args: Array<String>) {
//Breakpoint! //Breakpoint!
args.size args.size()
} }
fun foo(): Int { fun foo(): Int {
@@ -3,8 +3,8 @@ package multilineExpressionAtBreakpoint
fun main(args: Array<String>) { fun main(args: Array<String>) {
//Breakpoint! //Breakpoint!
args args
.size .size()
.indices .downTo(0)
} }
// EXPRESSION: 1 + 1 // EXPRESSION: 1 + 1
@@ -6,7 +6,7 @@ fun main(args: Array<String>) {
val derivedAsBase: Base = Derived() val derivedAsBase: Base = Derived()
//Breakpoint! //Breakpoint!
args.size args.size()
} }
class MyClass { class MyClass {
@@ -2,7 +2,7 @@ package protectedMember
fun main(args: Array<String>) { fun main(args: Array<String>) {
//Breakpoint! //Breakpoint!
args.size args.size()
} }
class MyClass { class MyClass {
@@ -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 // 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>) { fun main(args: Array<String>) {
//Breakpoint! //Breakpoint!
args.size args.size()
} }
// EXPRESSION: 1 // EXPRESSION: 1
@@ -1,4 +1,4 @@
val a = 1 val a = 1
a + args.size a + args.size()
// RESULT: 1: I // RESULT: 1: I
@@ -2,16 +2,16 @@ package stdlib
fun main(args: Array<String>) { fun main(args: Array<String>) {
//Breakpoint! //Breakpoint!
args.size args.size()
} }
// EXPRESSION: array(100, 101) // EXPRESSION: arrayOf(100, 101)
// RESULT: instance of java.lang.Integer[2] (id=ID): [Ljava/lang/Integer; // RESULT: instance of java.lang.Integer[2] (id=ID): [Ljava/lang/Integer;
// EXPRESSION: array("a", "b", "c") // EXPRESSION: arrayOf("a", "b", "c")
// RESULT: instance of java.lang.String[3] (id=ID): [Ljava/lang/String; // RESULT: instance of java.lang.String[3] (id=ID): [Ljava/lang/String;
// EXPRESSION: intArray(1, 2) // EXPRESSION: intArrayOf(1, 2)
// RESULT: instance of int[2] (id=ID): [I // RESULT: instance of int[2] (id=ID): [I
// EXPRESSION: javaClass<String>() // EXPRESSION: javaClass<String>()
@@ -5,7 +5,7 @@ fun main(args: Array<String>) {
val s1: String? = "a" val s1: String? = "a"
val s2: String? = null val s2: String? = null
//Breakpoint! //Breakpoint!
args.size args.size()
} }
// EXPRESSION: s1.length() // EXPRESSION: s1.length()
@@ -4,7 +4,7 @@ fun main(args: Array<String>) {
var a = 1 var a = 1
a += 1 a += 1
//Breakpoint! //Breakpoint!
args.size args.size()
} }
// EXPRESSION: a // EXPRESSION: a
@@ -1,7 +1,7 @@
package stdlibStep package stdlibStep
fun main(args: Array<String>) { fun main(args: Array<String>) {
val a = intArray(1) val a = intArrayOf(1)
//Breakpoint! //Breakpoint!
a.withIndices() a.withIndices()
val b = 1 val b = 1
@@ -1,7 +1,7 @@
package stepIntoStdlib package stepIntoStdlib
fun main(args: Array<String>) { fun main(args: Array<String>) {
val a = intArray(1) val a = intArrayOf(1)
//Breakpoint! //Breakpoint!
a.withIndices() a.withIndices()
val b = 1 val b = 1
@@ -1,7 +1,7 @@
package stepIntoStdlibFacadeClass package stepIntoStdlibFacadeClass
fun main(args: Array<String>) { fun main(args: Array<String>) {
val a = intArray(1) val a = intArrayOf(1)
//Breakpoint! //Breakpoint!
a.withIndex() a.withIndex()
val b = 1 val b = 1