Bug 417073: Configuration for tycho-surefire-plugin

Test bundles are now built as test bundles, not as regular plugins, and
therefore can be executed by tycho surefire. Small changes in the
requirements are required, because there is no full Eclipse available at
test time, so all dependencies need to be listed.

Also-By: Mickael Istria <mistria@redhat.com>
Signed-off-by: Mickael Istria <mistria@redhat.com>
Signed-off-by: Krzysztof Daniel <kdaniel@redhat.com>
Change-Id: Icdc78a92d93c2d8e0c62c8cc6d49bbfb7de147af

6 files changed, 55 insertions, 13 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml b/bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml
index 3ef07b620..df1583317 100644
--- a/bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml
@@ -10,5 +10,21 @@
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.p2.tests.discovery</artifactId>
   <version>1.1.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-test-plugin</packaging>
+
+  <properties>
+    <testSuite>${project.artifactId}</testSuite>
+    <testClass>org.eclipse.equinox.p2.discovery.tests.AllDiscoveryTests</testClass>
+  </properties>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <configuration>
+          <work>${project.build.directory}/surefireconf</work>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.tests.optimizers/META-INF/MANIFEST.MF
index bac5607b5..18339749c 100644
--- a/bundles/org.eclipse.equinox.p2.tests.optimizers/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/META-INF/MANIFEST.MF
@@ -8,7 +8,15 @@ Export-Package: org.eclipse.equinox.p2.tests.artifact.optimizers;version="2.0.0"
  org.eclipse.equinox.p2.tests.artifact.processors;version="2.0.0",
  org.eclipse.equinox.p2.tests.sar;version="2.0.0"
 Require-Bundle: org.eclipse.equinox.common;bundle-version="3.4.0",
- org.junit;bundle-version="3.8.2"
+ org.junit;bundle-version="3.8.2",
+ org.eclipse.equinox.p2.tests;bundle-version="1.6.0",
+ org.eclipse.equinox.p2.artifact.repository;bundle-version="1.1.300",
+ org.eclipse.equinox.p2.metadata.repository;bundle-version="1.2.100",
+ org.eclipse.equinox.p2.repository;bundle-version="2.3.0",
+ org.eclipse.equinox.p2.artifact.optimizers;bundle-version="1.0.0",
+ org.eclipse.equinox.p2.artifact.processors;bundle-version="1.0.100",
+ org.eclipse.equinox.p2.metadata;bundle-version="2.2.0",
+ org.eclipse.equinox.p2.core;bundle-version="2.3.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Import-Package: ie.wombat.jbdiff,
  org.eclipse.equinox.internal.p2.artifact.optimizers,
diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/pom.xml b/bundles/org.eclipse.equinox.p2.tests.optimizers/pom.xml
index 04218dfd1..4144c21a6 100644
--- a/bundles/org.eclipse.equinox.p2.tests.optimizers/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/pom.xml
@@ -10,5 +10,10 @@
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.p2.tests.optimizers</artifactId>
   <version>1.0.100-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-test-plugin</packaging>
+
+  <properties>
+    <testSuite>${project.artifactId}</testSuite>
+    <testClass>org.eclipse.equinox.p2.tests.optimizers.AutomatedTests</testClass>
+  </properties>
 </project>
diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml b/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml
index 69fe8c346..76fe854bb 100644
--- a/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml
@@ -24,15 +24,17 @@
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
+	<properties>
+		<testSuite>${project.artifactId}</testSuite>
+		<testClass>org.eclipse.equinox.p2.tests.ui.AutomatedTests</testClass>
+	</properties>
+
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
-					<testSuite>org.eclipse.equinox.p2.tests.ui</testSuite>
-					<testClass>org.eclipse.equinox.p2.tests.ui.AutomatedTests
-					</testClass>
 					<argLine>-Xmx512m</argLine>
 					<useUIHarness>true</useUIHarness>
 				</configuration>
diff --git a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
index 8f9c78463..7b921a321 100644
--- a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
@@ -47,6 +47,7 @@ Require-Bundle: org.eclipse.equinox.frameworkadmin,
  org.eclipse.ecf.filetransfer;bundle-version="4.0.0",
  org.eclipse.ecf.identity;bundle-version="3.1.0",
  org.eclipse.ecf.provider.filetransfer;bundle-version="3.1.0",
+ org.eclipse.ecf.provider.filetransfer.httpclient4,
  org.eclipse.equinox.p2.reconciler.dropins;bundle-version="1.1.0",
  org.eclipse.ant.core;bundle-version="3.2.200",
  org.apache.ant;bundle-version="1.7.1",
diff --git a/bundles/org.eclipse.equinox.p2.tests/pom.xml b/bundles/org.eclipse.equinox.p2.tests/pom.xml
index 9072bfcf6..429906163 100644
--- a/bundles/org.eclipse.equinox.p2.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2012, 2013 Eclipse Foundation. All rights reserved. This program 
-	and the accompanying materials are made available under the terms of the 
-	Eclipse Distribution License v1.0 which accompanies this distribution, and 
-	is available at http://www.eclipse.org/org/documents/edl-v10.php Contributors: 
+<!-- Copyright (c) 2012, 2013 Eclipse Foundation. All rights reserved. This program
+	and the accompanying materials are made available under the terms of the
+	Eclipse Distribution License v1.0 which accompanies this distribution, and
+	is available at http://www.eclipse.org/org/documents/edl-v10.php Contributors:
 	Igor Fedorenko - initial implementation -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
@@ -21,6 +21,8 @@
 
 	<properties>
 		<platform.archive.name>eclipse-indigo-platform.tar.gz</platform.archive.name>
+		<testSuite>${project.artifactId}</testSuite>
+		<testClass>org.eclipse.equinox.p2.tests.AutomatedTests</testClass>
 	</properties>
 
 	<build>
@@ -32,13 +34,11 @@
 					<executionEnvironment>JavaSE-1.7</executionEnvironment>
 				</configuration>
 			</plugin>
-			
+
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
-					<testSuite>org.eclipse.equinox.p2.tests</testSuite>
-					<testClass>org.eclipse.equinox.p2.tests.AutomatedTests</testClass>
 					<argLine>-Xmx512m -Dorg.eclipse.equinox.p2.reconciler.tests.platform.archive=${platform.archive.name} -Dorg.eclipse.equinox.p2.reconciler.tests.35.platform.archive=${platform.archive.name} -Dorg.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive=${platform.archive.name} -Dorg.eclipse.equinox.p2.repository -Dorg.eclipse.equinox.p2.transport.ecf.retry=5</argLine>
 					<appArgLine>-consoleLog</appArgLine>
 					<bundleStartLevel>
@@ -48,6 +48,16 @@
 							<autoStart>true</autoStart>
 						</bundle>
 					</bundleStartLevel>
+					<explodedBundles>
+						<explodedBundle>org.apache.ant</explodedBundle>
+					</explodedBundles>
+					<dependencies>
+						<dependency>
+							<type>eclipse-plugin</type>
+							<artifactId>org.eclipse.osgi.compatibility.state</artifactId>
+							<version>0.0.0</version>
+						</dependency>
+					</dependencies>
 				</configuration>
 			</plugin>
 		</plugins>