From 45e0c789dfa93d2b20065131aaf57a0a93d213d6 Mon Sep 17 00:00:00 2001
From: Steffen Pingel
Date: Fri, 15 Jul 2011 11:54:46 +0200
Subject: bug 339956: reduce redundancy in build and simplify target management
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=339956

---
 .../mylyn/trac/tests/AllTracHeadlessStandaloneTests.java   |  3 ++-
 .../src/org/eclipse/mylyn/trac/tests/AllTracTests.java     | 14 +++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'org.eclipse.mylyn.trac.tests/src')

diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracHeadlessStandaloneTests.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracHeadlessStandaloneTests.java
index cbc62c78d..646c2e038 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracHeadlessStandaloneTests.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracHeadlessStandaloneTests.java
@@ -15,6 +15,7 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.eclipse.mylyn.internal.trac.core.client.ITracClient.Version;
+import org.eclipse.mylyn.tests.util.TestUtil;
 import org.eclipse.mylyn.trac.tests.client.TracClientFactoryTest;
 import org.eclipse.mylyn.trac.tests.client.TracClientProxyTest;
 import org.eclipse.mylyn.trac.tests.client.TracClientTest;
@@ -31,7 +32,7 @@ import org.eclipse.mylyn.trac.tests.support.TracFixture;
 public class AllTracHeadlessStandaloneTests {
 
 	public static Test suite() {
-		return suite(false);
+		return suite(TestUtil.runHeartbeatTestsOnly());
 	}
 
 	public static Test suite(boolean defaultOnly) {
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracTests.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracTests.java
index 020d54cd8..157a95e18 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracTests.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracTests.java
@@ -14,7 +14,9 @@ package org.eclipse.mylyn.trac.tests;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.eclipse.mylyn.commons.tests.support.ManagedTestSuite;
 import org.eclipse.mylyn.internal.trac.core.client.ITracClient.Version;
+import org.eclipse.mylyn.tests.util.TestUtil;
 import org.eclipse.mylyn.trac.tests.core.TracAttachmentHandlerTest;
 import org.eclipse.mylyn.trac.tests.core.TracRepositoryConnectorTest;
 import org.eclipse.mylyn.trac.tests.core.TracRepositoryConnectorWebTest;
@@ -32,11 +34,18 @@ import org.eclipse.mylyn.trac.tests.ui.TracRepositorySettingsPageTest;
 public class AllTracTests {
 
 	public static Test suite() {
-		return suite(false);
+		TestSuite suite = new ManagedTestSuite(AllTracTests.class.getName());
+		addTests(TestUtil.runHeartbeatTestsOnly(), suite);
+		return suite;
 	}
 
 	public static Test suite(boolean defaultOnly) {
-		TestSuite suite = new TestSuite("Tests for org.eclipse.mylyn.trac.tests");
+		TestSuite suite = new TestSuite(AllTracTests.class.getName());
+		addTests(defaultOnly, suite);
+		return suite;
+	}
+
+	private static void addTests(boolean defaultOnly, TestSuite suite) {
 		suite.addTest(AllTracHeadlessStandaloneTests.suite(defaultOnly));
 		suite.addTestSuite(TracUtilTest.class);
 		suite.addTestSuite(TracRepositoryQueryTest.class);
@@ -51,7 +60,6 @@ public class AllTracTests {
 				addTests(suite, fixture);
 			}
 		}
-		return suite;
 	}
 
 	protected static void addTests(TestSuite suite, TracFixture fixture) {
-- 
cgit v1.2.3