X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FManagedTest.java;h=f3c0044bfa4213901ac4dbd241a8331ed06c4a57;hp=61689b55f8835235de2e62944ed16ddcfe9a0906;hb=0ee41cce6e542df5569376439fea61f08c738ac9;hpb=f3854f902e8c2c14bcc3c16baf82134ca5147494 diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index 61689b55..f3c0044b 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -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 hasError() { - return CoreMatchers.containsString("
"); + return CoreMatchers.containsString("
"); } public static org.hamcrest.Matcher hasNoError() { @@ -271,12 +276,12 @@ public class ManagedTest extends ConfiguredTest { } public static String fetchStartErrorMessage(String d) throws IOException { - String formFail = "
"; + String formFail = "
"; 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; }