Refactor debugger tests

1. Move tests to their own module 2. Avoid sharing the 'tinyApp' project between tests 3. Clean up option directive handling
2019-06-26 22:41:56 +09:00
parent d8d81c51d7
commit 472ec72eb9
288 changed files with 4861 additions and 3910 deletions
@@ -1,3 +1,4 @@
+// FILE: defaultAccessors.kt
 package defaultAccessors

 fun main(args: Array<String>) {
@@ -25,4 +26,15 @@ fun testPublicPropertyInLibrary() {

 // STEP_INTO: 21
 // SKIP_SYNTHETIC_METHODS: true
-// SKIP_CONSTRUCTORS: true
+// SKIP_CONSTRUCTORS: true
+
+// FILE: customLib/simpleLibFile.kt
+package customLib.simpleLibFile
+
+public fun foo() {
+    1 + 1
+}
+
+class B {
+    public var prop: Int = 1
+}
@@ -1,22 +1,22 @@
-LineBreakpoint created at defaultAccessors.kt:5
+LineBreakpoint created at defaultAccessors.kt:6
 Run Java
 Connected to the target VM
-defaultAccessors.kt:5
-defaultAccessors.kt:11
-defaultAccessors.kt:17
-defaultAccessors.kt:11
-defaultAccessors.kt:12
-defaultAccessors.kt:17
-defaultAccessors.kt:13
 defaultAccessors.kt:6
-defaultAccessors.kt:21
-defaultAccessors.kt:22
-simpleLibFile.kt:8
+defaultAccessors.kt:12
+defaultAccessors.kt:18
+defaultAccessors.kt:12
+defaultAccessors.kt:13
+defaultAccessors.kt:18
+defaultAccessors.kt:14
+defaultAccessors.kt:7
 defaultAccessors.kt:22
 defaultAccessors.kt:23
-simpleLibFile.kt:8
+simpleLibFile.kt:9
+defaultAccessors.kt:23
 defaultAccessors.kt:24
-defaultAccessors.kt:7
+simpleLibFile.kt:9
+defaultAccessors.kt:25
+defaultAccessors.kt:8
 Disconnected from the target VM

 Process finished with exit code 0
@@ -1,3 +1,6 @@
+// EMULATE_DEX: true
+// FILE: trueseveralInlineFunctionsInOneFileDex.kt
+
 package inlineDex

 fun main(args: Array<String>) {
@@ -1,8 +1,8 @@
-LineBreakpoint created at inlineDex.kt:5
+LineBreakpoint created at trueseveralInlineFunctionsInOneFileDex.kt:8
 Run Java
 Connected to the target VM
-inlineDex.kt:5
-inlineDex.kt:9
+trueseveralInlineFunctionsInOneFileDex.kt:8
+trueseveralInlineFunctionsInOneFileDex.kt:12
 Disconnected from the target VM

 Process finished with exit code 0
@@ -27,5 +27,4 @@ inline fun forEach(s: () -> Unit) {
    }
 }

-// STEP_INTO: 9
-// TRACING_FILTERS_ENABLED: false
+// STEP_INTO: 10
@@ -10,7 +10,7 @@ inlineOnly.kt:13
 inlineOnly.kt:14
 inlineOnly.kt:7
 inlineOnly.kt:9
-PrintStream.!EXT!
+inlineOnly.kt:10
 Disconnected from the target VM

 Process finished with exit code 0
@@ -1,3 +1,4 @@
+// FILE: samAdapter.kt
 package samAdapter

 fun main(args: Array<String>) {
@@ -10,4 +11,22 @@ fun runReadAction(action: () -> Int): Int {
    return forTests.MyJavaClass.runReadAction<Int>(action)
 }

-// STEP_INTO: 8
+// STEP_INTO: 8
+
+// FILE: forTests/MyJavaClass.java
+package forTests;
+
+import org.jetbrains.annotations.NotNull;
+
+public class MyJavaClass {
+    public static <T> T runReadAction(@NotNull Computable<T> computation) {
+        return computation.compute();
+    }
+}
+
+// FILE: forTests/Computable.java
+package forTests;
+
+public interface Computable <T> {
+    T compute();
+}
@@ -1,15 +1,15 @@
-LineBreakpoint created at samAdapter.kt:5
+LineBreakpoint created at samAdapter.kt:6
 Run Java
 Connected to the target VM
-samAdapter.kt:5
-samAdapter.kt:6
-samAdapter.kt:10
-MyJavaClass.java:21
-samAdapter.kt:6
-MyJavaClass.java:21
-samAdapter.kt:10
 samAdapter.kt:6
 samAdapter.kt:7
+samAdapter.kt:11
+MyJavaClass.java:8
+samAdapter.kt:7
+MyJavaClass.java:8
+samAdapter.kt:11
+samAdapter.kt:7
+samAdapter.kt:8
 Disconnected from the target VM

 Process finished with exit code 0
@@ -1,3 +1,4 @@
+// FILE: sameFileNames.kt
 package sameFileNames

 fun main() {
@@ -5,4 +6,11 @@ fun main() {
    val result = simple.foo()
 }

-// STEP_INTO: 1
+// STEP_INTO: 1
+
+// FILE: simple.kt
+package simple
+
+// test more than one file for package in JetPositionManager:prepareTypeMapper. the second file in this package is singleBreakpoint/simple.kt
+fun foo() {
+}
@@ -1,8 +1,8 @@
-LineBreakpoint created at sameFileNames.kt:5
+LineBreakpoint created at sameFileNames.kt:6
 Run Java
 Connected to the target VM
-sameFileNames.kt:5
-simpleKt.kt:5
+sameFileNames.kt:6
+simple.kt:6
 Disconnected from the target VM

 Process finished with exit code 0
@@ -1,3 +1,5 @@
+// ATTACH_LIBRARY: coroutines
+
 package siSuspendFun

 import forTests.builder
@@ -1,12 +1,12 @@
-LineBreakpoint created at siSuspendFun.kt:29
+LineBreakpoint created at siSuspendFun.kt:31
 Run Java
 Connected to the target VM
-siSuspendFun.kt:29
-siSuspendFun.kt:22
-siSuspendFun.kt:18
-siSuspendFun.kt:14
-siSuspendFun.kt:10
-siSuspendFun.kt:6
+siSuspendFun.kt:31
+siSuspendFun.kt:24
+siSuspendFun.kt:20
+siSuspendFun.kt:16
+siSuspendFun.kt:12
+siSuspendFun.kt:8
 Disconnected from the target VM

 Process finished with exit code 0
@@ -2,7 +2,7 @@ LineBreakpoint created at stepIntoStdLibInlineFun.kt:6
 Run Java
 Connected to the target VM
 stepIntoStdLibInlineFun.kt:6
-stepIntoStdLibInlineFun.kt:1
+_Collections.!EXT!
 resuming stepIntoStdLibInlineFun.kt:6
 Disconnected from the target VM

@@ -1,3 +1,5 @@
+// ATTACH_LIBRARY: coroutines
+
 package stepIntoSuspendFunctionSimple

 import forTests.builder
@@ -1,8 +1,8 @@
-LineBreakpoint created at stepIntoSuspendFunctionSimple.kt:18
+LineBreakpoint created at stepIntoSuspendFunctionSimple.kt:20
 Run Java
 Connected to the target VM
-stepIntoSuspendFunctionSimple.kt:18
-stepIntoSuspendFunctionSimple.kt:10
+stepIntoSuspendFunctionSimple.kt:20
+stepIntoSuspendFunctionSimple.kt:12
 Disconnected from the target VM

 Process finished with exit code 0