azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Debugger: Remove flaky sleep-based stepping tests

Browse Source
This commit is contained in:
Yan Zhulanow
2020-01-15 21:48:05 +09:00
parent 01a6e7abf3
commit 9cba72d5dd
15 changed files with 0 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
-1
View File
@@ -193,7 +193,6 @@ fun main(args: Array<String>) {
)
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")
}
generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35
-1
View File
@@ -188,7 +188,6 @@ fun main(args: Array<String>) {
)
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")
}
generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36
-1
View File
@@ -188,7 +188,6 @@ fun main(args: Array<String>) {
)
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")
}
generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as40
-1
View File
@@ -188,7 +188,6 @@ fun main(args: Array<String>) {
)
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")
}
idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinSteppingTestGenerated.java
Generated
-38
View File
@@ -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)
idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInEndOfLambda.kt
Vendored
-35
View File
@@ -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<String>) {
builder {
foo("Start")
//Breakpoint!
run()
}
foo("Main end")
waiter.waitEnd()
}
suspend fun run() {
suspendCoroutine { cont: Continuation<Unit> ->
Thread {
Thread.sleep(10)
cont.resume(Unit)
waiter.finish()
}.start()
}
}
// STEP_OVER: 2
idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInEndOfLambda.out
Vendored
-9
View File
@@ -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
idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInFun.kt
Vendored
-39
View File
@@ -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<String>) {
builder {
inFun()
}
foo("Main end")
waiter.waitEnd()
}
suspend fun inFun() {
//Breakpoint!
run()
foo("End")
}
suspend fun run() {
suspendCoroutine { cont: Continuation<Unit> ->
Thread {
Thread.sleep(10)
cont.resume(Unit)
waiter.finish()
}.start()
}
}
// STEP_OVER: 2
idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInFun.out
Vendored
-9
View File
@@ -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
idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInFunFromOtherStepping.kt
Vendored
-40
View File
@@ -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<String>) {
builder {
inFun()
}
foo("Main end")
waiter.waitEnd()
}
suspend fun inFun() {
//Breakpoint!
foo("Start")
run()
foo("End")
}
suspend fun run() {
return suspendCoroutine { cont: Continuation<Unit> ->
Thread {
Thread.sleep(10)
cont.resume(Unit)
waiter.finish()
}.start()
}
}
// STEP_OVER: 3
idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInFunFromOtherStepping.out
Vendored
-10
View File
@@ -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
idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInLambda.kt
Vendored
-35
View File
@@ -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<String>) {
builder {
//Breakpoint!
run()
foo("End")
}
foo("Main end")
waiter.waitEnd()
}
suspend fun run() {
suspendCoroutine { cont: Continuation<Unit> ->
Thread {
Thread.sleep(10)
cont.resume(Unit)
waiter.finish()
}.start()
}
}
// STEP_OVER: 2
idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/soSuspendableCallInLambda.out
Vendored
-9
View File
@@ -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
idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOverForce/sofSuspendableCallInFun.kt
Vendored
-42
View File
@@ -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<String>) {
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<Unit> ->
Thread {
Thread.sleep(10)
cont.resume(Unit)
waiter.finish()
}.start()
}
}
// STEP_OVER_FORCE: 2
idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOverForce/sofSuspendableCallInFun.out
Vendored
-10
View File
@@ -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