fix: make errors real bootstrap-alerts

[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..f3c0044bfa4213901ac4dbd241a8331ed06c4a57 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -38,7 +38,7 @@ 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.CATS.CATSType;
 import org.cacert.gigi.dbObjects.Domain;
 import org.cacert.gigi.dbObjects.DomainPingType;
 import org.cacert.gigi.dbObjects.EmailAddress;
@@ -101,10 +101,15 @@ 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);
@@ -263,7 +268,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 +276,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;
     }
 
@@ -344,7 +349,7 @@ public class ManagedTest extends 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")) {
             ps1.setInt(1, uid);
-            ps1.setInt(2, CATS.ASSURER_CHALLENGE_ID);
+            ps1.setInt(2, CATSType.ASSURER_CHALLENGE.getId());
             ps1.execute();
         }