Bug 476065 - Allow to run team tests with tycho-surefire-plugin

Change-Id: Ieab3a047650cb34621eee715e308165d5bf31927
Signed-off-by: Mickael Istria <mistria@redhat.com>

5 files changed, 39 insertions, 3 deletions

diff --git a/tests/org.eclipse.compare.tests/pom.xml b/tests/org.eclipse.compare.tests/pom.xml
index 4bb497d19..ce1fb4892 100644
--- a/tests/org.eclipse.compare.tests/pom.xml
+++ b/tests/org.eclipse.compare.tests/pom.xml
@@ -20,4 +20,21 @@
   <artifactId>org.eclipse.compare.tests</artifactId>
   <version>3.6.100-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
+
+  <properties>
+    <testSuite>${project.artifactId}</testSuite>
+    <testClass>org.eclipse.compare.tests.AllTests</testClass>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <configuration>
+          <useUIHarness>true</useUIHarness>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/tests/org.eclipse.core.tests.net/pom.xml b/tests/org.eclipse.core.tests.net/pom.xml
index 0907b1630..529d689de 100644
--- a/tests/org.eclipse.core.tests.net/pom.xml
+++ b/tests/org.eclipse.core.tests.net/pom.xml
@@ -19,5 +19,12 @@
   <groupId>org.eclipse.core</groupId>
   <artifactId>org.eclipse.core.tests.net</artifactId>
   <version>1.4.100-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-test-plugin</packaging>
+
+  <properties>
+    <testSuite>${project.artifactId}</testSuite>
+    <testClass>org.eclipse.core.tests.net.AllNetTests</testClass>
+    <!-- Currently, test fails with tycho-surefire-plugin -->
+    <skipTests>true</skipTests>
+  </properties>
 </project>
diff --git a/tests/org.eclipse.jsch.tests/pom.xml b/tests/org.eclipse.jsch.tests/pom.xml
index 69bbd3147..a566276f8 100644
--- a/tests/org.eclipse.jsch.tests/pom.xml
+++ b/tests/org.eclipse.jsch.tests/pom.xml
@@ -19,5 +19,5 @@
   <groupId>org.eclipse.jsch</groupId>
   <artifactId>org.eclipse.jsch.tests</artifactId>
   <version>1.1.0-SNAPSHOT</version>
-  <packaging>eclipse-test-plugin</packaging>
+  <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.team.tests.core/pom.xml b/tests/org.eclipse.team.tests.core/pom.xml
index 0bd2a0c9d..c23086a22 100644
--- a/tests/org.eclipse.team.tests.core/pom.xml
+++ b/tests/org.eclipse.team.tests.core/pom.xml
@@ -20,4 +20,9 @@
   <artifactId>org.eclipse.team.tests.core</artifactId>
   <version>3.8.1-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
+
+  <properties>
+    <testSuite>${project.artifactId}</testSuite>
+    <testClass>org.eclipse.team.tests.core.AllTeamTests</testClass>
+  </properties>
 </project>
diff --git a/tests/org.eclipse.team.tests.cvs.core/pom.xml b/tests/org.eclipse.team.tests.cvs.core/pom.xml
index c34027835..56fd5a358 100644
--- a/tests/org.eclipse.team.tests.cvs.core/pom.xml
+++ b/tests/org.eclipse.team.tests.cvs.core/pom.xml
@@ -19,5 +19,12 @@
   <groupId>org.eclipse.team</groupId>
   <artifactId>org.eclipse.team.tests.cvs.core</artifactId>
   <version>3.4.100-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-test-plugin</packaging>
+
+  <properties>
+    <testSuite>${project.artifactId}</testSuite>
+    <testClass>org.eclipse.team.tests.ccvs.core.AllCoreTests</testClass>
+    <!-- Currently, test fails with tycho-surefire-plugin -->
+    <skipTests>true</skipTests>
+  </properties>
 </project>