X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FTestMyDetailsEdit.java;h=536634be1e978e2c14a5ef3e595b8e3b0be19353;hb=9af691cb9d611b73907468af22e40cafa8b0200b;hp=af6cecb34c292597d2db2922910caef4df58bdb8;hpb=44a6afb91b986d4bb90460307ea9578041713342;p=gigi.git

diff --git a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java b/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
index af6cecb3..536634be 100644
--- a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
+++ b/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
@@ -26,7 +26,7 @@ public class TestMyDetailsEdit extends ManagedTest {
         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
@@ -34,7 +34,7 @@ public class TestMyDetailsEdit extends ManagedTest {
         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
@@ -42,7 +42,7 @@ public class TestMyDetailsEdit extends ManagedTest {
         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
@@ -50,7 +50,7 @@ public class TestMyDetailsEdit extends ManagedTest {
         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
@@ -58,17 +58,18 @@ public class TestMyDetailsEdit extends ManagedTest {
         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());
-        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 {
-        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());
 
     }
 
@@ -76,7 +77,7 @@ public class TestMyDetailsEdit extends ManagedTest {
     public void testUnsetLname() throws IOException {
         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
@@ -84,10 +85,11 @@ public class TestMyDetailsEdit extends ManagedTest {
         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());
 
     }
 
@@ -100,7 +102,7 @@ public class TestMyDetailsEdit extends ManagedTest {
         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().toString());
     }
 
     @Test