UPD: Cleanup User-class.

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

diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index f5354eb9b8364552409f84f4655c9886632b67e5..cc3215c140f20d84a957e638453f8fd4f11281d5 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -43,17 +43,15 @@ import org.cacert.gigi.dbObjects.EmailAddress;
 import org.cacert.gigi.dbObjects.Group;
 import org.cacert.gigi.dbObjects.ObjectCache;
 import org.cacert.gigi.dbObjects.User;
-import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.pages.Manager;
 import org.cacert.gigi.pages.account.MyDetails;
 import org.cacert.gigi.pages.main.RegisterPage;
-import org.cacert.gigi.testUtils.TestEmailReciever.TestMail;
+import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail;
 import org.cacert.gigi.util.DatabaseManager;
 import org.cacert.gigi.util.ServerConstants;
 import org.cacert.gigi.util.SimpleSigner;
 import org.junit.After;
 import org.junit.AfterClass;
-import org.junit.Assert;
 import org.junit.BeforeClass;
 
 /**
@@ -69,9 +67,9 @@ public class ManagedTest extends ConfiguredTest {
     /**
      * Some password that fulfills the password criteria.
      */
-    protected static final String TEST_PASSWORD = "xvXV12°§";
+    public static final String TEST_PASSWORD = "xvXV12°§";
 
-    private static TestEmailReciever ter;
+    private static TestEmailReceiver ter;
 
     private static Process gigi;
 
@@ -104,7 +102,7 @@ public class ManagedTest extends ConfiguredTest {
             if (type.equals("local")) {
                 url = testProps.getProperty("name.www") + ":" + testProps.getProperty("serverPort.https");
                 String[] parts = testProps.getProperty("mail").split(":", 2);
-                ter = new TestEmailReciever(new InetSocketAddress(parts[0], Integer.parseInt(parts[1])));
+                ter = new TestEmailReceiver(new InetSocketAddress(parts[0], Integer.parseInt(parts[1])));
                 ter.start();
                 return;
             }
@@ -121,7 +119,8 @@ public class ManagedTest extends ConfiguredTest {
 
             final BufferedReader br = new BufferedReader(new InputStreamReader(gigi.getErrorStream(), "UTF-8"));
             String line;
-            while ((line = br.readLine()) != null && !line.contains("Server:main: Started")) {
+            while ((line = br.readLine()) != null && !line.contains("System successfully started.")) {
+                System.err.println(line);
             }
             new Thread() {
 
@@ -140,7 +139,7 @@ public class ManagedTest extends ConfiguredTest {
             if (line == null) {
                 throw new Error("Server startup failed");
             }
-            ter = new TestEmailReciever(new InetSocketAddress("localhost", 8473));
+            ter = new TestEmailReceiver(new InetSocketAddress("localhost", 8473));
             ter.start();
             SimpleSigner.runSigner();
         } catch (IOException e) {
@@ -222,19 +221,7 @@ public class ManagedTest extends ConfiguredTest {
         ManagedTest.setAcceptLanguage(null);
     }
 
-    public TestMail waitForMail() {
-        TestMail mail = null;
-        while (null == mail) {
-            try {
-                mail = ter.recieve();
-            } catch (InterruptedException e) {
-                throw new Error(e);
-            }
-        }
-        return mail;
-    }
-
-    public static TestEmailReciever getMailReciever() {
+    public static TestEmailReceiver getMailReciever() {
         return ter;
     }
 
@@ -283,11 +270,9 @@ public class ManagedTest extends ConfiguredTest {
     public static int createVerifiedUser(String firstName, String lastName, String email, String password) {
         registerUser(firstName, lastName, email, password);
         try {
-            TestMail tm = ter.recieve();
-            Assert.assertNotNull(tm);
-            tm.verify();
+            ter.receive().verify();
 
-            GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM users where email=?");
+            GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `id` FROM `users` WHERE `email`=?");
             ps.setString(1, email);
 
             try (GigiResultSet rs = ps.executeQuery()) {
@@ -297,8 +282,6 @@ public class ManagedTest extends ConfiguredTest {
             }
 
             throw new Error();
-        } catch (InterruptedException e) {
-            throw new Error(e);
         } catch (IOException e) {
             throw new Error(e);
         }
@@ -328,6 +311,12 @@ public class ManagedTest extends ConfiguredTest {
     public static int createAssuranceUser(String firstName, String lastName, String email, String password) {
         int uid = createVerifiedUser(firstName, lastName, email, password);
 
+        makeAssurer(uid);
+
+        return uid;
+    }
+
+    public static void makeAssurer(int uid) {
         GigiPreparedStatement ps1 = DatabaseConnection.getInstance().prepare("INSERT INTO `cats_passed` SET `user_id`=?, `variant_id`=?");
         ps1.setInt(1, uid);
         ps1.setInt(2, 0);
@@ -337,8 +326,6 @@ public class ManagedTest extends ConfiguredTest {
         ps2.setInt(1, uid);
         ps2.setInt(2, uid);
         ps2.execute();
-
-        return uid;
     }
 
     static String stripCookie(String headerField) {
@@ -480,10 +467,8 @@ public class ManagedTest extends ConfiguredTest {
     }
 
     public static EmailAddress createVerifiedEmail(User u) throws InterruptedException, GigiApiException {
-        EmailAddress adrr = new EmailAddress(u, createUniqueName() + "test@test.tld");
-        adrr.insert(Language.getInstance(Locale.ENGLISH));
-        TestMail testMail = getMailReciever().recieve();
-        Assert.assertNotNull(testMail);
+        EmailAddress adrr = new EmailAddress(u, createUniqueName() + "test@test.tld", Locale.ENGLISH);
+        TestMail testMail = getMailReciever().receive();
         assertEquals(adrr.getAddress(), testMail.getTo());
         String hash = testMail.extractLink().substring(testMail.extractLink().lastIndexOf('=') + 1);
         adrr.verify(hash);