fix: typo in receive

[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 6fa11a91eb8fa1cc9fffaa3df84a73f4c6c6f61d..326cd975ab22e656c28c5fdd1344d1c98eeba937 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -37,10 +37,6 @@ import org.cacert.gigi.DevelLauncher;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
-import org.cacert.gigi.database.SQLFileManager.ImportType;
-import org.cacert.gigi.dbObjects.CATS;
-import org.cacert.gigi.dbObjects.Domain;
-import org.cacert.gigi.dbObjects.DomainPingType;
 import org.cacert.gigi.dbObjects.EmailAddress;
 import org.cacert.gigi.dbObjects.Group;
 import org.cacert.gigi.dbObjects.Job;
@@ -50,8 +46,6 @@ 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.TestEmailReceiver.TestMail;
-import org.cacert.gigi.util.DatabaseManager;
-import org.cacert.gigi.util.ServerConstants;
 import org.cacert.gigi.util.SimpleSigner;
 import org.hamcrest.CoreMatchers;
 import org.junit.After;
@@ -68,13 +62,6 @@ public class ManagedTest extends ConfiguredTest {
         System.setProperty("sun.net.http.allowRestrictedHeaders", "true");
     }
 
-    /**
-     * Some password that fulfills the password criteria.
-     */
-    public static final String TEST_PASSWORD = "xvXV12°§";
-
-    public static final String DIFFICULT_CHARS = "ÜÖÄß𐀀";
-
     private static TestEmailReceiver ter;
 
     private static Process gigi;
@@ -101,14 +88,18 @@ public class ManagedTest extends ConfiguredTest {
         initEnvironment();
     }
 
+    private static boolean inited = false;
+
     public static Properties initEnvironment() {
         try {
             Properties mainProps = ConfiguredTest.initEnvironment();
-
+            if (inited) {
+                return mainProps;
+            }
+            inited = true;
             purgeDatabase();
             String type = testProps.getProperty("type");
             generateMainProps(mainProps);
-            ServerConstants.init(mainProps);
             if (type.equals("local")) {
                 url = testProps.getProperty("name.www") + ":" + testProps.getProperty("serverPort.https");
                 String[] parts = testProps.getProperty("mail").split(":", 2);
@@ -172,16 +163,7 @@ public class ManagedTest extends ConfiguredTest {
     }
 
     public static void purgeDatabase() throws SQLException, IOException {
-        System.out.print("... resetting Database");
-        long ms = System.currentTimeMillis();
-        try {
-            DatabaseManager.run(new String[] {
-                    testProps.getProperty("sql.driver"), testProps.getProperty("sql.url"), testProps.getProperty("sql.user"), testProps.getProperty("sql.password")
-            }, ImportType.TRUNCATE);
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-        System.out.println(" in " + (System.currentTimeMillis() - ms) + " ms");
+        purgeOnlyDB();
         clearCaches();
     }
 
@@ -195,13 +177,7 @@ public class ManagedTest extends ConfiguredTest {
     private static void generateMainProps(Properties mainProps) {
         mainProps.setProperty("testrunner", "true");
         mainProps.setProperty("host", "127.0.0.1");
-        mainProps.setProperty("name.secure", testProps.getProperty("name.secure"));
-        mainProps.setProperty("name.www", testProps.getProperty("name.www"));
-        mainProps.setProperty("name.static", testProps.getProperty("name.static"));
-        mainProps.setProperty("name.api", testProps.getProperty("name.api"));
 
-        mainProps.setProperty("https.port", testProps.getProperty("serverPort.https"));
-        mainProps.setProperty("http.port", testProps.getProperty("serverPort.http"));
         mainProps.setProperty("emailProvider", "org.cacert.gigi.email.TestEmailProvider");
         mainProps.setProperty("emailProvider.port", "8473");
         mainProps.setProperty("sql.driver", testProps.getProperty("sql.driver"));
@@ -238,7 +214,8 @@ public class ManagedTest extends ConfiguredTest {
         ManagedTest.setAcceptLanguage(null);
     }
 
-    public static TestEmailReceiver getMailReciever() {
+    @Override
+    public MailReceiver getMailReceiver() {
         return ter;
     }
 
@@ -263,7 +240,7 @@ public class ManagedTest extends ConfiguredTest {
     }
 
     public static org.hamcrest.Matcher<String> hasError() {
-        return CoreMatchers.containsString("<div class='bg-danger error-msgs'>");
+        return CoreMatchers.containsString("<div class='alert alert-danger error-msgs'>");
     }
 
     public static org.hamcrest.Matcher<String> hasNoError() {
@@ -271,12 +248,12 @@ public class ManagedTest extends ConfiguredTest {
     }
 
     public static String fetchStartErrorMessage(String d) throws IOException {
-        String formFail = "<div class='bg-danger error-msgs'>";
+        String formFail = "<div class='alert alert-danger error-msgs'>";
         int idx = d.indexOf(formFail);
         if (idx == -1) {
             return null;
         }
-        String startError = d.substring(idx + formFail.length(), idx + 100).trim();
+        String startError = d.substring(idx + formFail.length(), idx + formFail.length() + 150).trim();
         return startError;
     }
 
@@ -341,20 +318,6 @@ public class ManagedTest extends ConfiguredTest {
         return uid;
     }
 
-    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")) {
-            ps1.setInt(1, uid);
-            ps1.setInt(2, CATS.ASSURER_CHALLENGE_ID);
-            ps1.execute();
-        }
-
-        try (GigiPreparedStatement ps2 = new GigiPreparedStatement("INSERT INTO `notary` SET `from`=?, `to`=?, points='100'")) {
-            ps2.setInt(1, uid);
-            ps2.setInt(2, uid);
-            ps2.execute();
-        }
-    }
-
     protected static String stripCookie(String headerField) {
         return headerField.substring(0, headerField.indexOf(';'));
     }
@@ -504,13 +467,13 @@ public class ManagedTest extends ConfiguredTest {
         return (HttpURLConnection) uc;
     }
 
-    public static EmailAddress createVerifiedEmail(User u) throws InterruptedException, GigiApiException {
+    public EmailAddress createVerifiedEmail(User u) throws InterruptedException, GigiApiException {
         EmailAddress adrr = new EmailAddress(u, createUniqueName() + "test@test.tld", Locale.ENGLISH);
-        TestMail testMail = getMailReciever().receive();
+        TestMail testMail = getMailReceiver().receive();
         assertEquals(adrr.getAddress(), testMail.getTo());
         String hash = testMail.extractLink().substring(testMail.extractLink().lastIndexOf('=') + 1);
         adrr.verify(hash);
-        getMailReciever().clearMails();
+        getMailReceiver().clearMails();
         return adrr;
     }
 
@@ -519,18 +482,4 @@ public class ManagedTest extends ConfiguredTest {
         return openConnection;
     }
 
-    public static void verify(Domain d) {
-        try {
-            System.out.println(d.getId());
-            d.addPing(DomainPingType.EMAIL, "admin");
-            TestMail testMail = ter.receive();
-            testMail.verify();
-            assertTrue(d.isVerified());
-        } catch (GigiApiException e) {
-            throw new Error(e);
-        } catch (IOException e) {
-            throw new Error(e);
-        }
-    }
-
 }