UPD: Cleanup User-class.

[gigi.git] / util-testing / org / cacert / gigi / pages / Manager.java

diff --git a/util-testing/org/cacert/gigi/pages/Manager.java b/util-testing/org/cacert/gigi/pages/Manager.java
index 4028e0692ce174f9f723e287381f66a8a5cbb280..9b4144a60a46e43c7a6146472ea0a39fcde69c1c 100644 (file)
--- a/util-testing/org/cacert/gigi/pages/Manager.java
+++ b/util-testing/org/cacert/gigi/pages/Manager.java
@@ -149,16 +149,10 @@ public class Manager extends Page {
     }
 
     private void createUser(String email) throws GigiApiException, IllegalAccessException {
-        User u = new User();
-        u.setName(new Name("Först", "Läst", "Müddle", "Süffix"));
-        u.setEmail(email);
         Calendar gc = GregorianCalendar.getInstance();
         gc.set(1990, 0, 1);
-        u.setDoB(new Date(gc.getTime().getTime()));
-        u.setPreferredLocale(Locale.ENGLISH);
-        u.insert("xvXV12°§");
-        EmailAddress ea = new EmailAddress(u, email);
-        ea.insert(Language.getInstance(Locale.ENGLISH));
+        User u = new User(email, "xvXV12°§", new Name("Först", "Läst", "Müddle", "Süffix"), new Date(gc.getTime().getTime()), Locale.ENGLISH);
+        EmailAddress ea = u.getEmails()[0];
         String hash = (String) f.get(ea);
 
         ea.verify(hash);
@@ -213,9 +207,8 @@ public class Manager extends Page {
             resp.getWriter().println("User has been assured.");
         } else if (req.getParameter("addEmail") != null) {
             User u = User.getByEmail(req.getParameter("addEmailEmail"));
-            EmailAddress ea = new EmailAddress(u, req.getParameter("addEmailNew"));
             try {
-                ea.insert(Language.getInstance(Locale.ENGLISH));
+                EmailAddress ea = new EmailAddress(u, req.getParameter("addEmailNew"), Locale.ENGLISH);
                 String hash = (String) f.get(ea);
                 ea.verify(hash);
                 resp.getWriter().println("Email added and verified");