Fix: update testcase, only assurers may become org admins.

[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 9ce1f8938c55c7acb8928f89b05c79122293490d..45b904429dbe1dc4d371ff57e0cd7790a44e762b 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -47,7 +47,7 @@ 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;
@@ -70,7 +70,7 @@ public class ManagedTest extends ConfiguredTest {
      */
     protected static final String TEST_PASSWORD = "xvXV12°§";
 
-    private static TestEmailReciever ter;
+    private static TestEmailReceiver ter;
 
     private static Process gigi;
 
@@ -103,7 +103,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;
             }
@@ -120,7 +120,7 @@ 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.")) {
             }
             new Thread() {
 
@@ -139,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) {
@@ -221,7 +221,7 @@ public class ManagedTest extends ConfiguredTest {
         ManagedTest.setAcceptLanguage(null);
     }
 
-    public static TestEmailReciever getMailReciever() {
+    public static TestEmailReceiver getMailReciever() {
         return ter;
     }
 
@@ -311,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);
@@ -320,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) {