Try to make TestDebug more stable

Signed-off-by: Mickael Istria <[email protected]>
eclipse-acute · Apr 9, 2019 · c28c8fe · c28c8fe
1 parent 0376260
commit c28c8fe
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/org.eclipse.acute.tests/META-INF/MANIFEST.MF b/org.eclipse.acute.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.acute.tests;singleton:=true
-Bundle-Version: 0.2.0.qualifier
+Bundle-Version: 0.2.1.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Eclipse-BundleShape: dir
 Require-Bundle: org.eclipse.ui,

diff --git a/org.eclipse.acute.tests/src/org/eclipse/acute/tests/TestDebug.java b/org.eclipse.acute.tests/src/org/eclipse/acute/tests/TestDebug.java
@@ -28,8 +28,10 @@
 import org.eclipse.debug.core.ILaunchManager;
 import org.eclipse.debug.core.model.IDebugTarget;
 import org.eclipse.debug.core.model.ISuspendResume;
+import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.ui.DebugUITools;
 import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget;
+import org.eclipse.jface.dialogs.MessageDialogWithToggle;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.ITextSelection;
 import org.eclipse.jface.text.TextSelection;
@@ -53,6 +55,7 @@ public class TestDebug extends AbstractAcuteTest {
 	public void setUpLaunch() throws DebugException {
 		this.launchManager = DebugPlugin.getDefault().getLaunchManager();
 		removeAllLaunches();
+		DebugUIPlugin.getDefault().getPreferenceStore().setValue("org.eclipse.debug.ui.switch_perspective_on_suspend", MessageDialogWithToggle.ALWAYS);
 	}
 
 	private void removeAllLaunches() throws DebugException {

diff --git a/org.eclipse.acute/META-INF/MANIFEST.MF b/org.eclipse.acute/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.acute;singleton:=true
-Bundle-Version: 0.3.2.qualifier
+Bundle-Version: 0.3.3.qualifier
 Bundle-Activator: org.eclipse.acute.AcutePlugin
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,

diff --git a/org.eclipse.acute/src/org/eclipse/acute/debug/DotnetDebugLaunchShortcut.java b/org.eclipse.acute/src/org/eclipse/acute/debug/DotnetDebugLaunchShortcut.java
@@ -27,6 +27,7 @@
 import org.eclipse.debug.core.ILaunchConfigurationType;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.debug.ui.DebugUITools;
 import org.eclipse.debug.ui.ILaunchShortcut2;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -39,21 +40,11 @@
 public class DotnetDebugLaunchShortcut implements ILaunchShortcut2 {
 
 	@Override public void launch(ISelection selection, String mode) {
-		try {
-			getLaunchConfigurations(selection)[0].launch(mode, null);
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+		DebugUITools.launch(getLaunchConfigurations(selection)[0], mode);
 	}
 
 	@Override public void launch(IEditorPart editor, String mode) {
-		try {
-			getLaunchConfigurations(editor)[0].launch(mode, null);
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+		DebugUITools.launch(getLaunchConfigurations(editor)[0], mode);
 	}
 
 	@Override public ILaunchConfiguration[] getLaunchConfigurations(ISelection selection) {