NEW - bug 372971: setup integration tests on slave7

https://bugs.eclipse.org/bugs/show_bug.cgi?id=372971

Change-Id: I8e938279552ea19c09c1e4a1a17d729a230f0471

2 files changed, 15 insertions, 21 deletions

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 90206e93f..f91121ab2 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
@@ -14,7 +14,7 @@ package org.eclipse.mylyn.trac.tests;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.eclipse.mylyn.commons.sdk.util.CommonTestUtil;
+import org.eclipse.mylyn.commons.sdk.util.TestConfiguration;
 import org.eclipse.mylyn.internal.trac.core.client.ITracClient.Version;
 import org.eclipse.mylyn.trac.tests.client.TracClientFactoryTest;
 import org.eclipse.mylyn.trac.tests.client.TracClientProxyTest;
@@ -32,10 +32,10 @@ import org.eclipse.mylyn.trac.tests.support.TracFixture;
 public class AllTracHeadlessStandaloneTests {
 
 	public static Test suite() {
-		return suite(false, CommonTestUtil.runHeartbeatTestsOnly());
+		return suite(TestConfiguration.getDefault());
 	}
 
-	public static Test suite(boolean localOnly, boolean defaultOnly) {
+	public static Test suite(TestConfiguration configuration) {
 		TestSuite suite = new TestSuite(AllTracHeadlessStandaloneTests.class.getName());
 		// client tests
 		suite.addTestSuite(TracSearchTest.class);
@@ -45,8 +45,8 @@ public class AllTracHeadlessStandaloneTests {
 		// core tests
 		suite.addTestSuite(TracClientManagerTest.class);
 		// network tests
-		if (!localOnly) {
-			if (defaultOnly) {
+		if (!configuration.isLocalOnly()) {
+			if (configuration.isDefaultOnly()) {
 				addTests(suite, TracFixture.DEFAULT);
 			} else {
 				for (TracFixture fixture : TracFixture.ALL) {
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 1cb23227c..e7262ff13 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,8 +14,8 @@ package org.eclipse.mylyn.trac.tests;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.eclipse.mylyn.commons.sdk.util.CommonTestUtil;
 import org.eclipse.mylyn.commons.sdk.util.ManagedTestSuite;
+import org.eclipse.mylyn.commons.sdk.util.TestConfiguration;
 import org.eclipse.mylyn.internal.trac.core.client.ITracClient.Version;
 import org.eclipse.mylyn.trac.tests.core.TracAttachmentHandlerTest;
 import org.eclipse.mylyn.trac.tests.core.TracRepositoryConnectorTest;
@@ -35,33 +35,27 @@ public class AllTracTests {
 
 	public static Test suite() {
 		TestSuite suite = new ManagedTestSuite(AllTracTests.class.getName());
-		addTests(false, CommonTestUtil.runHeartbeatTestsOnly(), suite);
+		addTests(suite, TestConfiguration.getDefault());
 		return suite;
 	}
 
-	public static Test suite(boolean defaultOnly) {
+	public static Test suite(TestConfiguration configuration) {
 		TestSuite suite = new TestSuite(AllTracTests.class.getName());
-		addTests(false, defaultOnly, suite);
+		addTests(suite, configuration);
 		return suite;
 	}
 
-	public static Test localSuite() {
-		TestSuite suite = new TestSuite(AllTracTests.class.getName());
-		addTests(true, CommonTestUtil.runHeartbeatTestsOnly(), suite);
-		return suite;
-	}
-
-	private static void addTests(boolean localOnly, boolean defaultOnly, TestSuite suite) {
-		suite.addTest(AllTracHeadlessStandaloneTests.suite(localOnly, defaultOnly));
+	public static void addTests(TestSuite suite, TestConfiguration configuration) {
+		suite.addTest(AllTracHeadlessStandaloneTests.suite(configuration));
 		suite.addTestSuite(TracUtilTest.class);
-		suite.addTestSuite(TracRepositoryQueryTest.class);
 		// XXX fails when run from continuous build: suite.addTestSuite(TracTaskEditorTest.class);
-		suite.addTestSuite(TracRepositorySettingsPageTest.class);
 		suite.addTestSuite(TracHyperlinkUtilTest.class);
 
-		if (!localOnly) {
+		if (!configuration.isLocalOnly()) {
+			suite.addTestSuite(TracRepositoryQueryTest.class);
+			suite.addTestSuite(TracRepositorySettingsPageTest.class);
 			// network tests
-			if (defaultOnly) {
+			if (configuration.isDefaultOnly()) {
 				addTests(suite, TracFixture.DEFAULT);
 			} else {
 				for (TracFixture fixture : TracFixture.ALL) {