From 58081e64ef1370f65614c269bd29bee2ad687ef9 Mon Sep 17 00:00:00 2001
From: Marc Khouzam
Date: Fri, 18 Mar 2016 11:42:50 -0400
Subject: Bug 484900: Remove the test runners CDI launch

In org.eclipse.cdt.testsrunning, the class CdiRunTestsLaunchDelegate was renamed 
RunTestsLaunchDelegate, as part of the CDI cleanup.

Change-Id: Ic7513a32f88ccc2b8139d5b4bb9f8ffd63fabe59
---
 .../META-INF/MANIFEST.MF                           |  2 +-
 .../org.eclipse.cdt.testsrunner/plugin.properties  |  4 +-
 testsrunner/org.eclipse.cdt.testsrunner/plugin.xml | 69 +---------------------
 testsrunner/org.eclipse.cdt.testsrunner/pom.xml    |  2 +-
 .../launcher/CdiRunTestsLaunchDelegate.java        | 26 --------
 .../internal/launcher/RunTestsLaunchDelegate.java  | 27 +++++++++
 6 files changed, 33 insertions(+), 97 deletions(-)
 delete mode 100644 testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/launcher/CdiRunTestsLaunchDelegate.java
 create mode 100644 testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/launcher/RunTestsLaunchDelegate.java

(limited to 'testsrunner')

diff --git a/testsrunner/org.eclipse.cdt.testsrunner/META-INF/MANIFEST.MF b/testsrunner/org.eclipse.cdt.testsrunner/META-INF/MANIFEST.MF
index 072e503461c..e932f50fcea 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner/META-INF/MANIFEST.MF
+++ b/testsrunner/org.eclipse.cdt.testsrunner/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.testsrunner;singleton:=true
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.0.0.qualifier
 Bundle-Activator: org.eclipse.cdt.testsrunner.internal.TestsRunnerPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/testsrunner/org.eclipse.cdt.testsrunner/plugin.properties b/testsrunner/org.eclipse.cdt.testsrunner/plugin.properties
index d35b8a72e0c..13b9396632a 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner/plugin.properties
+++ b/testsrunner/org.eclipse.cdt.testsrunner/plugin.properties
@@ -24,7 +24,7 @@ ResultsView.name=C/C++ Unit
 
 CPPUnitLaunchConfigurationType.name=C/C++ Unit
 
-CPPUnitLaunch.name=Legacy C/C++ Tests Launcher
-CPPUnitLaunch.description=Run C/C++ tests optionally under control of the legacy debugger.
+CPPUnitLaunch.name=Run C/C++ Tests Launcher
+CPPUnitLaunch.description=Run C/C++ tests.
 CPPUnitLaunchDSF.name=GDB (DSF) C/C++ Tests Launcher
 CPPUnitLaunchDSF.description=Run C/C++ Tests under control of GDB debugger integrated using the Debugger Services Framework (DSF).
diff --git a/testsrunner/org.eclipse.cdt.testsrunner/plugin.xml b/testsrunner/org.eclipse.cdt.testsrunner/plugin.xml
index bdeb57af6db..1bfbb8d65d1 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner/plugin.xml
+++ b/testsrunner/org.eclipse.cdt.testsrunner/plugin.xml
@@ -50,8 +50,8 @@
       <launchDelegate
             id="org.eclipse.cdt.testsrunner.launch.runTests"
             type="org.eclipse.cdt.testsrunner.launch.CTestsRunner"
-            delegate="org.eclipse.cdt.testsrunner.internal.launcher.CdiRunTestsLaunchDelegate"
-            modes="run,debug"
+            delegate="org.eclipse.cdt.testsrunner.internal.launcher.RunTestsLaunchDelegate"
+            modes="run"
             name="%CPPUnitLaunch.name"
             delegateDescription="%CPPUnitLaunch.description"
             sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
@@ -112,71 +112,6 @@
         <placement after="org.eclipse.cdt.cdi.launch.environmentTab"/>
       </tab>
 
-      <!-- Tests debug (CDI) tabs-->
-      <tab
-            id="org.eclipse.cdt.testsrunner.debug.mainTab"
-            group="org.eclipse.cdt.testsrunner.launch.debugTestsLaunchTabGroup"
-            name="%MainLaunchTab.name"
-            class="org.eclipse.cdt.launch.ui.CMainTab">
-        <associatedDelegate delegate="org.eclipse.cdt.testsrunner.launch.runTests"/>
-      </tab>
-      <tab
-            id="org.eclipse.cdt.testsrunner.debug.argumentsTab"
-            group="org.eclipse.cdt.testsrunner.launch.debugTestsLaunchTabGroup"
-            name="%ArgumentsLaunchTab.name"
-            class="org.eclipse.cdt.launch.ui.CArgumentsTab">
-        <associatedDelegate delegate="org.eclipse.cdt.testsrunner.launch.runTests"/>
-        <placement after="org.eclipse.cdt.cdi.launch.mainTab"/>
-      </tab>
-      <tab
-            id="org.eclipse.cdt.testsrunner.debug.testingTab"
-            group="org.eclipse.cdt.testsrunner.launch.debugTestsLaunchTabGroup"
-            name="%CTestingLaunchTab.name"
-            class="org.eclipse.cdt.testsrunner.internal.ui.launcher.CTestingTab">
-        <associatedDelegate delegate="org.eclipse.cdt.testsrunner.launch.runTests"/>
-        <placement after="org.eclipse.cdt.cdi.launch.argumentsTab"/>
-      </tab>
-      <tab
-            id="org.eclipse.cdt.testsrunner.debug.environmentTab"
-            group="org.eclipse.cdt.testsrunner.launch.debugTestsLaunchTabGroup"
-            name="%EnvironmentLaunchTab.name"
-            class="org.eclipse.debug.ui.EnvironmentTab">
-        <associatedDelegate delegate="org.eclipse.cdt.testsrunner.launch.runTests"/>
-        <placement after="org.eclipse.cdt.testsrunner.testingTab"/>
-      </tab>
-      <tab
-            id="org.eclipse.cdt.testsrunner.debug.debuggerTab"
-            group="org.eclipse.cdt.testsrunner.launch.debugTestsLaunchTabGroup"
-            name="%DebuggerLaunchTab.name"
-            class="org.eclipse.cdt.launch.ui.ApplicationCDebuggerTab">
-        <associatedDelegate delegate="org.eclipse.cdt.testsrunner.launch.runTests"/>
-        <placement after="org.eclipse.debug.ui.environmentTab"/>
-      </tab>
-      <tab
-            id="org.eclipse.cdt.testsrunner.debug.sourceLookupTab"
-            group="org.eclipse.cdt.testsrunner.launch.debugTestsLaunchTabGroup"
-            name="%SourceLookupLaunchTab.name"
-            class="org.eclipse.debug.ui.sourcelookup.SourceLookupTab">
-        <associatedDelegate delegate="org.eclipse.cdt.testsrunner.launch.runTests"/>
-        <placement after="org.eclipse.cdt.cdi.launch.debuggerTab"/>
-      </tab>
-      <tab
-            id="org.eclipse.cdt.testsrunner.debug.refreshTab"
-            group="org.eclipse.cdt.testsrunner.launch.debugTestsLaunchTabGroup"
-            name="%RefreshLaunchTab.name"
-            class="org.eclipse.debug.ui.RefreshTab">
-         <associatedDelegate delegate="org.eclipse.cdt.testsrunner.launch.runTests" />
-         <placement after="org.eclipse.debug.ui.sourceLookupTab" />
-      </tab>
-      <tab
-            id="org.eclipse.cdt.testsrunner.debug.commonTab"
-            group="org.eclipse.cdt.testsrunner.launch.debugTestsLaunchTabGroup"
-            name="%CommonLaunchTab.name"
-            class="org.eclipse.debug.ui.CommonTab">
-        <associatedDelegate delegate="org.eclipse.cdt.testsrunner.launch.runTests"/>
-        <placement after="org.eclipse.debug.ui.refreshTab"/>
-      </tab>
-
       <!-- Tests debug (DSF) tabs-->
       <tab
             id="org.eclipse.cdt.testsrunner.dsf.gdb.mainTab"
diff --git a/testsrunner/org.eclipse.cdt.testsrunner/pom.xml b/testsrunner/org.eclipse.cdt.testsrunner/pom.xml
index 7e8db464f20..0d0803a0ce9 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner/pom.xml
+++ b/testsrunner/org.eclipse.cdt.testsrunner/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<version>7.1.0-SNAPSHOT</version>
+	<version>8.0.0-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.testsrunner</artifactId>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/launcher/CdiRunTestsLaunchDelegate.java b/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/launcher/CdiRunTestsLaunchDelegate.java
deleted file mode 100644
index 1f11825955f..00000000000
--- a/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/launcher/CdiRunTestsLaunchDelegate.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, 2012 Anton Gorenkov.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Anton Gorenkov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.testsrunner.internal.launcher;
-
-import org.eclipse.cdt.testsrunner.launcher.BaseTestsLaunchDelegate;
-
-
-/**
- * Launch delegate implementation that redirects its queries to CDI.
- */
-public class CdiRunTestsLaunchDelegate extends BaseTestsLaunchDelegate {
-	
-    @Override
-    public String getPreferredDelegateId() {
-        return "org.eclipse.cdt.cdi.launch.localCLaunch"; //$NON-NLS-1$
-    }
-	
-}
diff --git a/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/launcher/RunTestsLaunchDelegate.java b/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/launcher/RunTestsLaunchDelegate.java
new file mode 100644
index 00000000000..c7d65dbd83d
--- /dev/null
+++ b/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/launcher/RunTestsLaunchDelegate.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2011, 2012 Anton Gorenkov.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Anton Gorenkov - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.testsrunner.internal.launcher;
+
+import org.eclipse.cdt.testsrunner.launcher.BaseTestsLaunchDelegate;
+
+
+/**
+ * Launch delegate implementation that is used for Run mode.
+ * @since 8.0
+ */
+public class RunTestsLaunchDelegate extends BaseTestsLaunchDelegate {
+	
+    @Override
+    public String getPreferredDelegateId() {
+        return "org.eclipse.cdt.cdi.launch.localCLaunch"; //$NON-NLS-1$
+    }
+	
+}
-- 
cgit v1.2.3