diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index a8e0935cbaa..20936ba2f67 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -193,7 +193,6 @@ fun main(args: Array) { ) model("stepping/stepOut", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doStepOutTest") model("stepping/stepOver", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doStepOverTest") - model("stepping/stepOverForce", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doStepOverForceTest") model("stepping/filters", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doStepIntoTest") model("stepping/custom", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doCustomTest") } diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 index 70ccd40e075..45e8024be95 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 @@ -188,7 +188,6 @@ fun main(args: Array) { ) model("stepping/stepOut", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doStepOutTest") model("stepping/stepOver", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doStepOverTest") - model("stepping/stepOverForce", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doStepOverForceTest") model("stepping/filters", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doStepIntoTest") model("stepping/custom", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doCustomTest") } diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36 index 70ccd40e075..45e8024be95 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36 @@ -188,7 +188,6 @@ fun main(args: Array) { ) model("stepping/stepOut", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doStepOutTest") model("stepping/stepOver", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doStepOverTest") - model("stepping/stepOverForce", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doStepOverForceTest") model("stepping/filters", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doStepIntoTest") model("stepping/custom", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doCustomTest") } diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as40 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as40 index 70ccd40e075..45e8024be95 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as40 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as40 @@ -188,7 +188,6 @@ fun main(args: Array) { ) model("stepping/stepOut", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doStepOutTest") model("stepping/stepOver", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doStepOverTest") - model("stepping/stepOverForce", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doStepOverForceTest") model("stepping/filters", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doStepIntoTest") model("stepping/custom", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doCustomTest") } diff --git a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinSteppingTestGenerated.java b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinSteppingTestGenerated.java index 68d0604a91e..6192fb1e831 100644 --- a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinSteppingTestGenerated.java +++ b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinSteppingTestGenerated.java @@ -637,26 +637,6 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { runTest("idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInEndOfFun.kt"); } - @TestMetadata("soSuspendableCallInEndOfLambda.kt") - public void testSoSuspendableCallInEndOfLambda() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInEndOfLambda.kt"); - } - - @TestMetadata("soSuspendableCallInFun.kt") - public void testSoSuspendableCallInFun() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInFun.kt"); - } - - @TestMetadata("soSuspendableCallInFunFromOtherStepping.kt") - public void testSoSuspendableCallInFunFromOtherStepping() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInFunFromOtherStepping.kt"); - } - - @TestMetadata("soSuspendableCallInLambda.kt") - public void testSoSuspendableCallInLambda() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInLambda.kt"); - } - @TestMetadata("stepOverCatchClause.kt") public void testStepOverCatchClause() throws Exception { runTest("idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/stepOverCatchClause.kt"); @@ -913,24 +893,6 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { } } - @TestMetadata("idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOverForce") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class StepOverForce extends AbstractKotlinSteppingTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doStepOverForceTest, this, testDataFilePath); - } - - public void testAllFilesPresentInStepOverForce() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOverForce"), Pattern.compile("^([^.]+)\\.kt$"), null, true); - } - - @TestMetadata("sofSuspendableCallInFun.kt") - public void testSofSuspendableCallInFun() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOverForce/sofSuspendableCallInFun.kt"); - } - } - @TestMetadata("idea/jvm-debugger/jvm-debugger-test/testData/stepping/filters") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInEndOfLambda.kt b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInEndOfLambda.kt deleted file mode 100644 index 6af19bd37a4..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInEndOfLambda.kt +++ /dev/null @@ -1,35 +0,0 @@ -// ATTACH_LIBRARY: coroutines - -package soSuspendableCallInEndOfLambda - -import forTests.builder -import forTests.WaitFinish -import kotlin.coroutines.Continuation -import kotlin.coroutines.* - -private fun foo(a: Any) {} - -val waiter = WaitFinish() - -fun main(args: Array) { - builder { - foo("Start") - //Breakpoint! - run() - } - - foo("Main end") - waiter.waitEnd() -} - -suspend fun run() { - suspendCoroutine { cont: Continuation -> - Thread { - Thread.sleep(10) - cont.resume(Unit) - waiter.finish() - }.start() - } -} - -// STEP_OVER: 2 \ No newline at end of file diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInEndOfLambda.out b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInEndOfLambda.out deleted file mode 100644 index f007d901737..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInEndOfLambda.out +++ /dev/null @@ -1,9 +0,0 @@ -LineBreakpoint created at soSuspendableCallInEndOfLambda.kt:18 -Run Java -Connected to the target VM -soSuspendableCallInEndOfLambda.kt:18 -soSuspendableCallInEndOfLambda.kt:15 -soSuspendableCallInEndOfLambda.kt:19 -Disconnected from the target VM - -Process finished with exit code 0 diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInFun.kt b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInFun.kt deleted file mode 100644 index abe3961913b..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInFun.kt +++ /dev/null @@ -1,39 +0,0 @@ -// ATTACH_LIBRARY: coroutines - -package soSuspendableCallInFun - -import forTests.builder -import forTests.WaitFinish -import kotlin.coroutines.Continuation -import kotlin.coroutines.* - -private fun foo(a: Any) {} - -val waiter = WaitFinish() - -fun main(args: Array) { - builder { - inFun() - } - - foo("Main end") - waiter.waitEnd() -} - -suspend fun inFun() { - //Breakpoint! - run() - foo("End") -} - -suspend fun run() { - suspendCoroutine { cont: Continuation -> - Thread { - Thread.sleep(10) - cont.resume(Unit) - waiter.finish() - }.start() - } -} - -// STEP_OVER: 2 \ No newline at end of file diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInFun.out b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInFun.out deleted file mode 100644 index 5109baa482b..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInFun.out +++ /dev/null @@ -1,9 +0,0 @@ -LineBreakpoint created at soSuspendableCallInFun.kt:25 -Run Java -Connected to the target VM -soSuspendableCallInFun.kt:25 -soSuspendableCallInFun.kt:23 -soSuspendableCallInFun.kt:26 -Disconnected from the target VM - -Process finished with exit code 0 diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInFunFromOtherStepping.kt b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInFunFromOtherStepping.kt deleted file mode 100644 index 916e01fe11f..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInFunFromOtherStepping.kt +++ /dev/null @@ -1,40 +0,0 @@ -// ATTACH_LIBRARY: coroutines - -package soSuspendableCallInFunFromOtherStepping - -import forTests.builder -import forTests.WaitFinish -import kotlin.coroutines.Continuation -import kotlin.coroutines.* - -private fun foo(a: Any) {} - -val waiter = WaitFinish() - -fun main(args: Array) { - builder { - inFun() - } - - foo("Main end") - waiter.waitEnd() -} - -suspend fun inFun() { - //Breakpoint! - foo("Start") - run() - foo("End") -} - -suspend fun run() { - return suspendCoroutine { cont: Continuation -> - Thread { - Thread.sleep(10) - cont.resume(Unit) - waiter.finish() - }.start() - } -} - -// STEP_OVER: 3 \ No newline at end of file diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInFunFromOtherStepping.out b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInFunFromOtherStepping.out deleted file mode 100644 index 291815a88b4..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInFunFromOtherStepping.out +++ /dev/null @@ -1,10 +0,0 @@ -LineBreakpoint created at soSuspendableCallInFunFromOtherStepping.kt:25 -Run Java -Connected to the target VM -soSuspendableCallInFunFromOtherStepping.kt:25 -soSuspendableCallInFunFromOtherStepping.kt:26 -soSuspendableCallInFunFromOtherStepping.kt:23 -soSuspendableCallInFunFromOtherStepping.kt:27 -Disconnected from the target VM - -Process finished with exit code 0 diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInLambda.kt b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInLambda.kt deleted file mode 100644 index ae74908ced2..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInLambda.kt +++ /dev/null @@ -1,35 +0,0 @@ -// ATTACH_LIBRARY: coroutines - -package soSuspendableCallInLambda - -import forTests.builder -import forTests.WaitFinish -import kotlin.coroutines.Continuation -import kotlin.coroutines.* - -private fun foo(a: Any) {} - -val waiter = WaitFinish() - -fun main(args: Array) { - builder { - //Breakpoint! - run() - foo("End") - } - - foo("Main end") - waiter.waitEnd() -} - -suspend fun run() { - suspendCoroutine { cont: Continuation -> - Thread { - Thread.sleep(10) - cont.resume(Unit) - waiter.finish() - }.start() - } -} - -// STEP_OVER: 2 \ No newline at end of file diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInLambda.out b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInLambda.out deleted file mode 100644 index eca445d3692..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInLambda.out +++ /dev/null @@ -1,9 +0,0 @@ -LineBreakpoint created at soSuspendableCallInLambda.kt:17 -Run Java -Connected to the target VM -soSuspendableCallInLambda.kt:17 -soSuspendableCallInLambda.kt:15 -soSuspendableCallInLambda.kt:18 -Disconnected from the target VM - -Process finished with exit code 0 diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOverForce/sofSuspendableCallInFun.kt b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOverForce/sofSuspendableCallInFun.kt deleted file mode 100644 index 258725cf6ea..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOverForce/sofSuspendableCallInFun.kt +++ /dev/null @@ -1,42 +0,0 @@ -// ATTACH_LIBRARY: coroutines - -package sofSuspendableCallInFun - -import forTests.builder -import forTests.WaitFinish -import kotlin.coroutines.Continuation -import kotlin.coroutines.* - -private fun foo(a: Any) {} - -val waiter = WaitFinish() - -fun main(args: Array) { - builder { - inFun() - } - - foo("Main end") - waiter.waitEnd() -} - -suspend fun inFun() { - //Breakpoint! - run() - foo("End") -} - -suspend fun run() { - //Breakpoint! - foo("This breakpoint should be skipped") - - suspendCoroutine { cont: Continuation -> - Thread { - Thread.sleep(10) - cont.resume(Unit) - waiter.finish() - }.start() - } -} - -// STEP_OVER_FORCE: 2 \ No newline at end of file diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOverForce/sofSuspendableCallInFun.out b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOverForce/sofSuspendableCallInFun.out deleted file mode 100644 index 99a1384b026..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOverForce/sofSuspendableCallInFun.out +++ /dev/null @@ -1,10 +0,0 @@ -LineBreakpoint created at sofSuspendableCallInFun.kt:25 -LineBreakpoint created at sofSuspendableCallInFun.kt:31 -Run Java -Connected to the target VM -sofSuspendableCallInFun.kt:25 -sofSuspendableCallInFun.kt:23 -sofSuspendableCallInFun.kt:26 -Disconnected from the target VM - -Process finished with exit code 0