add: Allow multiple names, name-schemes, multi-name-assurance, etc.

[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 1e4d49aee70417caae6ae9f85cb2127b9a1aa355..5ab200793be1ada9b60254d7a7cd6007e85a676b 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/ConfiguredTest.java
+++ b/tests/org/cacert/gigi/testUtils/ConfiguredTest.java
@@ -26,6 +26,7 @@ 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;
@@ -170,7 +171,7 @@ public abstract class ConfiguredTest {
     }
 
     public static void makeAssurer(int uid) {
-        try (GigiPreparedStatement ps1 = new GigiPreparedStatement("INSERT INTO cats_passed SET user_id=?, variant_id=?, language='en_EN', version=1")) {
+        try (GigiPreparedStatement ps1 = new GigiPreparedStatement("INSERT INTO cats_passed SET user_id=?, variant_id=?, language='en_EN', version='1'")) {
             ps1.setInt(1, uid);
             ps1.setInt(2, CATSType.ASSURER_CHALLENGE.getId());
             ps1.execute();
@@ -178,7 +179,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();
         }
     }
@@ -201,7 +202,7 @@ public abstract class ConfiguredTest {
     }
 
     public static void purgeOnlyDB() throws SQLException, IOException {
-        System.out.print("... resetting Database");
+        System.out.println("... resetting Database");
         long ms = System.currentTimeMillis();
         try {
             DatabaseManager.run(new String[] {
@@ -210,6 +211,6 @@ public abstract class ConfiguredTest {
         } catch (ClassNotFoundException e) {
             e.printStackTrace();
         }
-        System.out.println(" in " + (System.currentTimeMillis() - ms) + " ms");
+        System.out.println("Database reset complete in " + (System.currentTimeMillis() - ms) + " ms.");
     }
 }