From 5d9daf38902b9204a5baa3e3779c0e4036f94854 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Fri, 22 May 2015 12:54:08 +0300 Subject: [PATCH] Refactor stepping tests --- .../kotlin/generators/tests/GenerateTests.kt | 10 +- .../tinyApp/outs/classFromAnotherPackage.out | 2 +- .../classFromAnotherPackage.kt | 8 +- .../{stepInto => forTests}/MyJavaClass.java | 2 +- .../{ => stepping}/filters/checkNotNull.kt | 2 +- .../filters/doNotSkipClassloader.kt | 0 .../filters/doNotSkipConstructors.kt | 0 .../tinyApp/src/{ => stepping}/filters/npe.kt | 0 .../{ => stepping}/filters/reflectKClass.kt | 0 .../{ => stepping}/filters/skipClassloader.kt | 0 .../filters/skipConstructors.kt | 0 .../src/{ => stepping}/filters/stdlibStep.kt | 0 .../filters/stepIntoSpecificKotlinClasses.kt | 2 +- .../{ => stepping}/filters/stepIntoStdlib.kt | 0 .../filters/stepIntoStdlibFacadeClass.kt | 0 .../stepInto/accessors.kt | 0 .../stepInto/continueLabel.kt | 0 .../stepInto/defaultAccessors.kt | 0 .../stepInto/forLoop.kt | 0 .../stepInto/returnVoid.kt | 0 .../stepInto/stepIntoFromInlineFun.kt | 0 .../stepInto/stepIntoInlineFun.kt | 0 .../stepInto/stepIntoStdLibInlineFun.kt | 0 .../stepInto/syntheticMethods.kt | 0 .../stepInto/whenExpr.kt | 0 .../classObjectFunFromClass.kt | 0 .../classObjectFunFromTopLevel.kt | 0 .../stepIntoAndSmartStepInto/extFun.kt | 0 .../stepIntoAndSmartStepInto/javaFun.kt | 2 +- .../memberFunFromClass.kt | 0 .../memberFunFromTopLevel.kt | 0 .../memberGetterFromClass.kt | 0 .../memberGetterFromTopLevel.kt | 0 .../stepIntoAndSmartStepInto/objectFun.kt | 0 .../topLevelFunFromClass.kt | 0 .../topLevelFunFromTopLevel.kt | 0 .../topLevelGetterFromClass.kt | 0 .../topLevelGetterFromTopLevel.kt | 0 .../stepOut/fieldWatchpoints.kt | 0 .../stepOut/inapplicableFieldWatchpoints.kt | 0 .../debugger/AbstractKotlinSteppingTest.kt | 38 +++--- .../debugger/KotlinSteppingTestGenerated.java | 118 +++++++++--------- 42 files changed, 90 insertions(+), 94 deletions(-) rename idea/testData/debugger/tinyApp/src/{stepInto => forTests}/MyJavaClass.java (91%) rename idea/testData/debugger/tinyApp/src/{ => stepping}/filters/checkNotNull.kt (86%) rename idea/testData/debugger/tinyApp/src/{ => stepping}/filters/doNotSkipClassloader.kt (100%) rename idea/testData/debugger/tinyApp/src/{ => stepping}/filters/doNotSkipConstructors.kt (100%) rename idea/testData/debugger/tinyApp/src/{ => stepping}/filters/npe.kt (100%) rename idea/testData/debugger/tinyApp/src/{ => stepping}/filters/reflectKClass.kt (100%) rename idea/testData/debugger/tinyApp/src/{ => stepping}/filters/skipClassloader.kt (100%) rename idea/testData/debugger/tinyApp/src/{ => stepping}/filters/skipConstructors.kt (100%) rename idea/testData/debugger/tinyApp/src/{ => stepping}/filters/stdlibStep.kt (100%) rename idea/testData/debugger/tinyApp/src/{ => stepping}/filters/stepIntoSpecificKotlinClasses.kt (90%) rename idea/testData/debugger/tinyApp/src/{ => stepping}/filters/stepIntoStdlib.kt (100%) rename idea/testData/debugger/tinyApp/src/{ => stepping}/filters/stepIntoStdlibFacadeClass.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepInto/accessors.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepInto/continueLabel.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepInto/defaultAccessors.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepInto/forLoop.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepInto/returnVoid.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepInto/stepIntoFromInlineFun.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepInto/stepIntoInlineFun.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepInto/stepIntoStdLibInlineFun.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepInto/syntheticMethods.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepInto/whenExpr.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepIntoAndSmartStepInto/classObjectFunFromClass.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepIntoAndSmartStepInto/extFun.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepIntoAndSmartStepInto/javaFun.kt (81%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepIntoAndSmartStepInto/memberFunFromClass.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepIntoAndSmartStepInto/memberFunFromTopLevel.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepIntoAndSmartStepInto/memberGetterFromClass.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepIntoAndSmartStepInto/memberGetterFromTopLevel.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepIntoAndSmartStepInto/objectFun.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepIntoAndSmartStepInto/topLevelFunFromClass.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepIntoAndSmartStepInto/topLevelFunFromTopLevel.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepIntoAndSmartStepInto/topLevelGetterFromClass.kt (100%) rename idea/testData/debugger/tinyApp/src/{stepInto => stepping}/stepIntoAndSmartStepInto/topLevelGetterFromTopLevel.kt (100%) rename idea/testData/debugger/tinyApp/src/{ => stepping}/stepOut/fieldWatchpoints.kt (100%) rename idea/testData/debugger/tinyApp/src/{ => stepping}/stepOut/inapplicableFieldWatchpoints.kt (100%) diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 76c5d1e92c3..c8bb9ea73b3 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -612,11 +612,11 @@ fun main(args: Array) { } testClass(javaClass()) { - model("debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto", testMethod = "doStepIntoTest", testClassName = "StepInto") - model("debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto", testMethod = "doSmartStepIntoTest", testClassName = "SmartStepInto") - model("debugger/tinyApp/src/stepInto/stepInto", testMethod = "doStepIntoTest", testClassName = "StepIntoOnly") - model("debugger/tinyApp/src/stepOut", testMethod = "doStepOutTest") - model("debugger/tinyApp/src/filters", testMethod = "doStepIntoTest") + model("debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto", testMethod = "doStepIntoTest", testClassName = "StepInto") + model("debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto", testMethod = "doSmartStepIntoTest", testClassName = "SmartStepInto") + model("debugger/tinyApp/src/stepping/stepInto", testMethod = "doStepIntoTest", testClassName = "StepIntoOnly") + model("debugger/tinyApp/src/stepping/stepOut", testMethod = "doStepOutTest") + model("debugger/tinyApp/src/stepping/filters", testMethod = "doStepIntoTest") } testClass(javaClass()) { diff --git a/idea/testData/debugger/tinyApp/outs/classFromAnotherPackage.out b/idea/testData/debugger/tinyApp/outs/classFromAnotherPackage.out index d9eb0f86913..b84ae34773c 100644 --- a/idea/testData/debugger/tinyApp/outs/classFromAnotherPackage.out +++ b/idea/testData/debugger/tinyApp/outs/classFromAnotherPackage.out @@ -3,7 +3,7 @@ LineBreakpoint created at classFromAnotherPackage.kt:7 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' classFromAnotherPackage.kt:7 Compile bytecode for MyJavaClass() -Compile bytecode for stepInto.MyJavaClass() +Compile bytecode for forTests.MyJavaClass() Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' Process finished with exit code 0 diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classFromAnotherPackage.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classFromAnotherPackage.kt index b12d018f76f..b94f5b8da9e 100644 --- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classFromAnotherPackage.kt +++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classFromAnotherPackage.kt @@ -1,6 +1,6 @@ package classFromAnotherPackage -import stepInto.MyJavaClass +import forTests.MyJavaClass fun main(args: Array) { //Breakpoint! @@ -8,7 +8,7 @@ fun main(args: Array) { } // EXPRESSION: MyJavaClass() -// RESULT: instance of stepInto.MyJavaClass(id=ID): LstepInto/MyJavaClass; +// RESULT: instance of forTests.MyJavaClass(id=ID): LforTests/MyJavaClass; -// EXPRESSION: stepInto.MyJavaClass() -// RESULT: instance of stepInto.MyJavaClass(id=ID): LstepInto/MyJavaClass; +// EXPRESSION: forTests.MyJavaClass() +// RESULT: instance of forTests.MyJavaClass(id=ID): LforTests/MyJavaClass; diff --git a/idea/testData/debugger/tinyApp/src/stepInto/MyJavaClass.java b/idea/testData/debugger/tinyApp/src/forTests/MyJavaClass.java similarity index 91% rename from idea/testData/debugger/tinyApp/src/stepInto/MyJavaClass.java rename to idea/testData/debugger/tinyApp/src/forTests/MyJavaClass.java index de970cae48f..04745a60574 100644 --- a/idea/testData/debugger/tinyApp/src/stepInto/MyJavaClass.java +++ b/idea/testData/debugger/tinyApp/src/forTests/MyJavaClass.java @@ -1,4 +1,4 @@ -package stepInto; +package forTests; import org.jetbrains.annotations.NotNull; diff --git a/idea/testData/debugger/tinyApp/src/filters/checkNotNull.kt b/idea/testData/debugger/tinyApp/src/stepping/filters/checkNotNull.kt similarity index 86% rename from idea/testData/debugger/tinyApp/src/filters/checkNotNull.kt rename to idea/testData/debugger/tinyApp/src/stepping/filters/checkNotNull.kt index 9dedcb49fbc..132f505c255 100644 --- a/idea/testData/debugger/tinyApp/src/filters/checkNotNull.kt +++ b/idea/testData/debugger/tinyApp/src/stepping/filters/checkNotNull.kt @@ -1,6 +1,6 @@ package checkNotNull -import stepInto.MyJavaClass +import forTests.MyJavaClass fun main(args: Array) { val myClass = MyJavaClass() diff --git a/idea/testData/debugger/tinyApp/src/filters/doNotSkipClassloader.kt b/idea/testData/debugger/tinyApp/src/stepping/filters/doNotSkipClassloader.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/filters/doNotSkipClassloader.kt rename to idea/testData/debugger/tinyApp/src/stepping/filters/doNotSkipClassloader.kt diff --git a/idea/testData/debugger/tinyApp/src/filters/doNotSkipConstructors.kt b/idea/testData/debugger/tinyApp/src/stepping/filters/doNotSkipConstructors.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/filters/doNotSkipConstructors.kt rename to idea/testData/debugger/tinyApp/src/stepping/filters/doNotSkipConstructors.kt diff --git a/idea/testData/debugger/tinyApp/src/filters/npe.kt b/idea/testData/debugger/tinyApp/src/stepping/filters/npe.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/filters/npe.kt rename to idea/testData/debugger/tinyApp/src/stepping/filters/npe.kt diff --git a/idea/testData/debugger/tinyApp/src/filters/reflectKClass.kt b/idea/testData/debugger/tinyApp/src/stepping/filters/reflectKClass.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/filters/reflectKClass.kt rename to idea/testData/debugger/tinyApp/src/stepping/filters/reflectKClass.kt diff --git a/idea/testData/debugger/tinyApp/src/filters/skipClassloader.kt b/idea/testData/debugger/tinyApp/src/stepping/filters/skipClassloader.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/filters/skipClassloader.kt rename to idea/testData/debugger/tinyApp/src/stepping/filters/skipClassloader.kt diff --git a/idea/testData/debugger/tinyApp/src/filters/skipConstructors.kt b/idea/testData/debugger/tinyApp/src/stepping/filters/skipConstructors.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/filters/skipConstructors.kt rename to idea/testData/debugger/tinyApp/src/stepping/filters/skipConstructors.kt diff --git a/idea/testData/debugger/tinyApp/src/filters/stdlibStep.kt b/idea/testData/debugger/tinyApp/src/stepping/filters/stdlibStep.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/filters/stdlibStep.kt rename to idea/testData/debugger/tinyApp/src/stepping/filters/stdlibStep.kt diff --git a/idea/testData/debugger/tinyApp/src/filters/stepIntoSpecificKotlinClasses.kt b/idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoSpecificKotlinClasses.kt similarity index 90% rename from idea/testData/debugger/tinyApp/src/filters/stepIntoSpecificKotlinClasses.kt rename to idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoSpecificKotlinClasses.kt index dae08d9d2f9..1733d14235a 100644 --- a/idea/testData/debugger/tinyApp/src/filters/stepIntoSpecificKotlinClasses.kt +++ b/idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoSpecificKotlinClasses.kt @@ -1,6 +1,6 @@ package stepIntoSpecificKotlinClasses -import stepInto.MyJavaClass +import forTests.MyJavaClass fun main(args: Array) { val myClass = MyJavaClass() diff --git a/idea/testData/debugger/tinyApp/src/filters/stepIntoStdlib.kt b/idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoStdlib.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/filters/stepIntoStdlib.kt rename to idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoStdlib.kt diff --git a/idea/testData/debugger/tinyApp/src/filters/stepIntoStdlibFacadeClass.kt b/idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoStdlibFacadeClass.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/filters/stepIntoStdlibFacadeClass.kt rename to idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoStdlibFacadeClass.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepInto/accessors.kt b/idea/testData/debugger/tinyApp/src/stepping/stepInto/accessors.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepInto/accessors.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/accessors.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepInto/continueLabel.kt b/idea/testData/debugger/tinyApp/src/stepping/stepInto/continueLabel.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepInto/continueLabel.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/continueLabel.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepInto/defaultAccessors.kt b/idea/testData/debugger/tinyApp/src/stepping/stepInto/defaultAccessors.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepInto/defaultAccessors.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/defaultAccessors.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepInto/forLoop.kt b/idea/testData/debugger/tinyApp/src/stepping/stepInto/forLoop.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepInto/forLoop.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/forLoop.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepInto/returnVoid.kt b/idea/testData/debugger/tinyApp/src/stepping/stepInto/returnVoid.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepInto/returnVoid.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/returnVoid.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepInto/stepIntoFromInlineFun.kt b/idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoFromInlineFun.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepInto/stepIntoFromInlineFun.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoFromInlineFun.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepInto/stepIntoInlineFun.kt b/idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoInlineFun.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepInto/stepIntoInlineFun.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoInlineFun.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepInto/stepIntoStdLibInlineFun.kt b/idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoStdLibInlineFun.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepInto/stepIntoStdLibInlineFun.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoStdLibInlineFun.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepInto/syntheticMethods.kt b/idea/testData/debugger/tinyApp/src/stepping/stepInto/syntheticMethods.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepInto/syntheticMethods.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/syntheticMethods.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepInto/whenExpr.kt b/idea/testData/debugger/tinyApp/src/stepping/stepInto/whenExpr.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepInto/whenExpr.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepInto/whenExpr.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromClass.kt b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/classObjectFunFromClass.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromClass.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/classObjectFunFromClass.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.kt b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/extFun.kt b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/extFun.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/extFun.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/extFun.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/javaFun.kt b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/javaFun.kt similarity index 81% rename from idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/javaFun.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/javaFun.kt index a9179f47505..bd8d722a220 100644 --- a/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/javaFun.kt +++ b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/javaFun.kt @@ -1,6 +1,6 @@ package javaFun -import stepInto.MyJavaClass +import forTests.MyJavaClass fun main(args: Array) { val klass = MyJavaClass() diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberFunFromClass.kt b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberFunFromClass.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberFunFromClass.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberFunFromClass.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberFunFromTopLevel.kt b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberFunFromTopLevel.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberFunFromTopLevel.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberFunFromTopLevel.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberGetterFromClass.kt b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberGetterFromClass.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberGetterFromClass.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberGetterFromClass.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberGetterFromTopLevel.kt b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberGetterFromTopLevel.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberGetterFromTopLevel.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberGetterFromTopLevel.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/objectFun.kt b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/objectFun.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/objectFun.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/objectFun.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelFunFromClass.kt b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelFunFromClass.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelFunFromClass.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelFunFromClass.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelFunFromTopLevel.kt b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelFunFromTopLevel.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelFunFromTopLevel.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelFunFromTopLevel.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelGetterFromClass.kt b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelGetterFromClass.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelGetterFromClass.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelGetterFromClass.kt diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelGetterFromTopLevel.kt b/idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelGetterFromTopLevel.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelGetterFromTopLevel.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelGetterFromTopLevel.kt diff --git a/idea/testData/debugger/tinyApp/src/stepOut/fieldWatchpoints.kt b/idea/testData/debugger/tinyApp/src/stepping/stepOut/fieldWatchpoints.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepOut/fieldWatchpoints.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepOut/fieldWatchpoints.kt diff --git a/idea/testData/debugger/tinyApp/src/stepOut/inapplicableFieldWatchpoints.kt b/idea/testData/debugger/tinyApp/src/stepping/stepOut/inapplicableFieldWatchpoints.kt similarity index 100% rename from idea/testData/debugger/tinyApp/src/stepOut/inapplicableFieldWatchpoints.kt rename to idea/testData/debugger/tinyApp/src/stepping/stepOut/inapplicableFieldWatchpoints.kt diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractKotlinSteppingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractKotlinSteppingTest.kt index 2e9912c327f..24efb95f128 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractKotlinSteppingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractKotlinSteppingTest.kt @@ -32,41 +32,37 @@ import com.intellij.debugger.settings.DebuggerSettings public abstract class AbstractKotlinSteppingTest : KotlinDebuggerTestBase() { protected fun doStepIntoTest(path: String) { - val fileText = FileUtil.loadFile(File(path)) - - configureSettings(fileText) - - createDebugProcess(path) - val count = findStringWithPrefixes(fileText, "// STEP_INTO: ")?.toInt() ?: 1 - - for (i in 1..count) { - onBreakpoint { stepInto() } - } - - finish() + doTest(path, "STEP_INTO") } protected fun doStepOutTest(path: String) { + doTest(path, "STEP_OUT") + } + + protected fun doSmartStepIntoTest(path: String) { + doTest(path, "SMART_STEP_INTO") + } + + private fun doTest(path: String, command: String) { val fileText = FileUtil.loadFile(File(path)) configureSettings(fileText) createDebugProcess(path) - val count = findStringWithPrefixes(fileText, "// STEP_OUT: ")?.toInt() ?: 1 - for (i in 1..count) { - onBreakpoint { stepOut() } + for (i in 1..(getPrefixedInt(fileText, "// $command: ") ?: 1)) { + onBreakpoint { + when(command) { + "STEP_INTO" -> stepInto() + "STEP_OUT" -> stepOut() + "SMART_STEP_INTO" -> smartStepInto() + } + } } finish() } - protected fun doSmartStepIntoTest(path: String) { - createDebugProcess(path) - onBreakpoint { smartStepInto() } - finish() - } - private fun SuspendContextImpl.smartStepInto() { this.smartStepInto(false) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java index 135a45385df..a15be2a3130 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java @@ -29,341 +29,341 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @RunWith(JUnit3RunnerWithInners.class) public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { - @TestMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto") + @TestMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class StepInto extends AbstractKotlinSteppingTest { public void testAllFilesPresentInStepInto() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classObjectFunFromClass.kt") public void testClassObjectFunFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromClass.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/classObjectFunFromClass.kt"); doStepIntoTest(fileName); } @TestMetadata("classObjectFunFromTopLevel.kt") public void testClassObjectFunFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.kt"); doStepIntoTest(fileName); } @TestMetadata("extFun.kt") public void testExtFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/extFun.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/extFun.kt"); doStepIntoTest(fileName); } @TestMetadata("javaFun.kt") public void testJavaFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/javaFun.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/javaFun.kt"); doStepIntoTest(fileName); } @TestMetadata("memberFunFromClass.kt") public void testMemberFunFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberFunFromClass.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberFunFromClass.kt"); doStepIntoTest(fileName); } @TestMetadata("memberFunFromTopLevel.kt") public void testMemberFunFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberFunFromTopLevel.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberFunFromTopLevel.kt"); doStepIntoTest(fileName); } @TestMetadata("memberGetterFromClass.kt") public void testMemberGetterFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberGetterFromClass.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberGetterFromClass.kt"); doStepIntoTest(fileName); } @TestMetadata("memberGetterFromTopLevel.kt") public void testMemberGetterFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberGetterFromTopLevel.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberGetterFromTopLevel.kt"); doStepIntoTest(fileName); } @TestMetadata("objectFun.kt") public void testObjectFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/objectFun.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/objectFun.kt"); doStepIntoTest(fileName); } @TestMetadata("topLevelFunFromClass.kt") public void testTopLevelFunFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelFunFromClass.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelFunFromClass.kt"); doStepIntoTest(fileName); } @TestMetadata("topLevelFunFromTopLevel.kt") public void testTopLevelFunFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelFunFromTopLevel.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelFunFromTopLevel.kt"); doStepIntoTest(fileName); } @TestMetadata("topLevelGetterFromClass.kt") public void testTopLevelGetterFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelGetterFromClass.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelGetterFromClass.kt"); doStepIntoTest(fileName); } @TestMetadata("topLevelGetterFromTopLevel.kt") public void testTopLevelGetterFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelGetterFromTopLevel.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelGetterFromTopLevel.kt"); doStepIntoTest(fileName); } } - @TestMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto") + @TestMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class SmartStepInto extends AbstractKotlinSteppingTest { public void testAllFilesPresentInSmartStepInto() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classObjectFunFromClass.kt") public void testClassObjectFunFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromClass.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/classObjectFunFromClass.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("classObjectFunFromTopLevel.kt") public void testClassObjectFunFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("extFun.kt") public void testExtFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/extFun.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/extFun.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("javaFun.kt") public void testJavaFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/javaFun.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/javaFun.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("memberFunFromClass.kt") public void testMemberFunFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberFunFromClass.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberFunFromClass.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("memberFunFromTopLevel.kt") public void testMemberFunFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberFunFromTopLevel.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberFunFromTopLevel.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("memberGetterFromClass.kt") public void testMemberGetterFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberGetterFromClass.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberGetterFromClass.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("memberGetterFromTopLevel.kt") public void testMemberGetterFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberGetterFromTopLevel.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberGetterFromTopLevel.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("objectFun.kt") public void testObjectFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/objectFun.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/objectFun.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("topLevelFunFromClass.kt") public void testTopLevelFunFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelFunFromClass.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelFunFromClass.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("topLevelFunFromTopLevel.kt") public void testTopLevelFunFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelFunFromTopLevel.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelFunFromTopLevel.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("topLevelGetterFromClass.kt") public void testTopLevelGetterFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelGetterFromClass.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelGetterFromClass.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("topLevelGetterFromTopLevel.kt") public void testTopLevelGetterFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelGetterFromTopLevel.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelGetterFromTopLevel.kt"); doSmartStepIntoTest(fileName); } } - @TestMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepInto") + @TestMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class StepIntoOnly extends AbstractKotlinSteppingTest { @TestMetadata("accessors.kt") public void testAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepInto/accessors.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/accessors.kt"); doStepIntoTest(fileName); } public void testAllFilesPresentInStepIntoOnly() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepInto/stepInto"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepping/stepInto"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("continueLabel.kt") public void testContinueLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepInto/continueLabel.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/continueLabel.kt"); doStepIntoTest(fileName); } @TestMetadata("defaultAccessors.kt") public void testDefaultAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepInto/defaultAccessors.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/defaultAccessors.kt"); doStepIntoTest(fileName); } @TestMetadata("forLoop.kt") public void testForLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepInto/forLoop.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/forLoop.kt"); doStepIntoTest(fileName); } @TestMetadata("returnVoid.kt") public void testReturnVoid() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepInto/returnVoid.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/returnVoid.kt"); doStepIntoTest(fileName); } @TestMetadata("stepIntoFromInlineFun.kt") public void testStepIntoFromInlineFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepInto/stepIntoFromInlineFun.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoFromInlineFun.kt"); doStepIntoTest(fileName); } @TestMetadata("stepIntoInlineFun.kt") public void testStepIntoInlineFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepInto/stepIntoInlineFun.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoInlineFun.kt"); doStepIntoTest(fileName); } @TestMetadata("stepIntoStdLibInlineFun.kt") public void testStepIntoStdLibInlineFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepInto/stepIntoStdLibInlineFun.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoStdLibInlineFun.kt"); doStepIntoTest(fileName); } @TestMetadata("syntheticMethods.kt") public void testSyntheticMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepInto/syntheticMethods.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/syntheticMethods.kt"); doStepIntoTest(fileName); } @TestMetadata("whenExpr.kt") public void testWhenExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepInto/whenExpr.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/whenExpr.kt"); doStepIntoTest(fileName); } } - @TestMetadata("idea/testData/debugger/tinyApp/src/stepOut") + @TestMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class StepOut extends AbstractKotlinSteppingTest { public void testAllFilesPresentInStepOut() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepOut"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepping/stepOut"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("fieldWatchpoints.kt") public void testFieldWatchpoints() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepOut/fieldWatchpoints.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/fieldWatchpoints.kt"); doStepOutTest(fileName); } @TestMetadata("inapplicableFieldWatchpoints.kt") public void testInapplicableFieldWatchpoints() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepOut/inapplicableFieldWatchpoints.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/inapplicableFieldWatchpoints.kt"); doStepOutTest(fileName); } } - @TestMetadata("idea/testData/debugger/tinyApp/src/filters") + @TestMetadata("idea/testData/debugger/tinyApp/src/stepping/filters") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Filters extends AbstractKotlinSteppingTest { public void testAllFilesPresentInFilters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/filters"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepping/filters"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("checkNotNull.kt") public void testCheckNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/filters/checkNotNull.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/checkNotNull.kt"); doStepIntoTest(fileName); } @TestMetadata("doNotSkipClassloader.kt") public void testDoNotSkipClassloader() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/filters/doNotSkipClassloader.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/doNotSkipClassloader.kt"); doStepIntoTest(fileName); } @TestMetadata("doNotSkipConstructors.kt") public void testDoNotSkipConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/filters/doNotSkipConstructors.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/doNotSkipConstructors.kt"); doStepIntoTest(fileName); } @TestMetadata("npe.kt") public void testNpe() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/filters/npe.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/npe.kt"); doStepIntoTest(fileName); } @TestMetadata("reflectKClass.kt") public void testReflectKClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/filters/reflectKClass.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/reflectKClass.kt"); doStepIntoTest(fileName); } @TestMetadata("skipClassloader.kt") public void testSkipClassloader() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/filters/skipClassloader.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/skipClassloader.kt"); doStepIntoTest(fileName); } @TestMetadata("skipConstructors.kt") public void testSkipConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/filters/skipConstructors.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/skipConstructors.kt"); doStepIntoTest(fileName); } @TestMetadata("stdlibStep.kt") public void testStdlibStep() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/filters/stdlibStep.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/stdlibStep.kt"); doStepIntoTest(fileName); } @TestMetadata("stepIntoSpecificKotlinClasses.kt") public void testStepIntoSpecificKotlinClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/filters/stepIntoSpecificKotlinClasses.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoSpecificKotlinClasses.kt"); doStepIntoTest(fileName); } @TestMetadata("stepIntoStdlib.kt") public void testStepIntoStdlib() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/filters/stepIntoStdlib.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoStdlib.kt"); doStepIntoTest(fileName); } @TestMetadata("stepIntoStdlibFacadeClass.kt") public void testStepIntoStdlibFacadeClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/filters/stepIntoStdlibFacadeClass.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoStdlibFacadeClass.kt"); doStepIntoTest(fileName); } }