From 195b6f9b8acd3c94ab7cb75d6136c0dbc422b60a Mon Sep 17 00:00:00 2001 From: Maria Sokolova Date: Tue, 1 Jul 2025 12:08:22 +0200 Subject: [PATCH] [debugger] Fixed flaky basic dump tests. IDEA-371651 GitOrigin-RevId: e2e123f8a80ad7a666e63099949ceec8d9b9c85b --- .../cases/K2IdeK1CodeCoroutineDumpTestGenerated.java | 6 +++--- .../cases/K2IdeK2CodeCoroutineDumpTestGenerated.java | 6 +++--- .../idea/debugger/test/CoroutineDumpTestGenerated.java | 6 +++--- .../test/K1IdeK2CodeCoroutineDumpTestGenerated.java | 6 +++--- .../{threeCoroutines.kt => sequenceNoCoroutines.kt} | 6 +++--- .../test/testData/coroutines/sequenceNoCoroutines.out | 7 +++++++ .../test/testData/coroutines/threeCoroutines.out | 10 ---------- .../jvm-debugger/test/testData/coroutines/twoDumps.kt | 10 ++++------ .../jvm-debugger/test/testData/coroutines/twoDumps.out | 2 +- 9 files changed, 27 insertions(+), 32 deletions(-) rename plugins/kotlin/jvm-debugger/test/testData/coroutines/{threeCoroutines.kt => sequenceNoCoroutines.kt} (84%) create mode 100644 plugins/kotlin/jvm-debugger/test/testData/coroutines/sequenceNoCoroutines.out delete mode 100644 plugins/kotlin/jvm-debugger/test/testData/coroutines/threeCoroutines.out diff --git a/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2IdeK1CodeCoroutineDumpTestGenerated.java b/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2IdeK1CodeCoroutineDumpTestGenerated.java index 125a62dfe1f4..60d85f51c609 100644 --- a/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2IdeK1CodeCoroutineDumpTestGenerated.java +++ b/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2IdeK1CodeCoroutineDumpTestGenerated.java @@ -35,9 +35,9 @@ public class K2IdeK1CodeCoroutineDumpTestGenerated extends AbstractK2IdeK1CodeCo runTest("../testData/coroutines/noCoroutines.kt"); } - @TestMetadata("threeCoroutines.kt") - public void testThreeCoroutines() throws Exception { - runTest("../testData/coroutines/threeCoroutines.kt"); + @TestMetadata("sequenceNoCoroutines.kt") + public void testSequenceNoCoroutines() throws Exception { + runTest("../testData/coroutines/sequenceNoCoroutines.kt"); } @TestMetadata("twoDumps.kt") diff --git a/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2IdeK2CodeCoroutineDumpTestGenerated.java b/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2IdeK2CodeCoroutineDumpTestGenerated.java index eb9bc6aab922..aa581a8b91fe 100644 --- a/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2IdeK2CodeCoroutineDumpTestGenerated.java +++ b/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2IdeK2CodeCoroutineDumpTestGenerated.java @@ -35,9 +35,9 @@ public class K2IdeK2CodeCoroutineDumpTestGenerated extends AbstractK2IdeK2CodeCo runTest("../testData/coroutines/noCoroutines.kt"); } - @TestMetadata("threeCoroutines.kt") - public void testThreeCoroutines() throws Exception { - runTest("../testData/coroutines/threeCoroutines.kt"); + @TestMetadata("sequenceNoCoroutines.kt") + public void testSequenceNoCoroutines() throws Exception { + runTest("../testData/coroutines/sequenceNoCoroutines.kt"); } @TestMetadata("twoDumps.kt") diff --git a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/CoroutineDumpTestGenerated.java b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/CoroutineDumpTestGenerated.java index bb9234b68d03..e7161b0ab362 100644 --- a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/CoroutineDumpTestGenerated.java +++ b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/CoroutineDumpTestGenerated.java @@ -35,9 +35,9 @@ public class CoroutineDumpTestGenerated extends AbstractCoroutineDumpTest { runTest("testData/coroutines/noCoroutines.kt"); } - @TestMetadata("threeCoroutines.kt") - public void testThreeCoroutines() throws Exception { - runTest("testData/coroutines/threeCoroutines.kt"); + @TestMetadata("sequenceNoCoroutines.kt") + public void testSequenceNoCoroutines() throws Exception { + runTest("testData/coroutines/sequenceNoCoroutines.kt"); } @TestMetadata("twoDumps.kt") diff --git a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/K1IdeK2CodeCoroutineDumpTestGenerated.java b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/K1IdeK2CodeCoroutineDumpTestGenerated.java index 39b7eea3a00c..02515409a671 100644 --- a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/K1IdeK2CodeCoroutineDumpTestGenerated.java +++ b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/K1IdeK2CodeCoroutineDumpTestGenerated.java @@ -35,9 +35,9 @@ public class K1IdeK2CodeCoroutineDumpTestGenerated extends AbstractK1IdeK2CodeCo runTest("testData/coroutines/noCoroutines.kt"); } - @TestMetadata("threeCoroutines.kt") - public void testThreeCoroutines() throws Exception { - runTest("testData/coroutines/threeCoroutines.kt"); + @TestMetadata("sequenceNoCoroutines.kt") + public void testSequenceNoCoroutines() throws Exception { + runTest("testData/coroutines/sequenceNoCoroutines.kt"); } @TestMetadata("twoDumps.kt") diff --git a/plugins/kotlin/jvm-debugger/test/testData/coroutines/threeCoroutines.kt b/plugins/kotlin/jvm-debugger/test/testData/coroutines/sequenceNoCoroutines.kt similarity index 84% rename from plugins/kotlin/jvm-debugger/test/testData/coroutines/threeCoroutines.kt rename to plugins/kotlin/jvm-debugger/test/testData/coroutines/sequenceNoCoroutines.kt index b729d465f8b8..5964294ca63d 100644 --- a/plugins/kotlin/jvm-debugger/test/testData/coroutines/threeCoroutines.kt +++ b/plugins/kotlin/jvm-debugger/test/testData/coroutines/sequenceNoCoroutines.kt @@ -1,10 +1,10 @@ package threeCoroutines -// ATTACH_LIBRARY: maven(org.jetbrains.kotlinx:kotlinx-coroutines-debug:1.3.8)-javaagent +// ATTACH_LIBRARY: maven(org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2)-javaagent import kotlin.random.Random -suspend fun main() { +fun main() { sequence { yield(239) sequence { @@ -12,4 +12,4 @@ suspend fun main() { yield(666) }.toList() }.toList() -} +} \ No newline at end of file diff --git a/plugins/kotlin/jvm-debugger/test/testData/coroutines/sequenceNoCoroutines.out b/plugins/kotlin/jvm-debugger/test/testData/coroutines/sequenceNoCoroutines.out new file mode 100644 index 000000000000..dadce4f3387e --- /dev/null +++ b/plugins/kotlin/jvm-debugger/test/testData/coroutines/sequenceNoCoroutines.out @@ -0,0 +1,7 @@ +LineBreakpoint created at sequenceNoCoroutines.kt:12 +Run Java +Connected to the target VM +sequenceNoCoroutines.kt:12 +Disconnected from the target VM + +Process finished with exit code 0 diff --git a/plugins/kotlin/jvm-debugger/test/testData/coroutines/threeCoroutines.out b/plugins/kotlin/jvm-debugger/test/testData/coroutines/threeCoroutines.out deleted file mode 100644 index c720f81b8f9b..000000000000 --- a/plugins/kotlin/jvm-debugger/test/testData/coroutines/threeCoroutines.out +++ /dev/null @@ -1,10 +0,0 @@ -LineBreakpoint created at threeCoroutines.kt:12 -Run Java -Connected to the target VM -threeCoroutines.kt:12 -"coroutine#1", state: RUNNING -"coroutine#2", state: RUNNING -"coroutine#3", state: RUNNING -Disconnected from the target VM - -Process finished with exit code 0 diff --git a/plugins/kotlin/jvm-debugger/test/testData/coroutines/twoDumps.kt b/plugins/kotlin/jvm-debugger/test/testData/coroutines/twoDumps.kt index c7f3574e3a42..7b2f7e3c9328 100644 --- a/plugins/kotlin/jvm-debugger/test/testData/coroutines/twoDumps.kt +++ b/plugins/kotlin/jvm-debugger/test/testData/coroutines/twoDumps.kt @@ -1,9 +1,9 @@ package twoDumps -// ATTACH_LIBRARY: maven(org.jetbrains.kotlinx:kotlinx-coroutines-debug:1.3.8)-javaagent +// ATTACH_LIBRARY: maven(org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2)-javaagent +// REGISTRY: debugger.async.stacks.coroutines=false -import kotlinx.coroutines.launch -import kotlinx.coroutines.runBlocking +import kotlinx.coroutines.* suspend fun foo() { //Breakpoint! @@ -20,6 +20,4 @@ fun main() = runBlocking { runBlocking { bar() } -} - -// REGISTRY: debugger.async.stacks.coroutines=false +} \ No newline at end of file diff --git a/plugins/kotlin/jvm-debugger/test/testData/coroutines/twoDumps.out b/plugins/kotlin/jvm-debugger/test/testData/coroutines/twoDumps.out index bab447feed3c..c1d2e5fecd24 100644 --- a/plugins/kotlin/jvm-debugger/test/testData/coroutines/twoDumps.out +++ b/plugins/kotlin/jvm-debugger/test/testData/coroutines/twoDumps.out @@ -6,7 +6,7 @@ twoDumps.kt:10 "coroutine#1", state: RUNNING twoDumps.kt:15 "coroutine#1", state: RUNNING -"coroutine#4", state: RUNNING +"coroutine#2", state: RUNNING Disconnected from the target VM Process finished with exit code 0