ManagedTest: change semantic of fetchStartErrorMessage

diff --git a/tests/org/cacert/gigi/pages/main/RegisterPageTest.java b/tests/org/cacert/gigi/pages/main/RegisterPageTest.java
index fa2e080df53474b5b7cd6d7305e4137bb0608af9..e570ccd561b7d12c93305250b62cd892e61c61b6 100644 (file)
--- a/tests/org/cacert/gigi/pages/main/RegisterPageTest.java
+++ b/tests/org/cacert/gigi/pages/main/RegisterPageTest.java
@@ -149,7 +149,7 @@ public class RegisterPageTest extends ManagedTest {
                }
        }
        private void testFailedForm(String query) throws IOException {
-               String startError = fetchStartErrorMessage(query);
+               String startError = fetchStartErrorMessage(runRegister(query));
                assertTrue(startError, !startError.startsWith("</div>"));
        }
 

diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index 20fa9147bebf6e91f9bdf768e655e9ebf0d678f0..2fac31820e3277e0d763ffa42908339c25b4012a 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -169,8 +169,7 @@ public class ManagedTest {
                String d = IOUtils.readURL(uc);
                return d;
        }
-       public String fetchStartErrorMessage(String query) throws IOException {
-               String d = runRegister(query);
+       public String fetchStartErrorMessage(String d) throws IOException {
                String formFail = "<div class='formError'>";
                int idx = d.indexOf(formFail);
                assertNotEquals(-1, idx);
@@ -188,7 +187,7 @@ public class ManagedTest {
                                        + "&pword1=" + URLEncoder.encode(password, "UTF-8")
                                        + "&pword2=" + URLEncoder.encode(password, "UTF-8")
                                        + "&day=1&month=1&year=1910&cca_agree=1";
-                       String data = fetchStartErrorMessage(query);
+                       String data = fetchStartErrorMessage(runRegister(query));
                        assertTrue(data, data.startsWith("</div>"));
                } catch (UnsupportedEncodingException e) {
                        throw new Error(e);