From 5340082453d580130afb58297e8556a368732e7e Mon Sep 17 00:00:00 2001
From: Alena Laskavaia <elaskavaia.cdt@gmail.com>
Date: Fri, 1 Aug 2014 09:40:49 -0400
Subject: [PATCH] LaunchBar - junits tests are not running - trying to fix...

Change-Id: I4e2f641ece60920b307c3117739a273a0c4c30b0
Signed-off-by: Alena Laskavaia <elaskavaia.cdt@gmail.com>
Reviewed-on: https://git.eclipse.org/r/30881
Tested-by: Hudson CI
---
 .../META-INF/MANIFEST.MF                                 | 4 +++-
 launch/org.eclipse.cdt.launchbar.core.tests/pom.xml      | 9 +++------
 releng/org.eclipse.cdt.target/cdt-e4.4.target            | 1 +
 releng/org.eclipse.cdt.testing-feature/feature.xml       | 7 +++++++
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/launch/org.eclipse.cdt.launchbar.core.tests/META-INF/MANIFEST.MF b/launch/org.eclipse.cdt.launchbar.core.tests/META-INF/MANIFEST.MF
index 19808625490..7fce33c3bab 100644
--- a/launch/org.eclipse.cdt.launchbar.core.tests/META-INF/MANIFEST.MF
+++ b/launch/org.eclipse.cdt.launchbar.core.tests/META-INF/MANIFEST.MF
@@ -10,6 +10,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.cdt.launchbar.core;bundle-version="1.0.0",
  org.eclipse.debug.core,
  org.eclipse.cdt.debug.core,
- org.eclipse.core.filesystem
+ org.eclipse.core.filesystem,
+ org.hamcrest
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.cdt.launchbar.core.tests
diff --git a/launch/org.eclipse.cdt.launchbar.core.tests/pom.xml b/launch/org.eclipse.cdt.launchbar.core.tests/pom.xml
index 5046c5f1fbf..b79371ce6c5 100644
--- a/launch/org.eclipse.cdt.launchbar.core.tests/pom.xml
+++ b/launch/org.eclipse.cdt.launchbar.core.tests/pom.xml
@@ -13,7 +13,7 @@
 
 	<version>1.0.0-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.launchbar.core.tests</artifactId>
-	<packaging>eclipse-plugin</packaging>
+	<packaging>eclipse-test-plugin</packaging>
 	
 		<build>
 		<plugins>
@@ -22,6 +22,8 @@
 				<artifactId>tycho-surefire-plugin</artifactId>
 				<version>${tycho-version}</version>
 				<configuration>
+					<!-- It does not need ui, but it does not work headless for some reason -->
+					<useUIHarness>true</useUIHarness>
 					<argLine>${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
 					<includes>
 						<include>**/AutomatedIntegrationSuite.*</include>
@@ -32,11 +34,6 @@
 							<artifactId>org.eclipse.platform.feature.group</artifactId>
 							<type>p2-installable-unit</type>
 						</dependency>
-						<dependency>
-							<artifactId>org.eclipse.cdt.feature.group</artifactId>
-							<version>8.2.0.${buildQualifier}</version>
-							<type>p2-installable-unit</type>
-						</dependency>
 					</dependencies>
 				</configuration>
 			</plugin>
diff --git a/releng/org.eclipse.cdt.target/cdt-e4.4.target b/releng/org.eclipse.cdt.target/cdt-e4.4.target
index 3190db68ee8..0327ab34fe0 100644
--- a/releng/org.eclipse.cdt.target/cdt-e4.4.target
+++ b/releng/org.eclipse.cdt.target/cdt-e4.4.target
@@ -12,6 +12,7 @@
 <unit id="org.junit" version="0.0.0"/>
 <unit id="org.junit.source" version="0.0.0"/>
 <unit id="org.mockito" version="0.0.0"/>
+<unit id="org.hamcrest" version="0.0.0"/>
 <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
diff --git a/releng/org.eclipse.cdt.testing-feature/feature.xml b/releng/org.eclipse.cdt.testing-feature/feature.xml
index 67362db6712..aff8da4e52e 100644
--- a/releng/org.eclipse.cdt.testing-feature/feature.xml
+++ b/releng/org.eclipse.cdt.testing-feature/feature.xml
@@ -69,4 +69,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.cdt.launchbar.core.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>