Update test data in debugger tests

This commit is contained in:
Nikolay Krasko
2015-12-30 16:57:44 +03:00
parent 4dffacfd1b
commit 37b6849d31
39 changed files with 41 additions and 44 deletions
@@ -31,7 +31,7 @@ class MyDelegateThrowsException {
// SKIP: stackTrace
Compile bytecode for args.size
frame = main():9, DelegatedPropertyInClassKt {delegatedPropertyInClass}
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)
field = prop$delegate: delegatedPropertyInClass.MyDelegate = {delegatedPropertyInClass.MyDelegate@uniqueID} (sp = delegatedPropertyInClass.kt, 13)
@@ -25,7 +25,7 @@ class MyDelegate {
// PRINT_FRAME
Compile bytecode for args.size
frame = main():9, DelegatedPropertyInClassWoRendererKt {delegatedPropertyInClassWoRenderer}
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)
@@ -21,7 +21,7 @@ fun main(args: Array<String>) {
// PRINT_FRAME
Compile bytecode for a2.prop
frame = main():14, EvBreakpointOnPropertyDeclarationKt {evBreakpointOnPropertyDeclaration}
frame = main:14, EvBreakpointOnPropertyDeclarationKt {evBreakpointOnPropertyDeclaration}
local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evBreakpointOnPropertyDeclaration.kt, 7)
local = a1: evBreakpointOnPropertyDeclaration.A = {evBreakpointOnPropertyDeclaration.A@uniqueID} (sp = evBreakpointOnPropertyDeclaration.kt, 8)
field = prop: int = 1 (sp = evBreakpointOnPropertyDeclaration.kt, 4)
@@ -18,7 +18,7 @@ fun main(args: Array<String>) {
}
// PRINT_FRAME
frame = main():13, EvDelegatedPropertyKt {evDelegatedProperty}
frame = main:13, EvDelegatedPropertyKt {evDelegatedProperty}
local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evDelegatedProperty.kt, 9)
local = a: evDelegatedProperty.A = {evDelegatedProperty.A@uniqueID} (sp = evDelegatedProperty.kt, 10)
field = prop$delegate: kotlin.properties.ReadWriteProperty = {kotlin.properties.NotNullVar@uniqueID} (sp = evDelegatedProperty.kt, 6)
+1 -1
View File
@@ -16,7 +16,7 @@ fun main(args: Array<String>) {
// PRINT_FRAME
Compile bytecode for a.prop
frame = main():10, EvDuplicateItemsKt {evDuplicateItems}
frame = main:10, EvDuplicateItemsKt {evDuplicateItems}
local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evDuplicateItems.kt, 7)
local = a: evDuplicateItems.A = {evDuplicateItems.A@uniqueID} (sp = evDuplicateItems.kt, 8)
field = prop: int = 1 (sp = evDuplicateItems.kt, 4)
+1 -1
View File
@@ -15,7 +15,7 @@ fun main(args: Array<String>) {
}
// PRINT_FRAME
frame = main():10, EvFinalPropertyKt {evFinalProperty}
frame = main:10, EvFinalPropertyKt {evFinalProperty}
local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evFinalProperty.kt, 7)
local = a: evFinalProperty.A = {evFinalProperty.A@uniqueID} (sp = evFinalProperty.kt, 8)
field = prop: int = 1 (sp = evFinalProperty.kt, 4)
@@ -15,7 +15,7 @@ fun main(args: Array<String>) {
// PRINT_FRAME
Compile bytecode for a
frame = foo():5, A {evFunctionDeclaration}
frame = foo:5, A {evFunctionDeclaration}
this = this = {evFunctionDeclaration.A@uniqueID}
field = a: int = 1 (sp = evFunctionDeclaration.kt, 3)
extra = a
+1 -1
View File
@@ -25,7 +25,7 @@ fun foo(i: Int) {}
// PRINT_FRAME
Compile bytecode for a2.prop
frame = main():15, EvLineRangeKt {evLineRange}
frame = main:15, EvLineRangeKt {evLineRange}
local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evLineRange.kt, 7)
local = a1: evLineRange.A = {evLineRange.A@uniqueID} (sp = evLineRange.kt, 8)
field = prop: int = 1 (sp = evLineRange.kt, 4)
+1 -1
View File
@@ -18,7 +18,7 @@ fun main(args: Array<String>) {
// PRINT_FRAME
Compile bytecode for a.prop
frame = main():10, EvPropertyKt {evProperty}
frame = main:10, EvPropertyKt {evProperty}
local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evProperty.kt, 7)
local = a: evProperty.A = {evProperty.A@uniqueID} (sp = evProperty.kt, 8)
field = prop: int = 1 (sp = evProperty.kt, 4)
+1 -1
View File
@@ -21,7 +21,7 @@ fun main(args: Array<String>) {
// PRINT_FRAME
Compile bytecode for prop
frame = test():8, A {evPropertyRefExpr}
frame = test:8, A {evPropertyRefExpr}
this = this = {evPropertyRefExpr.A@uniqueID}
field = prop: int = 1 (sp = evPropertyRefExpr.kt, 4)
extra = prop
@@ -29,7 +29,7 @@ fun foo(i: Int) {}
// PRINT_FRAME
Compile bytecode for a1.prop
frame = main():12, EvSkipAnonymousObjectKt {evSkipAnonymousObject}
frame = main:12, EvSkipAnonymousObjectKt {evSkipAnonymousObject}
local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evSkipAnonymousObject.kt, 7)
local = a1: evSkipAnonymousObject.A = {evSkipAnonymousObject.A@uniqueID} (sp = evSkipAnonymousObject.kt, 8)
field = prop: int = 1 (sp = evSkipAnonymousObject.kt, 4)
+1 -1
View File
@@ -24,7 +24,7 @@ fun l(f: () -> Unit) {}
// PRINT_FRAME
Compile bytecode for a1.prop
frame = main():12, EvSkipLambdaKt {evSkipLambda}
frame = main:12, EvSkipLambdaKt {evSkipLambda}
local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evSkipLambda.kt, 7)
local = a1: evSkipLambda.A = {evSkipLambda.A@uniqueID} (sp = evSkipLambda.kt, 8)
field = prop: int = 1 (sp = evSkipLambda.kt, 4)
+1 -1
View File
@@ -25,7 +25,7 @@ fun foo(i: Int) {}
// PRINT_FRAME
Compile bytecode for a1.prop
frame = main():12, EvSkipLocalClassKt {evSkipLocalClass}
frame = main:12, EvSkipLocalClassKt {evSkipLocalClass}
local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evSkipLocalClass.kt, 7)
local = a1: evSkipLocalClass.A = {evSkipLocalClass.A@uniqueID} (sp = evSkipLocalClass.kt, 8)
field = prop: int = 1 (sp = evSkipLocalClass.kt, 4)
@@ -25,7 +25,7 @@ fun foo(f: () -> Unit) {
}
// PRINT_FRAME
frame = invoke():11, FrameAnonymousObjectKt$main$o$1$run$1 {frameAnonymousObject}
frame = invoke:11, FrameAnonymousObjectKt$main$o$1$run$1 {frameAnonymousObject}
this = this = {frameAnonymousObject.FrameAnonymousObjectKt$main$o$1$run$1@uniqueID}Function0<kotlin.Unit>
field = this$0: frameAnonymousObject.FrameAnonymousObjectKt$main$o$1 = {frameAnonymousObject.FrameAnonymousObjectKt$main$o$1@uniqueID} (sp = null)
field = obProp: int = 1 (sp = frameAnonymousObject.kt, 6)
+1 -1
View File
@@ -35,7 +35,7 @@ fun foo(f: () -> Unit) {
// EXPRESSION: myFun()
// RESULT: 1: I
frame = invoke():16, A$test$1 {frameClassObject}
frame = invoke:16, A$test$1 {frameClassObject}
this = this = {frameClassObject.A$test$1@uniqueID}Function0<kotlin.Unit>
field = arity: int = 0 (sp = Lambda.!EXT!)
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
@@ -14,7 +14,7 @@ fun main(args: Array<String>) {
// EXPRESSION: a
// RESULT: 1: I
frame = main():6, FrameClosingBracketKt {frameClosingBracket}
frame = main:6, FrameClosingBracketKt {frameClosingBracket}
local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameClosingBracket.kt, 3)
local = a: int = 1 (sp = frameClosingBracket.kt, 4)
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+1 -1
View File
@@ -83,7 +83,7 @@ fun lambda(f: () -> Unit) {
// EXPRESSION: bMyFun()
// RESULT: 1: I
frame = invoke():24, Outer$foo$LocalClass$test$1 {frameExtFunExtFun}
frame = invoke:24, Outer$foo$LocalClass$test$1 {frameExtFunExtFun}
this = this = {frameExtFunExtFun.Outer$foo$LocalClass$test$1@uniqueID}Function0<kotlin.Unit>
field = this$0: frameExtFunExtFun.Outer$foo$LocalClass = {frameExtFunExtFun.Outer$foo$LocalClass@uniqueID} (sp = null)
field = lcProp: int = 1 (sp = frameExtFunExtFun.kt, 19)
+1 -1
View File
@@ -27,7 +27,7 @@ fun A.foo() {
// EXPRESSION: myFun()
// RESULT: 1: I
frame = foo():14, FrameExtensionFunKt {frameExtensionFun}
frame = foo:14, FrameExtensionFunKt {frameExtensionFun}
local = $receiver: frameExtensionFun.A = {frameExtensionFun.A@uniqueID} (sp = null)
field = prop: int = 1 (sp = frameExtensionFun.kt, 8)
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
@@ -28,7 +28,7 @@ class A {
// RESULT: 1: I
frame = main():7, FrameInlineArgumentKt {frameInlineArgument}
frame = main:7, FrameInlineArgumentKt {frameInlineArgument}
local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameInlineArgument.kt, 3)
local = element: int = 1 (sp = frameInlineArgument.kt, 4)
local = this_$iv: frameInlineArgument.A = {frameInlineArgument.A@uniqueID} (sp = null)
@@ -41,7 +41,7 @@ fun main(args: Array<String>) {
// EXPRESSION: element
// RESULT: 1: I
frame = bar():16, C {frameInlineArgumentInsideInlineFun}
frame = bar:16, C {frameInlineArgumentInsideInlineFun}
this = this = {frameInlineArgumentInsideInlineFun.C@uniqueID}
- Class has no fields
local = element: float = 1.0 (sp = frameInlineArgumentInsideInlineFun.kt, 13)
+1 -1
View File
@@ -32,7 +32,7 @@ class A {
// RESULT: 1: I
frame = main():14, FrameInlineFunKt {frameInlineFun}
frame = main:14, FrameInlineFunKt {frameInlineFun}
local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = null)
local = element: int = 1 (sp = frameInlineFun.kt, 12)
local = this_$iv: frameInlineFun.A = {frameInlineFun.A@uniqueID} (sp = null)
@@ -54,7 +54,7 @@ fun main(args: Array<String>) {
// RESULT: 1: I
frame = bar():7, C {frameInlineFunCallInsideInlineFun}
frame = bar:7, C {frameInlineFunCallInsideInlineFun}
this = this = {frameInlineFunCallInsideInlineFun.C@uniqueID}
- Class has no fields
local = element: float = 1.0 (sp = frameInlineFunCallInsideInlineFun.kt, 5)
+1 -1
View File
@@ -40,7 +40,7 @@ class A {
// EXPRESSION: myFun2()
// RESULT: 1: I
frame = test():17, A$Inner {frameInnerClass}
frame = test:17, A$Inner {frameInnerClass}
this = this = {frameInnerClass.A$Inner@uniqueID}
field = prop2: int = 1 (sp = frameInnerClass.kt, 12)
field = this$0: frameInnerClass.A = {frameInnerClass.A@uniqueID} (sp = null)
+1 -1
View File
@@ -32,7 +32,7 @@ fun foo(f: () -> Unit) {
// EXPRESSION: val1 + val2
// RESULT: 2: I
frame = invoke():9, FrameInnerLambdaKt$main$1$1 {frameInnerLambda}
frame = invoke:9, FrameInnerLambdaKt$main$1$1 {frameInnerLambda}
this = this = {frameInnerLambda.FrameInnerLambdaKt$main$1$1@uniqueID}Function0<kotlin.Unit>
field = this$0: frameInnerLambda.FrameInnerLambdaKt$main$1 = {frameInnerLambda.FrameInnerLambdaKt$main$1@uniqueID}Function0<kotlin.Unit> (sp = null)
field = $val1: int = 1 (sp = null)
+1 -1
View File
@@ -21,7 +21,7 @@ fun foo(f: () -> Unit) {
// EXPRESSION: val1
// RESULT: 1: I
frame = invoke():7, FrameLambdaKt$main$1 {frameLambda}
frame = invoke:7, FrameLambdaKt$main$1 {frameLambda}
this = this = {frameLambda.FrameLambdaKt$main$1@uniqueID}Function0<kotlin.Unit>
field = $val1: int = 1 (sp = null)
field = arity: int = 0 (sp = Lambda.!EXT!)
+1 -1
View File
@@ -21,7 +21,7 @@ fun foo(f: () -> Unit) {
// EXPRESSION: val1
// RESULT: Cannot find local variable: name = val1
frame = invoke():7, FrameLambdaNotUsedKt$main$1 {frameLambdaNotUsed}
frame = invoke:7, FrameLambdaNotUsedKt$main$1 {frameLambdaNotUsed}
this = this = {frameLambdaNotUsed.FrameLambdaNotUsedKt$main$1@uniqueID}Function0<kotlin.Unit>
field = arity: int = 0 (sp = Lambda.!EXT!)
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+1 -1
View File
@@ -11,7 +11,7 @@ fun main(args: Array<String>) {
}
// PRINT_FRAME
frame = main():6, FrameLocalVariableKt {frameLocalVariable}
frame = main:6, FrameLocalVariableKt {frameLocalVariable}
local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameLocalVariable.kt, 3)
local = val1: int = 1 (sp = frameLocalVariable.kt, 4)
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+1 -1
View File
@@ -29,7 +29,7 @@ fun foo(f: () -> Unit) {
// EXPRESSION: O.obMyFun()
// RESULT: 1: I
frame = invoke():6, FrameObjectKt$main$1 {frameObject}
frame = invoke:6, FrameObjectKt$main$1 {frameObject}
this = this = {frameObject.FrameObjectKt$main$1@uniqueID}Function0<kotlin.Unit>
field = arity: int = 0 (sp = Lambda.!EXT!)
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+1 -1
View File
@@ -21,7 +21,7 @@ fun foo(f: () -> Unit) {
// EXPRESSION: var1
// RESULT: 1: I
frame = invoke():7, FrameSharedVarKt$main$1 {frameSharedVar}
frame = invoke:7, FrameSharedVarKt$main$1 {frameSharedVar}
this = this = {frameSharedVar.FrameSharedVarKt$main$1@uniqueID}Function0<kotlin.Unit>
field = $var1: kotlin.jvm.internal.Ref$IntRef = {kotlin.jvm.internal.Ref$IntRef@uniqueID}1 (sp = null)
field = element: int = 1 (sp = Ref.!EXT!)
@@ -21,7 +21,7 @@ inline fun foo(f: () -> Unit) {
// EXPRESSION: var1
// RESULT: 1: I
frame = main():7, FrameSharedVarLocalVarKt {frameSharedVarLocalVar}
frame = main:7, FrameSharedVarLocalVarKt {frameSharedVarLocalVar}
local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameSharedVarLocalVar.kt, 3)
local = var1: kotlin.jvm.internal.Ref$IntRef = {kotlin.jvm.internal.Ref$IntRef@uniqueID}1 (sp = frameSharedVarLocalVar.kt, 4)
field = element: int = 1 (sp = Ref.!EXT!)
+1 -1
View File
@@ -32,7 +32,7 @@ class MyClass
// EXPRESSION: val1 + topVal1
// RESULT: 2: I
frame = main():9, FrameSimpleKt {frameSimple}
frame = main:9, FrameSimpleKt {frameSimple}
static = static = frameSimple.FrameSimpleKt
field = topVal1: int = 1 (sp = frameSimple.kt, 3)
local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameSimple.kt, 5)
+1 -1
View File
@@ -47,7 +47,7 @@ fun foo(f: () -> Unit) {
// EXPRESSION: myFun()
// RESULT: 1: I
frame = invoke():16, A$test$1 {frameThis0}
frame = invoke:16, A$test$1 {frameThis0}
this = this = {frameThis0.A$test$1@uniqueID}Function0<kotlin.Unit>
field = this$0: frameThis0.A = {frameThis0.A@uniqueID} (sp = null)
field = prop1: int = 1 (sp = frameThis0.kt, 8)
+1 -1
View File
@@ -63,7 +63,7 @@ fun foo(f: () -> Unit) {
// EXPRESSION: myFun2()
// RESULT: 1: I
frame = invoke():15, A$testExt$1 {frameThis0Ext}
frame = invoke:15, A$testExt$1 {frameThis0Ext}
this = this = {frameThis0Ext.A$testExt$1@uniqueID}Function0<kotlin.Unit>
field = this$0: frameThis0Ext.A = {frameThis0Ext.A@uniqueID} (sp = null)
field = prop1: int = 1 (sp = frameThis0Ext.kt, 8)
+1 -1
View File
@@ -49,7 +49,7 @@ fun foo(f: () -> Unit) {
// EXPRESSION: myFun()
// RESULT: 1: I
frame = invoke():17, A$test$1$1 {frameThis0This0}
frame = invoke:17, A$test$1$1 {frameThis0This0}
this = this = {frameThis0This0.A$test$1$1@uniqueID}Function0<kotlin.Unit>
field = this$0: frameThis0This0.A$test$1 = {frameThis0This0.A$test$1@uniqueID}Function0<kotlin.Unit> (sp = null)
field = this$0: frameThis0This0.A = {frameThis0This0.A@uniqueID} (sp = null)
@@ -5,8 +5,8 @@ stepIntoSpecificKotlinClasses.kt:8
MyJavaClass.java:12
stepIntoSpecificKotlinClasses.kt:8
Intrinsics.!EXT!
Intrinsics.!EXT!
stepIntoSpecificKotlinClasses.kt:8
stepIntoSpecificKotlinClasses.kt:9
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
Process finished with exit code 0
+1 -1
View File
@@ -7,7 +7,7 @@ syntheticMethods.kt:19
syntheticMethods.kt:20
syntheticMethods.kt:17
syntheticMethods.kt:7
syntheticMethods.kt:0
syntheticMethods.kt:-1
syntheticMethods.kt:7
syntheticMethods.kt:25
syntheticMethods.kt:31
@@ -5,7 +5,7 @@ syntheticMethodsSkip.kt:6
syntheticMethodsSkip.kt:19
syntheticMethodsSkip.kt:20
syntheticMethodsSkip.kt:7
syntheticMethodsSkip.kt:0
syntheticMethodsSkip.kt:-1
syntheticMethodsSkip.kt:7
syntheticMethodsSkip.kt:25
syntheticMethodsSkip.kt:31
+1 -1
View File
@@ -16,7 +16,7 @@ class A {
// PRINT_FRAME
Compile bytecode for args.size
frame = main():6, ToStringRendererKt {toStringRenderer}
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
@@ -236,14 +236,11 @@ abstract class KotlinDebuggerTestBase : KotlinDebuggerTestCase() {
return "null"
}
val virtualFile = sourcePosition.file.virtualFile
if (virtualFile == null) {
return "VirtualFile for position is null"
}
val virtualFile = sourcePosition.file.originalFile.virtualFile ?: sourcePosition.file.viewProvider.virtualFile ?:
return "VirtualFile for position is null"
val libraryEntry = LibraryUtil.findLibraryEntry(virtualFile, project)
if (libraryEntry != null && (libraryEntry is JdkOrderEntry ||
libraryEntry.presentableName == KOTLIN_LIBRARY_NAME)) {
if (libraryEntry != null && (libraryEntry is JdkOrderEntry || libraryEntry.presentableName == KOTLIN_LIBRARY_NAME)) {
return FileUtil.getNameWithoutExtension(virtualFile.name) + ".!EXT!"
}