From: Simon Brandhof Date: Mon, 19 Nov 2012 14:02:50 +0000 (+0100) Subject: Support env variables in sonarsource integration tests X-Git-Tag: 3.4~328^2~2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ce4dfce6c8f3c085b4808a3e31bdf14112cb1663;p=sonarqube.git Support env variables in sonarsource integration tests --- diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/AbstractDaoTestCase.java b/sonar-core/src/test/java/org/sonar/core/persistence/AbstractDaoTestCase.java index 71a53963353..7f228cb6877 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/AbstractDaoTestCase.java +++ b/sonar-core/src/test/java/org/sonar/core/persistence/AbstractDaoTestCase.java @@ -22,6 +22,7 @@ package org.sonar.core.persistence; import com.google.common.collect.Maps; import com.google.common.io.Closeables; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.text.StrSubstitutor; import org.dbunit.Assertion; import org.dbunit.DataSourceDatabaseTester; import org.dbunit.DatabaseUnitException; @@ -51,6 +52,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.sql.Connection; import java.sql.SQLException; +import java.util.Map; import java.util.Properties; import static org.junit.Assert.fail; @@ -101,6 +103,11 @@ public abstract class AbstractDaoTestCase { Properties props = new Properties(); props.load(input); settings.addProperties(props); + for (Map.Entry entry : settings.getProperties().entrySet()) { + String interpolatedValue = StrSubstitutor.replace(entry.getValue(), System.getenv(), "${", "}"); + settings.setProperty(entry.getKey(), interpolatedValue); + } + } finally { IOUtils.closeQuietly(input); }