UPD: desired behavior should only enforce a persons last name.

diff --git a/src/org/cacert/gigi/pages/account/MyDetailsForm.java b/src/org/cacert/gigi/pages/account/MyDetailsForm.java
index 74e454542dc8f6e6c4bdf159ce30a06ee12a759e..359880b409b706c19f8a4b6563a9c6544616dac1 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MyDetailsForm.java
+++ b/src/org/cacert/gigi/pages/account/MyDetailsForm.java
@@ -42,8 +42,8 @@ public class MyDetailsForm extends Form {
                 String newLname = req.getParameter("lname").trim();
                 String newMname = req.getParameter("mname").trim();
                 String newSuffix = req.getParameter("suffix").trim();
-                if (newFname.isEmpty() && !target.getFname().isEmpty()) {
-                    throw new GigiApiException("Names couldn't be removed.");
+                if (newLname.isEmpty()) {
+                    throw new GigiApiException("Last name cannot be empty.");
                 }
                 target.setFname(newFname);
                 target.setLname(newLname);

diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index d442ebda36b95b2ad0b1e860a331f71d6e905094..94c686d983e85c1df24292ca4faf9daffa07a70a 100644 (file)
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -93,8 +93,8 @@ public class Signup extends Form {
     @Override
     public synchronized boolean submit(PrintWriter out, HttpServletRequest req) {
         update(req);
-        if (buildup.getFname().equals("") || buildup.getLname().equals("")) {
-            outputError(out, req, "First and/or last names were blank.");
+        if (buildup.getLname().trim().equals("")) {
+            outputError(out, req, "Last name were blank.");
         }
         if ( !myDoB.isValid()) {
             outputError(out, req, "Invalid date of birth");

diff --git a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java b/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
index d2cd561b0a9918d4865f7fb96cda2cc2a5b7e9a9..ab59025b8848be3bedadb1dd8845fa947f1ffc20 100644 (file)
--- a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
+++ b/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
@@ -67,17 +67,17 @@ public class TestMyDetailsEdit extends ManagedTest {
 
     @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.getFname());
 
     }
 
     @Test
     public void testUnsetLname() throws IOException {
-        assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=&fname=Kurti&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));
+        assertNotNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=&fname=Kurti&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));
         User u = User.getById(id);
-        assertEquals("", u.getLname());
+        assertEquals("Hansel", u.getLname());
     }
 
     @Test