X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Fclub%2Fwpia%2Fgigi%2FtestUtils%2FManagedTest.java;h=a6d51becff72a9f90dcda4e1175041aaf4a9b72d;hp=4a8324bd860d2d95a71060b6fdf4126af8556376;hb=62b9a6519d6304820fdfa739ef9281e1cdaccb7d;hpb=c38c46e7b8c5482112fbabd82c654445166b7041 diff --git a/tests/club/wpia/gigi/testUtils/ManagedTest.java b/tests/club/wpia/gigi/testUtils/ManagedTest.java index 4a8324bd..a6d51bec 100644 --- a/tests/club/wpia/gigi/testUtils/ManagedTest.java +++ b/tests/club/wpia/gigi/testUtils/ManagedTest.java @@ -26,6 +26,7 @@ import java.security.PrivateKey; import java.security.cert.X509Certificate; import java.sql.SQLException; import java.util.Locale; +import java.util.Map.Entry; import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -104,8 +105,17 @@ public class ManagedTest extends ConfiguredTest { private static boolean inited = false; public static Properties initEnvironment() { + return initEnvironment(new Properties()); + } + + public static Properties initEnvironment(Properties additionalConfig) { try { Properties mainProps = ConfiguredTest.initEnvironment(); + for (Entry i : additionalConfig.entrySet()) { + if (i.getKey() instanceof String && i.getValue() instanceof String) { + mainProps.setProperty((String) i.getKey(), (String) i.getValue()); + } + } if (inited) { return mainProps; }