X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FConfiguredTest.java;h=fda87cf142377a806be0aa3109612e0dff29116a;hb=0d9465248c016d99ac04e10b34d141a5811fac6f;hp=ec589b4b1ffa7c8a69a6eddbb26df92150fb4a18;hpb=fd3cf9cdbd563e2fdcd5210b97e1cc612ce8d02e;p=gigi.git

diff --git a/tests/org/cacert/gigi/testUtils/ConfiguredTest.java b/tests/org/cacert/gigi/testUtils/ConfiguredTest.java
index ec589b4b..fda87cf1 100644
--- a/tests/org/cacert/gigi/testUtils/ConfiguredTest.java
+++ b/tests/org/cacert/gigi/testUtils/ConfiguredTest.java
@@ -17,6 +17,7 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Properties;
+import java.util.Random;
 import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -35,8 +36,10 @@ import org.cacert.gigi.util.DatabaseManager;
 import org.cacert.gigi.util.DomainAssessment;
 import org.cacert.gigi.util.Notary;
 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;
@@ -69,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) {
@@ -82,6 +87,7 @@ public abstract class ConfiguredTest {
         ServerConstants.init(props);
         TimeConditions.init(props);
         DomainAssessment.init(props);
+        PasswordHash.init(props);
 
         if ( !DatabaseConnection.isInited()) {
             DatabaseConnection.init(testProps);
@@ -91,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 {
@@ -114,6 +128,7 @@ public abstract class ConfiguredTest {
             }
         }
         mainProps.setProperty("highFinancialValue", out.getAbsolutePath());
+        mainProps.setProperty("scrypt.params", "1;1;1");
         return mainProps;
     }
 
@@ -160,10 +175,23 @@ 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;
+
+        Random sr;
+        sr = new Random();
+
+        StringBuilder sb = new StringBuilder(idStringLength);
+        for (int i = 0; i < idStringLength; i++) {
+            sb.append(chars[sr.nextInt(chars.length)]);
+        }
+
+        return sb.toString();
+    }
 
-    public static String createUniqueName() {
-        return "test" + System.currentTimeMillis() + "a" + (count++) + "u";
+    public static synchronized String createUniqueName() {
+        return "test" + createRandomIDString() + "a" + (count++) + "u";
     }
 
     public static int countRegex(String text, String pattern) {