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: jcBlock.kt
 package jcBlock

 fun main(args: Array<String>) {
@@ -16,4 +17,20 @@ fun main(args: Array<String>) {
 // RESULT: 1: I

 // EXPRESSION: elseVal
-// RESULT: Unresolved reference: elseVal
+// RESULT: Unresolved reference: elseVal
+
+// FILE: forTests/javaContext/JavaClass.java
+package forTests.javaContext;
+
+public class JavaClass {
+    public void block() {
+        int bodyVal = 1;
+        if (true) {
+            int thenVal = 1;
+            int breakpoint = 1;
+        }
+        else {
+            int elseVal = 1;
+        }
+    }
+}
@@ -1,10 +1,10 @@
-LineBreakpoint created at jcBlock.kt:6
+LineBreakpoint created at jcBlock.kt:7
 Run Java
 Connected to the target VM
-jcBlock.kt:6
-JavaClass.java:16
-JavaClass.java:18
-JavaClass.java:19
+jcBlock.kt:7
+JavaClass.java:6
+JavaClass.java:8
+JavaClass.java:9
 Compile bytecode for bodyVal
 Compile bytecode for thenVal
 Disconnected from the target VM
@@ -1,3 +1,4 @@
+// FILE: jcImports.kt
 package jcImports

 fun main(args: Array<String>) {
@@ -10,4 +11,23 @@ fun main(args: Array<String>) {
 // STEP_OVER: 1

 // EXPRESSION: list.filter { it == 1 }.size
-// RESULT: 1: I
+// RESULT: 1: I
+
+// FILE: forTests/javaContext/JavaClass.java
+package forTests.javaContext;
+
+import java.util.ArrayList;
+
+public class JavaClass {
+    public void imports() {
+        ArrayList<Integer> list = createList();
+        int breakpoint = 1;
+    }
+
+    private ArrayList<Integer> createList() {
+        ArrayList<Integer> list = new ArrayList<Integer>();
+        list.add(1);
+        list.add(2);
+        return list;
+    }
+}
@@ -1,9 +1,9 @@
-LineBreakpoint created at jcImports.kt:6
+LineBreakpoint created at jcImports.kt:7
 Run Java
 Connected to the target VM
-jcImports.kt:6
-JavaClass.java:27
-JavaClass.java:28
+jcImports.kt:7
+JavaClass.java:8
+JavaClass.java:9
 Compile bytecode for list.filter { it == 1 }.size
 Disconnected from the target VM

@@ -1,3 +1,4 @@
+// FILE: jcLocalVariable.kt
 package jcLocalVariable

 fun main(args: Array<String>) {
@@ -10,4 +11,14 @@ fun main(args: Array<String>) {
 // STEP_OVER: 1

 // EXPRESSION: i
-// RESULT: 1: I
+// RESULT: 1: I
+
+// FILE: forTests/javaContext/JavaClass.java
+package forTests.javaContext;
+
+public class JavaClass {
+    public void localVariable() {
+        int i = 1;
+        int breakpoint = 1;
+    }
+}
@@ -1,9 +1,9 @@
-LineBreakpoint created at jcLocalVariable.kt:6
+LineBreakpoint created at jcLocalVariable.kt:7
 Run Java
 Connected to the target VM
-jcLocalVariable.kt:6
-JavaClass.java:11
-JavaClass.java:12
+jcLocalVariable.kt:7
+JavaClass.java:6
+JavaClass.java:7
 Compile bytecode for i
 Disconnected from the target VM

@@ -1,3 +1,4 @@
+// FILE: test.kt
 package jcMarkedObject

 fun main(args: Array<String>) {
@@ -15,4 +16,14 @@ fun main(args: Array<String>) {
 // EXPRESSION: i_DebugLabel
 // RESULT: instance of java.lang.Integer(id=ID): Ljava/lang/Integer;

-// DEBUG_LABEL: i = i
+// DEBUG_LABEL: i = i
+
+// FILE: forTests/javaContext/JavaClass.java
+package forTests.javaContext;
+
+public class JavaClass {
+    public void markObject() {
+        Integer i = 1;
+        int breakpoint = 1;
+    }
+}
@@ -1,9 +1,9 @@
-LineBreakpoint created at jcMarkedObject.kt:6
+LineBreakpoint created at test.kt:7
 Run Java
 Connected to the target VM
-jcMarkedObject.kt:6
-JavaClass.java:39
-JavaClass.java:40
+test.kt:7
+JavaClass.java:6
+JavaClass.java:7
 Compile bytecode for i
 Compile bytecode for i_DebugLabel
 Disconnected from the target VM
@@ -1,3 +1,4 @@
+// FILE: test.kt
 package jcProperty

 fun main(args: Array<String>) {
@@ -15,4 +16,16 @@ fun main(args: Array<String>) {
 // RESULT: 1: I

 // EXPRESSION: javaPrivateProperty
-// RESULT: 1: I
+// RESULT: 1: I
+
+// FILE: forTests/javaContext/JavaClass.java
+package forTests.javaContext;
+
+public class JavaClass {
+    public int javaProperty = 1;
+    private int javaPrivateProperty = 1;
+
+    public void property() {
+        int breakpoint = 1;
+    }
+}
@@ -1,8 +1,8 @@
-LineBreakpoint created at jcProperty.kt:6
+LineBreakpoint created at test.kt:7
 Run Java
 Connected to the target VM
-jcProperty.kt:6
-JavaClass.java:47
+test.kt:7
+JavaClass.java:9
 Compile bytecode for this.javaProperty
 Compile bytecode for javaProperty
 Compile bytecode for javaPrivateProperty
@@ -1,3 +1,4 @@
+// FILE: jcSimple.kt
 package jcSimple

 fun main(args: Array<String>) {
@@ -9,4 +10,13 @@ fun main(args: Array<String>) {
 // STEP_INTO: 1

 // EXPRESSION: 1 + 1
-// RESULT: 2: I
+// RESULT: 2: I
+
+// FILE: forTests/javaContext/JavaClass.java
+package forTests.javaContext;
+
+public class JavaClass {
+    public void simple() {
+        int breakpoint = 1;
+    }
+}
@@ -1,8 +1,8 @@
-LineBreakpoint created at jcSimple.kt:6
+LineBreakpoint created at jcSimple.kt:7
 Run Java
 Connected to the target VM
-jcSimple.kt:6
-JavaClass.java:7
+jcSimple.kt:7
+JavaClass.java:6
 Compile bytecode for 1 + 1
 Disconnected from the target VM