From bb7f665007a0e65eaa8d10f974e14bd0c84e3088 Mon Sep 17 00:00:00 2001
From: Doug Schaefer <dschaefer@qnx.com>
Date: Tue, 13 Jan 2015 14:14:56 -0500
Subject: [PATCH] Add tests and make them run (adding hamcrest properly)

Change-Id: Ifc2e5d9cd4289147539d6b90b59f689ffdf69a37
---
 bundles/org.eclipse.launchbar.core/.gitignore |  1 +
 bundles/org.eclipse.launchbar.ui/.gitignore   |  1 +
 pom.xml                                       | 85 ++++++++++---------
 .../.gitignore                                |  1 +
 .../META-INF/MANIFEST.MF                      |  4 +-
 .../org.eclipse.launchbar.core.tests/pom.xml  | 25 +++---
 6 files changed, 60 insertions(+), 57 deletions(-)
 create mode 100644 bundles/org.eclipse.launchbar.core/.gitignore
 create mode 100644 bundles/org.eclipse.launchbar.ui/.gitignore
 create mode 100644 tests/org.eclipse.launchbar.core.tests/.gitignore

diff --git a/bundles/org.eclipse.launchbar.core/.gitignore b/bundles/org.eclipse.launchbar.core/.gitignore
new file mode 100644
index 00000000000..ae3c1726048
--- /dev/null
+++ b/bundles/org.eclipse.launchbar.core/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/bundles/org.eclipse.launchbar.ui/.gitignore b/bundles/org.eclipse.launchbar.ui/.gitignore
new file mode 100644
index 00000000000..ae3c1726048
--- /dev/null
+++ b/bundles/org.eclipse.launchbar.ui/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/pom.xml b/pom.xml
index 95190e95616..68f944f7ea0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,21 +48,27 @@
 			<url>http://download.eclipse.org/cbi/updates/license/</url>
 			<layout>p2</layout>
 		</repository>
+		<repository>
+			<id>orbit</id>
+			<url>http://download.eclipse.org/tools/orbit/downloads/drops/S20141129202728/repository/</url>
+			<layout>p2</layout>
+		</repository>
 	</repositories>
 
 	<modules>
 		<module>bundles/org.eclipse.launchbar.core</module>
 		<module>bundles/org.eclipse.launchbar.ui</module>
 		<module>features/org.eclipse.launchbar</module>
+		<module>tests/org.eclipse.launchbar.core.tests</module>
 		<module>repo</module>
 	</modules>
 
 	<pluginRepositories>
-   		<pluginRepository>
+		<pluginRepository>
 			<id>cbi</id>
 			<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
 		</pluginRepository>
-  	</pluginRepositories>
+	</pluginRepositories>
 	<profiles>
 		<profile>
 			<id>cdtRepo</id>
@@ -325,43 +331,44 @@
 					</executions>
 				</plugin>
 				<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-eclipserun-plugin</artifactId>
-				<version>${tycho-extras-version}</version>
-				<configuration>
-					<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine>
-					<dependencies>
-						<dependency>
-							<artifactId>org.apache.ant</artifactId>
-							<type>eclipse-plugin</type>
-						</dependency>
-						<dependency>
-							<artifactId>org.eclipse.help.base</artifactId>
-							<type>eclipse-plugin</type>
-						</dependency>
-						<dependency>
-							<artifactId>org.eclipse.ant.core</artifactId>
-							<type>eclipse-plugin</type>
-						</dependency>
-					</dependencies>
-					<!-- This needs to be explicitely set now, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=395281 -->
-					<repositories>
-						<repository>
-							<id>platform</id>
-							<layout>p2</layout>
-							<url>${help-docs-eclipserun-repo}</url>
-						</repository>
-					</repositories>
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>eclipse-run</goal>
-						</goals>
-						<phase>compile</phase>
-					</execution>
-				</executions>
-			</plugin>
+					<groupId>org.eclipse.tycho.extras</groupId>
+					<artifactId>tycho-eclipserun-plugin</artifactId>
+					<version>${tycho-extras-version}</version>
+					<configuration>
+						<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile
+							customBuildCallbacks.xml build.index</appArgLine>
+						<dependencies>
+							<dependency>
+								<artifactId>org.apache.ant</artifactId>
+								<type>eclipse-plugin</type>
+							</dependency>
+							<dependency>
+								<artifactId>org.eclipse.help.base</artifactId>
+								<type>eclipse-plugin</type>
+							</dependency>
+							<dependency>
+								<artifactId>org.eclipse.ant.core</artifactId>
+								<type>eclipse-plugin</type>
+							</dependency>
+						</dependencies>
+						<!-- This needs to be explicitely set now, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=395281 -->
+						<repositories>
+							<repository>
+								<id>platform</id>
+								<layout>p2</layout>
+								<url>${help-docs-eclipserun-repo}</url>
+							</repository>
+						</repositories>
+					</configuration>
+					<executions>
+						<execution>
+							<goals>
+								<goal>eclipse-run</goal>
+							</goals>
+							<phase>compile</phase>
+						</execution>
+					</executions>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>
diff --git a/tests/org.eclipse.launchbar.core.tests/.gitignore b/tests/org.eclipse.launchbar.core.tests/.gitignore
new file mode 100644
index 00000000000..ae3c1726048
--- /dev/null
+++ b/tests/org.eclipse.launchbar.core.tests/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/tests/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF
index 5879f5a2dc7..a2e3bac8547 100644
--- a/tests/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF
@@ -8,9 +8,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.junit;bundle-version="4.11.0",
  org.mockito,
  org.eclipse.launchbar.core;bundle-version="1.0.0",
- org.eclipse.debug.core,
- org.eclipse.core.filesystem,
- org.hamcrest.core
+ org.eclipse.debug.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.launchbar.core.tests
diff --git a/tests/org.eclipse.launchbar.core.tests/pom.xml b/tests/org.eclipse.launchbar.core.tests/pom.xml
index fdc0bfe274d..b9830dc3ba6 100644
--- a/tests/org.eclipse.launchbar.core.tests/pom.xml
+++ b/tests/org.eclipse.launchbar.core.tests/pom.xml
@@ -20,23 +20,18 @@
 		<plugins>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-surefire-plugin</artifactId>
+				<artifactId>target-platform-configuration</artifactId>
 				<version>${tycho-version}</version>
 				<configuration>
-					<!-- It does not need ui, but it does not work headless for some reason -->
-					<useUIHarness>true</useUIHarness>
-					<argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m
-						-Xmx512m -XX:MaxPermSize=256M</argLine>
-					<includes>
-						<include>**/AutomatedIntegrationSuite.*</include>
-					</includes>
-					<testFailureIgnore>true</testFailureIgnore>
-					<dependencies>
-						<dependency>
-							<artifactId>org.eclipse.platform.feature.group</artifactId>
-							<type>p2-installable-unit</type>
-						</dependency>
-					</dependencies>
+					<dependency-resolution>
+						<extraRequirements>
+							<requirement>
+								<type>eclipse-plugin</type>
+								<id>org.hamcrest</id>
+								<versionRange>0.0.0</versionRange>
+							</requirement>
+						</extraRequirements>
+					</dependency-resolution>
 				</configuration>
 			</plugin>
 		</plugins>