Bug 553508: Fix python debugger tests
fixed tests for Jython & Py4J
Change-Id: I8d12d5baaec829f286d42b52bfb4f8f887f06b72
diff --git a/plugins/org.eclipse.ease.lang.python.jython/META-INF/MANIFEST.MF b/plugins/org.eclipse.ease.lang.python.jython/META-INF/MANIFEST.MF
index aea75c8..d1b946c 100644
--- a/plugins/org.eclipse.ease.lang.python.jython/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ease.lang.python.jython/META-INF/MANIFEST.MF
@@ -8,8 +8,9 @@
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.jython;bundle-version="[2.5.3,3.0.0)",
org.eclipse.ease,
- org.eclipse.debug.ui;bundle-version="[3.7.102,4.0.0)",
- org.eclipse.ease.lang.python
+ org.eclipse.ease.lang.python,
+ org.eclipse.core.resources;bundle-version="[3.7.101,4.0.0)",
+ org.eclipse.debug.core;bundle-version="[3.7.1,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Eclipse-BuddyPolicy: global
diff --git a/plugins/org.eclipse.ease.lang.python.py4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.ease.lang.python.py4j/META-INF/MANIFEST.MF
index 57070ba..9a86ace 100644
--- a/plugins/org.eclipse.ease.lang.python.py4j/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ease.lang.python.py4j/META-INF/MANIFEST.MF
@@ -12,7 +12,9 @@
py4j-java;bundle-version="[0.10.4,0.11.0)",
py4j-python;bundle-version="[0.10.4,0.11.0)",
org.eclipse.ease,
- org.eclipse.ease.lang.python
+ org.eclipse.ease.lang.python,
+ org.eclipse.core.resources;bundle-version="[3.7.101,4.0.0)",
+ org.eclipse.debug.core;bundle-version="[3.7.1,4.0.0)"
Export-Package: org.eclipse.ease.lang.python.py4j.internal;x-internal:=true,
org.eclipse.ease.lang.python.py4j.internal.ui;x-internal:=true
Bundle-Activator: org.eclipse.ease.lang.python.py4j.internal.Activator
diff --git a/plugins/org.eclipse.ease.lang.python/src/org/eclipse/ease/lang/python/debugger/model/PythonDebugModelPresentation.java b/plugins/org.eclipse.ease.lang.python/src/org/eclipse/ease/lang/python/debugger/model/PythonDebugModelPresentation.java
index 35bc252..9015822 100644
--- a/plugins/org.eclipse.ease.lang.python/src/org/eclipse/ease/lang/python/debugger/model/PythonDebugModelPresentation.java
+++ b/plugins/org.eclipse.ease.lang.python/src/org/eclipse/ease/lang/python/debugger/model/PythonDebugModelPresentation.java
@@ -23,7 +23,6 @@
import org.eclipse.ui.editors.text.EditorsUI;
public class PythonDebugModelPresentation extends AbstractEaseDebugModelPresentation implements IDebugModelPresentation {
- public static String ID = "org.python.pydev.debug";
@Override
public String getEditorId(final IEditorInput input, final Object element) {
diff --git a/plugins/org.eclipse.ease.lang.python/src/org/eclipse/ease/lang/python/debugger/model/PythonDebugTarget.java b/plugins/org.eclipse.ease.lang.python/src/org/eclipse/ease/lang/python/debugger/model/PythonDebugTarget.java
index 3e131dc..38f1138 100644
--- a/plugins/org.eclipse.ease.lang.python/src/org/eclipse/ease/lang/python/debugger/model/PythonDebugTarget.java
+++ b/plugins/org.eclipse.ease.lang.python/src/org/eclipse/ease/lang/python/debugger/model/PythonDebugTarget.java
@@ -21,7 +21,7 @@
* ScriptDebugTarget for communication between Eclipse framework and Python debugger.
*/
public class PythonDebugTarget extends EaseDebugTarget {
- private static final String BREAKPOINT_TYPE = PythonDebugModelPresentation.ID;
+ private static final String BREAKPOINT_TYPE = "org.python.pydev.debug";
public PythonDebugTarget(final ILaunch launch, final boolean suspendOnStartup, final boolean suspendOnScriptLoad, boolean showDynamicCode) {
super(launch, suspendOnStartup, suspendOnScriptLoad, showDynamicCode);
diff --git a/tests/org.eclipse.ease.lang.python.jython.test/src/org/eclipse/ease/lang/python/jython/debugger/JythonDebugTest.java b/tests/org.eclipse.ease.lang.python.jython.test/src/org/eclipse/ease/lang/python/jython/debugger/JythonDebugTest.java
index 0ff8132..1496e20 100644
--- a/tests/org.eclipse.ease.lang.python.jython.test/src/org/eclipse/ease/lang/python/jython/debugger/JythonDebugTest.java
+++ b/tests/org.eclipse.ease.lang.python.jython.test/src/org/eclipse/ease/lang/python/jython/debugger/JythonDebugTest.java
@@ -20,8 +20,6 @@
import org.eclipse.debug.core.model.IBreakpoint;
import org.eclipse.debug.core.model.LineBreakpoint;
import org.eclipse.ease.testhelper.AbstractDebugTest;
-import org.junit.Ignore;
-import org.junit.Test;
public class JythonDebugTest extends AbstractDebugTest {
@@ -61,234 +59,4 @@
protected String getEngineId() {
return JythonDebuggerEngine.ENGINE_ID;
}
-
- // FIXME tests temporarily disabled as they fail when loading the python debug target
-
- @Override
- @Test
- @Ignore
- public void hasDebugTarget() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void breakpointLocation() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepOverOnDebugTarget() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepOverOnProcess() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepOverOnThread() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepOverOnStackFrame() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepIntoOnDebugTarget() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepIntoOnProcess() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepIntoOnThread() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepIntoOnStackFrame() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepReturnOnDebugTarget() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepReturnOnProcess() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepReturnOnThread() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepReturnOnStackFrame() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void resumeOnDebugTarget() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void resumeOnProcess() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void resumeOnThread() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void resumeOnStackFrame() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void terminateDebugTargetInSuspendedState() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void terminateProcessInSuspendedState() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void terminateThreadInSuspendedState() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void terminateStackFrameInSuspendedState() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void disconnectDebugTargetInSuspendedState() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void disconnectProcessInSuspendedState() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void disconnectThreadInSuspendedState() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void disconnectStackFrameInSuspendedState() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void evaluateWatchExpression() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void suspendedState() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void terminatedState() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void primitiveDoubleVariable() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void primitiveStringVariable() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void nullVariable() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void nativeArrayVariable() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void arrayVariableSorting() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void nativeObjectVariable() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void javaClassVariable() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void innerScopeVariableBeforeOuterScopeVariable() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void modifyVariableKeepingType() throws CoreException, IOException {
- }
}
diff --git a/tests/org.eclipse.ease.lang.python.py4j.test/src/org/eclipse/ease/lang/python/py4j/Py4jDebugTest.java b/tests/org.eclipse.ease.lang.python.py4j.test/src/org/eclipse/ease/lang/python/py4j/Py4jDebugTest.java
index 950743e..357b7e1 100644
--- a/tests/org.eclipse.ease.lang.python.py4j.test/src/org/eclipse/ease/lang/python/py4j/Py4jDebugTest.java
+++ b/tests/org.eclipse.ease.lang.python.py4j.test/src/org/eclipse/ease/lang/python/py4j/Py4jDebugTest.java
@@ -11,8 +11,6 @@
package org.eclipse.ease.lang.python.py4j;
-import static org.junit.Assume.assumeTrue;
-
import java.io.IOException;
import org.eclipse.core.resources.IFile;
@@ -70,7 +68,6 @@
@Ignore
public void nativeObjectVariable() throws CoreException, IOException {
// TODO: Currently not possible to access native Python variables
- assumeTrue(false);
}
@Override
@@ -78,224 +75,5 @@
@Ignore
public void nativeArrayVariable() throws CoreException, IOException {
// TODO: Currently not possible to access native Python variables
- assumeTrue(false);
- }
-
- // FIXME tests temporarily disabled as they fail when loading the python debug target
-
- @Override
- @Test
- @Ignore
- public void hasDebugTarget() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void breakpointLocation() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepOverOnDebugTarget() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepOverOnProcess() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepOverOnThread() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepOverOnStackFrame() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepIntoOnDebugTarget() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepIntoOnProcess() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepIntoOnThread() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepIntoOnStackFrame() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepReturnOnDebugTarget() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepReturnOnProcess() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepReturnOnThread() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void stepReturnOnStackFrame() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void resumeOnDebugTarget() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void resumeOnProcess() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void resumeOnThread() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void resumeOnStackFrame() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void terminateDebugTargetInSuspendedState() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void terminateProcessInSuspendedState() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void terminateThreadInSuspendedState() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void terminateStackFrameInSuspendedState() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void disconnectDebugTargetInSuspendedState() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void disconnectProcessInSuspendedState() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void disconnectThreadInSuspendedState() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void disconnectStackFrameInSuspendedState() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void evaluateWatchExpression() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void suspendedState() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void terminatedState() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void primitiveDoubleVariable() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void primitiveStringVariable() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void nullVariable() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void arrayVariableSorting() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void javaClassVariable() throws CoreException, IOException {
- }
-
- @Override
- @Test
- @Ignore
- public void innerScopeVariableBeforeOuterScopeVariable() throws CoreException {
- }
-
- @Override
- @Test
- @Ignore
- public void modifyVariableKeepingType() throws CoreException, IOException {
}
}
