From 7e53b5afc33e0c7bf4416cb9bf1bcf39e8ec8698 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Tue, 4 Nov 2014 22:26:12 +0100 Subject: [PATCH] UPD: allow deleting of all names except first name. --- .../cacert/gigi/pages/account/MyDetailsForm.java | 2 +- .../gigi/pages/account/TestMyDetailsEdit.java | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/org/cacert/gigi/pages/account/MyDetailsForm.java b/src/org/cacert/gigi/pages/account/MyDetailsForm.java index 4f85ab68..74e45454 100644 --- a/src/org/cacert/gigi/pages/account/MyDetailsForm.java +++ b/src/org/cacert/gigi/pages/account/MyDetailsForm.java @@ -42,7 +42,7 @@ 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()) || (newLname.isEmpty() && !target.getLname().isEmpty()) || (newMname.isEmpty() && !target.getMname().isEmpty()) || (newSuffix.isEmpty() && !target.getSuffix().isEmpty())) { + if (newFname.isEmpty() && !target.getFname().isEmpty()) { throw new GigiApiException("Names couldn't be removed."); } target.setFname(newFname); diff --git a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java b/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java index af6cecb3..d2cd561b 100644 --- a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java +++ b/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java @@ -59,9 +59,10 @@ public class TestMyDetailsEdit extends ManagedTest { 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)); + 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.getSuffix()); } @Test @@ -74,9 +75,9 @@ public class TestMyDetailsEdit extends ManagedTest { @Test public void testUnsetLname() throws IOException { - assertNotNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=&fname=Kurti&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0)); + assertNull(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("", u.getLname()); } @Test @@ -85,9 +86,10 @@ public class TestMyDetailsEdit extends ManagedTest { 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)); + 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.getMname()); } -- 2.39.2