409606: junit add Property to ignore local active services

Change-Id: Ibd69bd0d6013cc0a20bcd5f0959ab3c96bbff12c
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=409606

2 files changed, 26 insertions, 32 deletions

diff --git a/org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/CommonTestUtil.java b/org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/CommonTestUtil.java
index 7c8dc3c3..bc8d4711 100644
--- a/org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/CommonTestUtil.java
+++ b/org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/CommonTestUtil.java
@@ -62,6 +62,8 @@ public class CommonTestUtil {
 
 	public static final String KEY_CREDENTIALS_FILE = "mylyn.credentials";
 
+	private static final String KEY_IGNORE_LOCAL_SERVICES = "org.eclipse.mylyn.tests.ignore.local.services";
+
 	private final static int MAX_RETRY = 5;
 
 	/**
@@ -547,4 +549,12 @@ public class CommonTestUtil {
 		return CoreUtil.areEqual(httpProxy, httpsProxy);
 	}
 
+	/**
+	 * Returns whether to run on local services if present. Returns false, unless a system property has been set to
+	 * force to ignore local running services.
+	 */
+	public static boolean ignoreLocalTestServices() {
+		return Boolean.parseBoolean(System.getProperty(KEY_IGNORE_LOCAL_SERVICES));
+	}
+
 }
diff --git a/org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/TestConfiguration.java b/org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/TestConfiguration.java
index e03318ab..86dd4ca5 100644
--- a/org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/TestConfiguration.java
+++ b/org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/TestConfiguration.java
@@ -35,9 +35,10 @@ import com.google.gson.reflect.TypeToken;
  */
 public class TestConfiguration {
 
-	private static final String URL_SERVICES_LOCALHOST = "http://localhost:2080";
+	private static final String URL_SERVICES_LOCALHOST = System.getProperty("localhost.test.server",
+			"http://localhost:2080");
 
-	private static final String URL_SERVICES_DEFAULT = "http://mylyn.org";
+	private static final String URL_SERVICES_DEFAULT = System.getProperty("mylyn.test.server", "http://mylyn.org");
 
 	public enum TestKind {
 		UNIT, COMPONENT, INTEGRATION, SYSTEM
@@ -45,8 +46,6 @@ public class TestConfiguration {
 
 	public static TestConfiguration defaultConfiguration;
 
-	private static final String SERVER = System.getProperty("mylyn.test.server", "mylyn.org");
-
 	public static TestConfiguration getDefault() {
 		if (defaultConfiguration == null) {
 			defaultConfiguration = new TestConfiguration(TestKind.UNIT);
@@ -55,14 +54,6 @@ public class TestConfiguration {
 		return defaultConfiguration;
 	}
 
-	public static String getRepositoryUrl(String service) {
-		return getDefault().getUrl(service);
-	}
-
-	public static String getRepositoryUrl(String service, boolean secure) {
-		return getDefault().getUrl(service, secure);
-	}
-
 	public static void setDefault(TestConfiguration defaultConfiguration) {
 		TestConfiguration.defaultConfiguration = defaultConfiguration;
 	}
@@ -80,14 +71,6 @@ public class TestConfiguration {
 		this.kinds = EnumSet.of(firstKind, moreKinds);
 	}
 
-	public String getUrl(String service) {
-		return getUrl(service, false);
-	}
-
-	public String getUrl(String service, boolean secure) {
-		return ((secure) ? "https://" : "http://") + SERVER + "/" + service;
-	}
-
 	public boolean hasKind(TestKind kind) {
 		return kinds.contains(kind);
 	}
@@ -131,20 +114,21 @@ public class TestConfiguration {
 	public <T> List<T> discover(Class<T> clazz, String fixtureType, boolean defaultOnly) {
 		List<T> fixtures = Collections.emptyList();
 
-		try {
-			File file = CommonTestUtil.getFile(clazz, "local.json");
-			fixtures = discover("file://" + file.getAbsolutePath(), "", clazz, fixtureType, defaultOnly);
-		} catch (AssertionFailedError e) {
-			// ignore
-		} catch (IOException e) {
-			// ignore
-		}
+		if (!CommonTestUtil.ignoreLocalTestServices()) {
+			try {
+				File file = CommonTestUtil.getFile(clazz, "local.json");
+				fixtures = discover("file://" + file.getAbsolutePath(), "", clazz, fixtureType, defaultOnly);
+			} catch (AssertionFailedError e) {
+				// ignore
+			} catch (IOException e) {
+				// ignore
+			}
 
-		if (fixtures.isEmpty()) {
-			fixtures = discover(URL_SERVICES_LOCALHOST + "/cgi-bin/services", URL_SERVICES_LOCALHOST, clazz,
-					fixtureType, defaultOnly);
+			if (fixtures.isEmpty()) {
+				fixtures = discover(URL_SERVICES_LOCALHOST + "/cgi-bin/services", URL_SERVICES_LOCALHOST, clazz,
+						fixtureType, defaultOnly);
+			}
 		}
-
 		if (fixtures.isEmpty()) {
 			fixtures = discover(URL_SERVICES_DEFAULT + "/cgi-bin/services", URL_SERVICES_DEFAULT, clazz, fixtureType,
 					defaultOnly);