upd: factor out default client certificate profile

[gigi.git] / tests / org / cacert / gigi / testUtils / ConfiguredTest.java

diff --git a/tests/org/cacert/gigi/testUtils/ConfiguredTest.java b/tests/org/cacert/gigi/testUtils/ConfiguredTest.java
index 1a8ce6929b91387a5d1c37ed87605d224f2c0c5c..1467f434145b6ab583b7f10d9246308a58fa3116 100644 (file)
--- 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;
@@ -27,6 +28,7 @@ import org.cacert.gigi.database.DatabaseConnection.Link;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.SQLFileManager.ImportType;
 import org.cacert.gigi.dbObjects.CATS.CATSType;
+import org.cacert.gigi.dbObjects.CertificateProfile;
 import org.cacert.gigi.dbObjects.Domain;
 import org.cacert.gigi.dbObjects.DomainPingType;
 import org.cacert.gigi.dbObjects.User;
@@ -38,6 +40,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;
@@ -70,6 +73,8 @@ public abstract class ConfiguredTest {
         initEnvironment();
     }
 
+    private static Link l;
+
     public static Properties initEnvironment() throws IOException {
         TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
         if (envInited) {
@@ -93,8 +98,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 {
@@ -163,10 +176,27 @@ 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();
 
-    public static String createUniqueName() {
-        return "test" + System.currentTimeMillis() + "a" + (count++) + "u";
+        StringBuilder sb = new StringBuilder(idStringLength);
+        for (int i = 0; i < idStringLength; i++) {
+            sb.append(chars[sr.nextInt(chars.length)]);
+        }
+
+        return sb.toString();
+    }
+
+    public static synchronized String createUniqueName() {
+        return "test" + createRandomIDString() + "a" + (count++) + "u";
+    }
+
+    public static CertificateProfile getClientProfile() {
+        return CertificateProfile.getByName("client");
     }
 
     public static int countRegex(String text, String pattern) {
@@ -230,5 +260,4 @@ public abstract class ConfiguredTest {
         c.add(Calendar.MONTH, -Notary.LIMIT_MAX_MONTHS_VERIFICATION + 1);
         return sdf.format(new Date(c.getTimeInMillis()));
     }
-
 }