Put more intelligence into the "outputError"-function of "Form".

[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 2518849f92b37ff298b98554d312325ab59715f7..2d48a014869c6b79f54dab12367001bea63ef42a 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -42,9 +42,10 @@ import javax.net.ssl.X509KeyManager;
 import org.cacert.gigi.DevelLauncher;
 import org.cacert.gigi.EmailAddress;
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.localisation.Language;
+import org.cacert.gigi.pages.account.MyDetails;
 import org.cacert.gigi.testUtils.TestEmailReciever.TestMail;
 import org.cacert.gigi.util.DatabaseManager;
 import org.cacert.gigi.util.PEM;
@@ -228,7 +229,7 @@ public class ManagedTest {
         try {
             String query = "fname=" + URLEncoder.encode(firstName, "UTF-8") + "&lname=" + URLEncoder.encode(lastName, "UTF-8") + "&email=" + URLEncoder.encode(email, "UTF-8") + "&pword1=" + URLEncoder.encode(password, "UTF-8") + "&pword2=" + URLEncoder.encode(password, "UTF-8") + "&day=1&month=1&year=1910&cca_agree=1";
             String data = fetchStartErrorMessage(runRegister(query));
-            assertTrue(data, data.startsWith("</div>"));
+            assertNull(data);
         } catch (UnsupportedEncodingException e) {
             throw new Error(e);
         } catch (IOException e) {
@@ -296,14 +297,14 @@ public class ManagedTest {
     static int count = 0;
 
     public static String createUniqueName() {
-        return "test" + System.currentTimeMillis() + "a" + (count++);
+        return "test" + System.currentTimeMillis() + "a" + (count++) + "u";
     }
 
     private String stripCookie(String headerField) {
         return headerField.substring(0, headerField.indexOf(';'));
     }
 
-    public static final String SECURE_REFERENCE = "/account/certs/email";
+    public static final String SECURE_REFERENCE = MyDetails.PATH;
 
     public boolean isLoggedin(String cookie) throws IOException {
         URL u = new URL("https://" + getServerName() + SECURE_REFERENCE);