Fix java debugger integration tests (#11395)

Signed-off-by: Anatoliy Bazko <[email protected]>
eclipse-che · Oct 12, 2018 · 018a081 · 018a081
1 parent a5d8ac1
commit 018a081
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 35 deletions.
diff --git a/...java-debugger-server/src/test/java/org/eclipse/che/plugin/jdb/server/BreakpointsTest.java b/...java-debugger-server/src/test/java/org/eclipse/che/plugin/jdb/server/BreakpointsTest.java
@@ -101,7 +101,7 @@ public void shouldAddBreakpointByFqn() throws Exception {
     Breakpoint actualBreakpoint = ((BreakpointActivatedEvent) debuggerEvent).getBreakpoint();
     Location actualLocation = actualBreakpoint.getLocation();
     assertEquals(actualLocation.getLineNumber(), 21);
-    assertEquals(actualLocation.getTarget(), "org.eclipse.BreakpointsTest");
+    assertEquals(actualLocation.getTarget(), "/test/src/org/eclipse/BreakpointsTest.java");
     assertEquals(actualLocation.getResourceProjectPath(), "/test");
     assertTrue(actualBreakpoint.isEnabled());
 
@@ -110,7 +110,7 @@ public void shouldAddBreakpointByFqn() throws Exception {
 
     Location suspendLocation = ((SuspendEvent) debuggerEvent).getLocation();
     assertEquals(suspendLocation.getLineNumber(), 21);
-    assertEquals(actualLocation.getTarget(), "org.eclipse.BreakpointsTest");
+    assertEquals(actualLocation.getTarget(), "/test/src/org/eclipse/BreakpointsTest.java");
     assertEquals(actualLocation.getResourceProjectPath(), "/test");
   }
 

diff --git a/...-java-debugger-server/src/test/java/org/eclipse/che/plugin/jdb/server/ThreadDumpTest.java b/...-java-debugger-server/src/test/java/org/eclipse/che/plugin/jdb/server/ThreadDumpTest.java
@@ -103,9 +103,9 @@ private void validateMainThreadDump(List<ThreadStateDto> threads) {
 
     Location location = stackFrameDump.getLocation();
     assertEquals(location.getLineNumber(), 27);
-    assertEquals(location.getTarget(), "org.eclipse.ThreadDumpTest1");
-    assertEquals(location.getExternalResourceId(), 0);
-    assertNull(location.getResourceProjectPath());
+    assertEquals(location.getTarget(), "/test/src/org/eclipse/ThreadDumpTest.java");
+    assertNull(location.getExternalResourceId());
+    assertEquals(location.getResourceProjectPath(), "/test");
 
     Method method = location.getMethod();
     assertEquals(method.getName(), "main");

diff --git a/...ugin-java-debugger/che-plugin-java-debugger-server/src/test/resources/docker/assembly.xml b/...ugin-java-debugger/che-plugin-java-debugger-server/src/test/resources/docker/assembly.xml
@@ -23,7 +23,7 @@
             <outputDirectory>./org/eclipse</outputDirectory>
         </file>
        <file>
-            <source>${project.build.testOutputDirectory}/workspace/test/src/org/eclipse/SuspendPolicyTest.java</source>
+            <source>${project.build.testOutputDirectory}/testclasses/SuspendPolicyTest.java</source>
             <outputDirectory>./org/eclipse</outputDirectory>
         </file>
         <file>

diff --git a/...gin-java-debugger/che-plugin-java-debugger-server/src/test/resources/docker/entrypoint.sh b/...gin-java-debugger/che-plugin-java-debugger-server/src/test/resources/docker/entrypoint.sh
@@ -14,6 +14,7 @@
 
 javac -g org/eclipse/BreakpointsTest.java
 javac -g org/eclipse/BreakpointsByConditionTest.java
+javac -g org/eclipse/SuspendPolicyTest.java
 javac -g org/eclipse/ThreadDumpTest.java
 javac -g org/eclipse/StackFrameDumpTest.java
 javac -g org/eclipse/GetValueTest.java
@@ -24,8 +25,8 @@ DEBUG_OPT="-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y
 
 java ${DEBUG_OPT} org.eclipse.BreakpointsTest
 java ${DEBUG_OPT} org.eclipse.BreakpointsByConditionTest
-
 java ${DEBUG_OPT} org.eclipse.ThreadDumpTest
+java ${DEBUG_OPT} org.eclipse.SuspendPolicyTest
 java ${DEBUG_OPT} org.eclipse.StackFrameDumpTest
 java ${DEBUG_OPT} org.eclipse.GetValueTest
 java ${DEBUG_OPT} org.eclipse.EvaluateExpressionTest

diff --git a/...lugin-java-debugger-server/src/test/resources/testclasses/BreakpointsByConditionTest.java b/...lugin-java-debugger-server/src/test/resources/testclasses/BreakpointsByConditionTest.java
@@ -16,6 +16,11 @@ public class BreakpointsByConditionTest {
 
   public static void main(String[] args) {
     int k = 0;
+    for (int i = 0; i < 10; i++) {
+      k++;
+    }
+
+    k = 1;
     for (int i = 0; i < 10; i++) {
       k = i;
     }

diff --git a/...st/src/org/eclipse/SuspendPolicyTest.java → ...ources/testclasses/SuspendPolicyTest.java b/...st/src/org/eclipse/SuspendPolicyTest.java → ...ources/testclasses/SuspendPolicyTest.java
diff --git a/...-server/src/test/resources/workspace/test/src/org/eclipse/BreakpointsByConditionTest.java b/...-server/src/test/resources/workspace/test/src/org/eclipse/BreakpointsByConditionTest.java