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/org.eclipse.cdt.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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
../../pom.xml
- 7.1.0-SNAPSHOT
+ 8.0.0-SNAPSHOT
org.eclipse.cdt.testsrunner
eclipse-plugin
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