X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FConfiguredTest.java;h=fda87cf142377a806be0aa3109612e0dff29116a;hb=0d9465248c016d99ac04e10b34d141a5811fac6f;hp=892dfefee9f48bdf45de91be5fa01fadb6aeed53;hpb=0931c8e7e936837334372fa3c77d44e65b3e8df7;p=gigi.git diff --git a/tests/org/cacert/gigi/testUtils/ConfiguredTest.java b/tests/org/cacert/gigi/testUtils/ConfiguredTest.java index 892dfefe..fda87cf1 100644 --- a/tests/org/cacert/gigi/testUtils/ConfiguredTest.java +++ b/tests/org/cacert/gigi/testUtils/ConfiguredTest.java @@ -39,6 +39,7 @@ import org.cacert.gigi.util.PEM; import org.cacert.gigi.util.PasswordHash; import org.cacert.gigi.util.ServerConstants; import org.cacert.gigi.util.TimeConditions; +import org.junit.AfterClass; import org.junit.BeforeClass; import sun.security.pkcs10.PKCS10; @@ -71,6 +72,8 @@ public abstract class ConfiguredTest { initEnvironment(); } + private static Link l; + public static Properties initEnvironment() throws IOException { TimeZone.setDefault(TimeZone.getTimeZone("UTC")); if (envInited) { @@ -94,8 +97,16 @@ public abstract class ConfiguredTest { throw new Error(e); } } + return props; + } + @AfterClass + public static void closeDBLink() { + if (l != null) { + l.close(); + l = null; + } } private static Properties generateProps() throws Error { @@ -164,8 +175,6 @@ public abstract class ConfiguredTest { static int count = 0; - private static Link l; - public static String createRandomIDString() { final char[] chars = "abcdefghijklmnopqrstuvwxyz0123456789".toCharArray(); final int idStringLength = 16;