From 25acb1e191911542c6fb86d01dbdec6e1b71e1ce Mon Sep 17 00:00:00 2001 From: Vladimir Ilmov Date: Wed, 20 Nov 2019 13:16:32 +0300 Subject: [PATCH] [coroutine][debugger] removed and regenerated tests for not-ready-to-be-tested logic, kt* tests are failing due to KT-32691 --- .../test/CoroutineDumpTestGenerated.java | 5 ++- ...KotlinEvaluateExpressionTestGenerated.java | 30 ----------------- .../frame/frameLambdaNotAccessible.kt | 20 ----------- .../frame/frameLambdaNotAccessible.out | 21 ------------ .../frameLambdaVariableFromCorrectFrame.kt | 27 --------------- .../frameLambdaVariableFromCorrectFrame.out | 13 -------- .../frame/nonCapturedThisInLambda.kt | 28 ---------------- .../frame/nonCapturedThisInLambda.out | 13 -------- .../evaluation/singleBreakpoint/kt32691.kt | 24 -------------- .../evaluation/singleBreakpoint/kt32691.out | 11 ------- .../evaluation/singleBreakpoint/kt33093.kt | 24 -------------- .../evaluation/singleBreakpoint/kt33093.out | 8 ----- .../evaluation/singleBreakpoint/kt33181.kt | 33 ------------------- .../evaluation/singleBreakpoint/kt33181.out | 9 ----- 14 files changed, 2 insertions(+), 264 deletions(-) delete mode 100644 idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/frameLambdaNotAccessible.kt delete mode 100644 idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/frameLambdaNotAccessible.out delete mode 100644 idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/frameLambdaVariableFromCorrectFrame.kt delete mode 100644 idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/frameLambdaVariableFromCorrectFrame.out delete mode 100644 idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/nonCapturedThisInLambda.kt delete mode 100644 idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/nonCapturedThisInLambda.out delete mode 100644 idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt32691.kt delete mode 100644 idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt32691.out delete mode 100644 idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt33093.kt delete mode 100644 idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt33093.out delete mode 100644 idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt33181.kt delete mode 100644 idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt33181.out diff --git a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/CoroutineDumpTestGenerated.java b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/CoroutineDumpTestGenerated.java index 0867484d5e2..f551d51baa1 100644 --- a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/CoroutineDumpTestGenerated.java +++ b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/CoroutineDumpTestGenerated.java @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.idea.debugger.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -22,11 +21,11 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class CoroutineDumpTestGenerated extends AbstractCoroutineDumpTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } public void testAllFilesPresentInCoroutines() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/jvm-debugger/jvm-debugger-test/testData/coroutines"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/jvm-debugger/jvm-debugger-test/testData/coroutines"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("noCoroutines.kt") diff --git a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinEvaluateExpressionTestGenerated.java b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinEvaluateExpressionTestGenerated.java index b33f319d7ac..6e06bcd5417 100644 --- a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinEvaluateExpressionTestGenerated.java +++ b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinEvaluateExpressionTestGenerated.java @@ -305,21 +305,6 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat runTest("idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt31709.kt"); } - @TestMetadata("kt32691.kt") - public void testKt32691() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt32691.kt"); - } - - @TestMetadata("kt33093.kt") - public void testKt33093() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt33093.kt"); - } - - @TestMetadata("kt33181.kt") - public void testKt33181() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt33181.kt"); - } - @TestMetadata("kt5554OnlyIntsShouldBeCoerced.kt") public void testKt5554OnlyIntsShouldBeCoerced() throws Exception { runTest("idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt5554OnlyIntsShouldBeCoerced.kt"); @@ -849,21 +834,11 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat runTest("idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/frameLambda.kt"); } - @TestMetadata("frameLambdaNotAccessible.kt") - public void testFrameLambdaNotAccessible() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/frameLambdaNotAccessible.kt"); - } - @TestMetadata("frameLambdaNotUsed.kt") public void testFrameLambdaNotUsed() throws Exception { runTest("idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/frameLambdaNotUsed.kt"); } - @TestMetadata("frameLambdaVariableFromCorrectFrame.kt") - public void testFrameLambdaVariableFromCorrectFrame() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/frameLambdaVariableFromCorrectFrame.kt"); - } - @TestMetadata("frameLocalVariable.kt") public void testFrameLocalVariable() throws Exception { runTest("idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/frameLocalVariable.kt"); @@ -964,11 +939,6 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat runTest("idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/nestedInlineFun2.kt"); } - @TestMetadata("nonCapturedThisInLambda.kt") - public void testNonCapturedThisInLambda() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/nonCapturedThisInLambda.kt"); - } - @TestMetadata("remapThis.kt") public void testRemapThis() throws Exception { runTest("idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/remapThis.kt"); diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/frameLambdaNotAccessible.kt b/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/frameLambdaNotAccessible.kt deleted file mode 100644 index 81f90d339e7..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/frameLambdaNotAccessible.kt +++ /dev/null @@ -1,20 +0,0 @@ -package frameLambdaNotAccessible - -fun main() { - val k = "lorem" - bar()() -} - -fun bar(): () -> Unit { - val k = "ipsum" - return { - val l = "doloret" - //Breakpoint! - Unit - } -} - -// PRINT_FRAME - -// EXPRESSION: k -// RESULT: 'k' is not captured \ No newline at end of file diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/frameLambdaNotAccessible.out b/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/frameLambdaNotAccessible.out deleted file mode 100644 index 3abbf4d0073..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/frameLambdaNotAccessible.out +++ /dev/null @@ -1,21 +0,0 @@ -LineBreakpoint created at frameLambdaNotAccessible.kt:13 -Run Java -Connected to the target VM -frameLambdaNotAccessible.kt:13 -Compile bytecode for k - frame = invoke:13, FrameLambdaNotAccessibleKt$bar$1 {frameLambdaNotAccessible} - this = this = {frameLambdaNotAccessible.FrameLambdaNotAccessibleKt$bar$1@uniqueID}Function0 - field = arity: int = 0 (sp = Lambda.!EXT!) - local = l: java.lang.String = doloret (sp = frameLambdaNotAccessible.kt, 11) - field = value: char[] = {char[7]@uniqueID} (sp = String.!EXT!) - element = 0 = 'd' 100 - element = 1 = 'o' 111 - element = 2 = 'l' 108 - element = 3 = 'o' 111 - element = 4 = 'r' 114 - element = 5 = 'e' 101 - element = 6 = 't' 116 - field = hash: int = 0 (sp = String.!EXT!) -Disconnected from the target VM - -Process finished with exit code 0 diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/frameLambdaVariableFromCorrectFrame.kt b/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/frameLambdaVariableFromCorrectFrame.kt deleted file mode 100644 index a49d1e60d49..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/frameLambdaVariableFromCorrectFrame.kt +++ /dev/null @@ -1,27 +0,0 @@ -package frameLambdaVariableFromCorrectFrame - -fun main() { - val k = "lorem" - foo { - val j = "ipsum" - { - val l = 5 - //Breakpoint! - Unit - }() - } -} - -fun foo(block: () -> Any?) { - val k = "doloret" - val j = "sit" - block() -} - -// PRINT_FRAME - -// EXPRESSION: k -// RESULT: "lorem": Ljava/lang/String; - -// EXPRESSION: j -// RESULT: "ipsum": Ljava/lang/String; \ No newline at end of file diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/frameLambdaVariableFromCorrectFrame.out b/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/frameLambdaVariableFromCorrectFrame.out deleted file mode 100644 index 92894149c09..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/frameLambdaVariableFromCorrectFrame.out +++ /dev/null @@ -1,13 +0,0 @@ -LineBreakpoint created at frameLambdaVariableFromCorrectFrame.kt:10 -Run Java -Connected to the target VM -frameLambdaVariableFromCorrectFrame.kt:10 -Compile bytecode for k -Compile bytecode for j - frame = invoke:10, FrameLambdaVariableFromCorrectFrameKt$main$1$1 {frameLambdaVariableFromCorrectFrame} - this = this = {frameLambdaVariableFromCorrectFrame.FrameLambdaVariableFromCorrectFrameKt$main$1$1@uniqueID}Function0 - field = arity: int = 0 (sp = Lambda.!EXT!) - local = l: int = 5 (sp = frameLambdaVariableFromCorrectFrame.kt, 8) -Disconnected from the target VM - -Process finished with exit code 0 diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/nonCapturedThisInLambda.kt b/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/nonCapturedThisInLambda.kt deleted file mode 100644 index 229dc4890dc..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/nonCapturedThisInLambda.kt +++ /dev/null @@ -1,28 +0,0 @@ -package nonCapturedThisInLambda - -fun main() { - Foo().bar() -} - -class Foo { - val a = "lorem" - val b: String - get() = "ipsum" - fun bar() { - { - //Breakpoint! - Unit - }() - } -} - -// PRINT_FRAME - -// EXPRESSION: a -// RESULT: "lorem": Ljava/lang/String; - -// EXPRESSION: b -// RESULT: "ipsum": Ljava/lang/String; - -// EXPRESSION: this -// RESULT: instance of nonCapturedThisInLambda.Foo(id=ID): LnonCapturedThisInLambda/Foo; \ No newline at end of file diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/nonCapturedThisInLambda.out b/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/nonCapturedThisInLambda.out deleted file mode 100644 index 8c7d5bcdbf6..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/frame/nonCapturedThisInLambda.out +++ /dev/null @@ -1,13 +0,0 @@ -LineBreakpoint created at nonCapturedThisInLambda.kt:14 -Run Java -Connected to the target VM -nonCapturedThisInLambda.kt:14 -Compile bytecode for a -Compile bytecode for b -Compile bytecode for this - frame = invoke:14, Foo$bar$1 {nonCapturedThisInLambda} - this = this = {nonCapturedThisInLambda.Foo$bar$1@uniqueID}Function0 - field = arity: int = 0 (sp = Lambda.!EXT!) -Disconnected from the target VM - -Process finished with exit code 0 diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt32691.kt b/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt32691.kt deleted file mode 100644 index d1f83e09481..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt32691.kt +++ /dev/null @@ -1,24 +0,0 @@ -package kt32691 - -fun main() { - //Breakpoint! - Unit -} - -class L - -// EXPRESSION: {}.toString() -// RESULT: "kotlin.jvm.functions.Function0": Ljava/lang/String; - -// EXPRESSION: {i: Int -> }.toString() -// RESULT: "kotlin.jvm.functions.Function1": Ljava/lang/String; - -// EXPRESSION: {i: Int, d: Double -> "239" }.toString() -// RESULT: "kotlin.jvm.functions.Function2": Ljava/lang/String; - -// EXPRESSION: {m : L -> ""}.toString() -// RESULT: "kotlin.jvm.functions.Function1, java.lang.String>": Ljava/lang/String; - - - - diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt32691.out b/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt32691.out deleted file mode 100644 index 5914ea8ba3a..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt32691.out +++ /dev/null @@ -1,11 +0,0 @@ -LineBreakpoint created at kt32691.kt:5 -Run Java -Connected to the target VM -kt32691.kt:5 -Compile bytecode for {}.toString() -Compile bytecode for {i: Int -> }.toString() -Compile bytecode for {i: Int, d: Double -> "239" }.toString() -Compile bytecode for {m : L -> ""}.toString() -Disconnected from the target VM - -Process finished with exit code 0 diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt33093.kt b/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt33093.kt deleted file mode 100644 index 694755b5e14..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt33093.kt +++ /dev/null @@ -1,24 +0,0 @@ -package kt33093 - -typealias foo = Nothing -typealias bar = foo - -fun main() { - //Breakpoint! - Unit -} - -// EXPRESSION: Nothing() -// RESULT: Type 'Nothing' can't be instantiated - -// EXPRESSION: foo() -// RESULT: Type 'Nothing' can't be instantiated - -// EXPRESSION: bar() -// RESULT: Type 'Nothing' can't be instantiated - -// EXPRESSION: { Nothing() } -// RESULT: Type 'Nothing' can't be instantiated - -// EXPRESSION: { bar() } -// RESULT: Type 'Nothing' can't be instantiated \ No newline at end of file diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt33093.out b/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt33093.out deleted file mode 100644 index 4be507fbbc2..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt33093.out +++ /dev/null @@ -1,8 +0,0 @@ -LineBreakpoint created at statements.kt:5 -Run Java -Connected to the target VM -statements.kt:5 -Compile bytecode for val b = 1 -Disconnected from the target VM - -Process finished with exit code 0 diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt33181.kt b/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt33181.kt deleted file mode 100644 index a945daa0f46..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt33181.kt +++ /dev/null @@ -1,33 +0,0 @@ -package kt33181 - -fun main() { - Bar().foo() -} - -open class Foo { - open fun foo(): Int { - return 5 - } -} - -class Bar : Foo() { - override fun foo(): Int { - //Breakpoint! - return 6 - } -} - -// EXPRESSION: super.foo() -// RESULT: 5: I - -// EXPRESSION: for (i in 1..1) { super.foo()} -// RESULT: VOID_VALUE - -// EXPRESSION: { super.foo() } -// RESULT: Evaluation of 'super' calls inside lambdas and functions is not supported - -// EXPRESSION: fun() { super.foo() } -// RESULT: Evaluation of 'super' calls inside lambdas and functions is not supported - -// EXPRESSION: if(true) { fun named() { super.foo() } } // hack to avoid "Anonymous functions with names are prohibited" -// RESULT: Evaluation of 'super' calls inside lambdas and functions is not supported \ No newline at end of file diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt33181.out b/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt33181.out deleted file mode 100644 index 58d044ffd29..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/evaluation/singleBreakpoint/kt33181.out +++ /dev/null @@ -1,9 +0,0 @@ -LineBreakpoint created at kt33181.kt:16 -Run Java -Connected to the target VM -kt33181.kt:16 -Compile bytecode for super.foo() -Compile bytecode for for (i in 1..1) { super.foo()} -Disconnected from the target VM - -Process finished with exit code 0