X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FTestMyDetailsEdit.java;h=e6361eb635fd99718d567d4a2d7ad20f24f321ca;hb=1198a01aa75975da0af93ec8928ce416e4da323b;hp=458d982bd0d306b4b70f1b9d317230a51848a022;hpb=8f485e113b9aed7ce2301458d27bc770d57bba44;p=gigi.git

diff --git a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java b/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
index 458d982b..e6361eb6 100644
--- a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
+++ b/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
@@ -7,126 +7,107 @@ import java.sql.Date;
 import java.util.Calendar;
 import java.util.TimeZone;
 
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Test;
 
 public class TestMyDetailsEdit extends ManagedTest {
 
+    String email = createUniqueName() + "@e.de";
+
+    int id = createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD);
+
+    String cookie = login(email, TEST_PASSWORD);
+
+    public TestMyDetailsEdit() throws IOException {}
+
     @Test
     public void testChangeFnameValid() throws IOException {
-        String email = createUniqueName() + "@e.de";
-        int id = createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD);
-        String cookie = login(email, TEST_PASSWORD);
         String newName = createUniqueName();
         assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "fname=" + newName + "&lname=Hansel&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));
         User u = User.getById(id);
-        assertEquals(newName, u.getFname());
+        assertEquals(newName, u.getName().getFname());
     }
 
     @Test
     public void testChangeLnameValid() throws IOException {
-        String email = createUniqueName() + "@e.de";
-        int id = createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD);
-        String cookie = login(email, TEST_PASSWORD);
         String newName = createUniqueName();
         assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=" + newName + "&fname=Kurti&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));
         User u = User.getById(id);
-        assertEquals(newName, u.getLname());
+        assertEquals(newName, u.getName().getLname());
     }
 
     @Test
     public void testChangeMnameValid() throws IOException {
-        String email = createUniqueName() + "@e.de";
-        int id = createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD);
-        String cookie = login(email, TEST_PASSWORD);
         String newName = createUniqueName();
         assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "mname=" + newName + "&fname=Kurti&lname=Hansel&suffix=&day=1&month=1&year=2000&processDetails", 0));
         User u = User.getById(id);
-        assertEquals(newName, u.getMname());
+        assertEquals(newName, u.getName().getMname());
     }
 
     @Test
     public void testChangeSuffixValid() throws IOException {
-        String email = createUniqueName() + "@e.de";
-        int id = createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD);
-        String cookie = login(email, TEST_PASSWORD);
         String newName = createUniqueName();
         assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "mname=&fname=Kurti&lname=Hansel&suffix=" + newName + "&day=1&month=1&year=2000&processDetails", 0));
         User u = User.getById(id);
-        assertEquals(newName, u.getSuffix());
+        assertEquals(newName, u.getName().getSuffix());
     }
 
     @Test
     public void testUnsetSuffix() throws IOException {
-        String email = createUniqueName() + "@e.de";
-        int id = createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD);
-        String cookie = login(email, TEST_PASSWORD);
         String newName = createUniqueName();
         assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "mname=&fname=Kurti&lname=Hansel&suffix=" + newName + "&day=1&month=1&year=2000&processDetails", 0));
+        clearCaches();
         User u = User.getById(id);
-        assertEquals(newName, u.getSuffix());
-        assertNotNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "mname=&fname=Kurti&lname=Hansel&suffix=&day=1&month=1&year=2000&processDetails", 0));
+        assertEquals(newName, u.getName().getSuffix());
+        assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "mname=&fname=Kurti&lname=Hansel&suffix=&day=1&month=1&year=2000&processDetails", 0));
+        clearCaches();
         u = User.getById(id);
-        assertEquals(newName, u.getSuffix());
+        assertEquals("", u.getName().getSuffix());
     }
 
     @Test
     public void testUnsetFname() throws IOException {
-        String email = createUniqueName() + "@e.de";
-        int id = createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD);
-        String cookie = login(email, TEST_PASSWORD);
-        assertNotNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "fname=&lname=Hansel&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));
+        assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "fname=&lname=Hansel&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));
         User u = User.getById(id);
-        assertEquals("Kurti", u.getFname());
+        assertEquals("", u.getName().getFname());
 
     }
 
     @Test
     public void testUnsetLname() throws IOException {
-        String email = createUniqueName() + "@e.de";
-        int id = createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD);
-        String cookie = login(email, TEST_PASSWORD);
         assertNotNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=&fname=Kurti&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));
         User u = User.getById(id);
-        assertEquals("Hansel", u.getLname());
+        assertEquals("Hansel", u.getName().getLname());
     }
 
     @Test
     public void testUnsetMname() throws IOException {
-        String email = createUniqueName() + "@e.de";
-        int id = createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD);
-        String cookie = login(email, TEST_PASSWORD);
         String newName = createUniqueName();
         assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "mname=" + newName + "&fname=Kurti&lname=Hansel&suffix=&day=1&month=1&year=2000&processDetails", 0));
         User u = User.getById(id);
-        assertEquals(newName, u.getMname());
-        assertNotNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=Hansel&fname=Kurti&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));
+        assertEquals(newName, u.getName().getMname());
+        assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=Hansel&fname=Kurti&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));
+        clearCaches();
         u = User.getById(id);
-        assertEquals(newName, u.getMname());
+        assertEquals("", u.getName().getMname());
 
     }
 
     @Test
     public void testChangeDOBValid() throws IOException {
-        String email = createUniqueName() + "@e.de";
-        int id = createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD);
-        String cookie = login(email, TEST_PASSWORD);
-        assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=Hansel&fname=Kurti&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));
+        assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=Hansel&fname=Kurti&mname=&suffix=&day=1&month=2&year=2000&processDetails", 0));
         User u = User.getById(id);
         Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
         cal.set(Calendar.YEAR, 2000);
-        cal.set(Calendar.DAY_OF_MONTH, 1);
+        cal.set(Calendar.DAY_OF_MONTH, Calendar.FEBRUARY);
         cal.set(Calendar.MONTH, 1);
         Date d = new Date(cal.getTimeInMillis());
-        assertEquals(d.toString(), u.getDob().toString());
+        assertEquals(d.toString(), u.getDoB().toSQLDate().toString());
     }
 
     @Test
     public void testChangeDOBInvalid() throws IOException {
-        String email = createUniqueName() + "@e.de";
-        createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD);
-        String cookie = login(email, TEST_PASSWORD);
         assertNotNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=Hansel&fname=Kurti&mname=&suffix=&day=1&month=1&year=test&processDetails", 0));
     }
 }