Rewrite DebuggerTests (do not use FrameTree)

2015-09-22 15:32:02 +03:00
parent 5c04959871
commit 7582f1f454
19 changed files with 91 additions and 50 deletions
@@ -27,7 +27,6 @@ class MyDelegateThrowsException {

 // PRINT_FRAME
 frame    = main():8, DelegatedPropertyInClassKt {delegatedPropertyInClass}
-   static   = static = delegatedPropertyInClass.DelegatedPropertyInClassKt
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = delegatedPropertyInClass.kt, 5)
   local    = a: delegatedPropertyInClass.A = {delegatedPropertyInClass.A@uniqueID} (sp = delegatedPropertyInClass.kt, 6)
     field    = prop$delegate: delegatedPropertyInClass.MyDelegate = {delegatedPropertyInClass.MyDelegate@uniqueID} (sp = delegatedPropertyInClass.kt, 12)
@@ -23,7 +23,6 @@ class MyDelegate {
 // RENDER_DELEGATED_PROPERTIES: false
 // PRINT_FRAME
 frame    = main():8, DelegatedPropertyInClassWoRendererKt {delegatedPropertyInClassWoRenderer}
-   static   = static = delegatedPropertyInClassWoRenderer.DelegatedPropertyInClassWoRendererKt
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 5)
   local    = a: delegatedPropertyInClassWoRenderer.A = {delegatedPropertyInClassWoRenderer.A@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 6)
     field    = prop: int = {delegatedPropertyInClassWoRenderer.MyDelegate@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 12)
@@ -20,8 +20,8 @@ fun main(args: Array<String>) {
 }

 // PRINT_FRAME
+Compile bytecode for a2.prop
 frame    = main():14, EvBreakpointOnPropertyDeclarationKt {evBreakpointOnPropertyDeclaration}
-   static   = static = evBreakpointOnPropertyDeclaration.EvBreakpointOnPropertyDeclarationKt
   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)
@@ -19,7 +19,6 @@ fun main(args: Array<String>) {

 // PRINT_FRAME
 frame    = main():13, EvDelegatedPropertyKt {evDelegatedProperty}
-   static   = static = evDelegatedProperty.EvDelegatedPropertyKt
   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)
@@ -15,8 +15,8 @@ fun main(args: Array<String>) {
 }

 // PRINT_FRAME
+Compile bytecode for a.prop
 frame    = main():10, EvDuplicateItemsKt {evDuplicateItems}
-   static   = static = evDuplicateItems.EvDuplicateItemsKt
   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)
@@ -16,7 +16,6 @@ fun main(args: Array<String>) {

 // PRINT_FRAME
 frame    = main():10, EvFinalPropertyKt {evFinalProperty}
-   static   = static = evFinalProperty.EvFinalPropertyKt
   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)
@@ -24,8 +24,8 @@ fun main(args: Array<String>) {
 fun foo(i: Int) {}

 // PRINT_FRAME
+Compile bytecode for a2.prop
 frame    = main():15, EvLineRangeKt {evLineRange}
-   static   = static = evLineRange.EvLineRangeKt
   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)
@@ -17,8 +17,8 @@ fun main(args: Array<String>) {
 }

 // PRINT_FRAME
+Compile bytecode for a.prop
 frame    = main():10, EvPropertyKt {evProperty}
-   static   = static = evProperty.EvPropertyKt
   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)
@@ -20,6 +20,7 @@ fun main(args: Array<String>) {
 }

 // PRINT_FRAME
+Compile bytecode for prop
 frame    = test():8, A {evPropertyRefExpr}
   this     = this = {evPropertyRefExpr.A@uniqueID}
     field    = prop: int = 1 (sp = evPropertyRefExpr.kt, 4)
@@ -28,8 +28,8 @@ interface T {
 fun foo(i: Int) {}

 // PRINT_FRAME
+Compile bytecode for a1.prop
 frame    = main():12, EvSkipAnonymousObjectKt {evSkipAnonymousObject}
-   static   = static = evSkipAnonymousObject.EvSkipAnonymousObjectKt
   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)
@@ -23,8 +23,8 @@ fun foo(i: Int) {}
 fun l(f: () -> Unit) {}

 // PRINT_FRAME
+Compile bytecode for a1.prop
 frame    = main():12, EvSkipLambdaKt {evSkipLambda}
-   static   = static = evSkipLambda.EvSkipLambdaKt
   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)
@@ -24,8 +24,8 @@ fun main(args: Array<String>) {
 fun foo(i: Int) {}

 // PRINT_FRAME
+Compile bytecode for a1.prop
 frame    = main():12, EvSkipLocalClassKt {evSkipLocalClass}
-   static   = static = evSkipLocalClass.EvSkipLocalClassKt
   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)
@@ -15,7 +15,6 @@ fun main(args: Array<String>) {
 // RESULT: 1: I

 frame    = main():6, FrameClosingBracketKt {frameClosingBracket}
-   static   = static = frameClosingBracket.FrameClosingBracketKt
   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'
@@ -28,7 +28,6 @@ fun A.foo() {
 // EXPRESSION: myFun()
 // RESULT: 1: I
 frame    = foo():14, FrameExtensionFunKt {frameExtensionFun}
-   static   = static = frameExtensionFun.FrameExtensionFunKt
   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'
@@ -12,7 +12,6 @@ fun main(args: Array<String>) {

 // PRINT_FRAME
 frame    = main():6, FrameLocalVariableKt {frameLocalVariable}
-   static   = static = frameLocalVariable.FrameLocalVariableKt
   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'
@@ -22,7 +22,6 @@ inline fun foo(f: () -> Unit) {
 // EXPRESSION: var1
 // RESULT: 1: I
 frame    = main():7, FrameSharedVarLocalVarKt {frameSharedVarLocalVar}
-   static   = static = frameSharedVarLocalVar.FrameSharedVarLocalVarKt
   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!)
@@ -16,7 +16,6 @@ class A {

 // PRINT_FRAME
 frame    = main():6, ToStringRendererKt {toStringRenderer}
-   static   = static = toStringRenderer.ToStringRendererKt
   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)
              - No fields to display