X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FConfiguredTest.java;h=359cda2574e46e24d6a4e1591c6c06809017dd7f;hb=bdb770e853028d8510a941c936a290ab69cf675c;hp=e696acd3a7a2f3ff62e2741a798e52171d10e265;hpb=0b4380574ce58947461e0dcfde76a394bc8b76e3;p=gigi.git

diff --git a/tests/org/cacert/gigi/testUtils/ConfiguredTest.java b/tests/org/cacert/gigi/testUtils/ConfiguredTest.java
index e696acd3..359cda25 100644
--- a/tests/org/cacert/gigi/testUtils/ConfiguredTest.java
+++ b/tests/org/cacert/gigi/testUtils/ConfiguredTest.java
@@ -13,7 +13,11 @@ import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 import java.security.Signature;
 import java.sql.SQLException;
+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;
@@ -26,11 +30,16 @@ import org.cacert.gigi.database.SQLFileManager.ImportType;
 import org.cacert.gigi.dbObjects.CATS.CATSType;
 import org.cacert.gigi.dbObjects.Domain;
 import org.cacert.gigi.dbObjects.DomainPingType;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail;
 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;
@@ -63,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) {
@@ -74,7 +85,9 @@ public abstract class ConfiguredTest {
         }
         Properties props = generateProps();
         ServerConstants.init(props);
+        TimeConditions.init(props);
         DomainAssessment.init(props);
+        PasswordHash.init(props);
 
         if ( !DatabaseConnection.isInited()) {
             DatabaseConnection.init(testProps);
@@ -84,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 {
@@ -107,6 +128,7 @@ public abstract class ConfiguredTest {
             }
         }
         mainProps.setProperty("highFinancialValue", out.getAbsolutePath());
+        mainProps.setProperty("scrypt.params", "1;1;1");
         return mainProps;
     }
 
@@ -153,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();
 
-    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 int countRegex(String text, String pattern) {
@@ -178,7 +213,7 @@ public abstract class ConfiguredTest {
 
         try (GigiPreparedStatement ps2 = new GigiPreparedStatement("INSERT INTO `notary` SET `from`=?, `to`=?, points='100'")) {
             ps2.setInt(1, uid);
-            ps2.setInt(2, uid);
+            ps2.setInt(2, User.getById(uid).getPreferredName().getId());
             ps2.execute();
         }
     }
@@ -212,4 +247,12 @@ public abstract class ConfiguredTest {
         }
         System.out.println("Database reset complete in " + (System.currentTimeMillis() - ms) + " ms.");
     }
+
+    public static String validVerificationDateString() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Calendar c = Calendar.getInstance();
+        c.setTimeInMillis(System.currentTimeMillis());
+        c.add(Calendar.MONTH, -Notary.LIMIT_MAX_MONTHS_VERIFICATION + 1);
+        return sdf.format(new Date(c.getTimeInMillis()));
+    }
 }