From a4514c97a47b802fb6754f117adda55dfa04bf5c Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Wed, 30 Apr 2014 23:13:11 +0200 Subject: [PATCH] Support system properties prefixed by "mediumTests." in ServerTester --- .../org/sonar/server/tester/ServerTester.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/sonar-server/src/test/java/org/sonar/server/tester/ServerTester.java b/sonar-server/src/test/java/org/sonar/server/tester/ServerTester.java index 1d0da14deb4..6f17a18d6ce 100644 --- a/sonar-server/src/test/java/org/sonar/server/tester/ServerTester.java +++ b/sonar-server/src/test/java/org/sonar/server/tester/ServerTester.java @@ -22,6 +22,7 @@ package org.sonar.server.tester; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang.StringUtils; import org.junit.rules.ExternalResource; import org.sonar.api.CoreProperties; import org.sonar.api.database.DatabaseProperties; @@ -31,15 +32,21 @@ import javax.annotation.Nullable; import java.io.File; import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.Properties; /** - * Entry point to implement medium tests of server components + * Entry point to implement medium tests of server components. + *

+ * The system properties starting with "mediumTests." override the programmatic settings, for example: + * -DmediumTests.sonar.log.profilingLevel=FULL * * @since 4.4 */ public class ServerTester extends ExternalResource { + private static final String PROP_PREFIX = "mediumTests."; + private final Platform platform; private final File homeDir; private final List components = Lists.newArrayList(DataStoreCleanup.class); @@ -68,6 +75,13 @@ public class ServerTester extends ExternalResource { properties.putAll(initialProps); properties.setProperty(CoreProperties.SONAR_HOME, homeDir.getAbsolutePath()); properties.setProperty(DatabaseProperties.PROP_URL, "jdbc:h2:" + homeDir.getAbsolutePath() + "/h2"); + for (Map.Entry entry : System.getProperties().entrySet()) { + String key = entry.getKey().toString(); + if (key.startsWith(PROP_PREFIX)) { + properties.put(StringUtils.substringAfter(key, PROP_PREFIX), entry.getValue()); + } + } + platform.init(properties); platform.addComponents(components); platform.doStart(); -- 2.39.5