From: INOPIAE <m.maengel@inopiae.de>
Date: Fri, 13 Jul 2018 06:08:03 +0000 (+0200)
Subject: fix: ensure no blanks are entered between name parts and hyphens
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=db4fbf8bd09c3b2f0286d1b65472b18d573a4227

fix: ensure no blanks are entered between name parts and hyphens

fixes issue #156

Change-Id: I3796dc8dfdf20cb64b325b56f3879030957e02d3
---

diff --git a/src/club/wpia/gigi/output/NameInput.java b/src/club/wpia/gigi/output/NameInput.java
index 11c8de57..51664667 100644
--- a/src/club/wpia/gigi/output/NameInput.java
+++ b/src/club/wpia/gigi/output/NameInput.java
@@ -8,8 +8,8 @@ import javax.servlet.http.HttpServletRequest;
 import club.wpia.gigi.GigiApiException;
 import club.wpia.gigi.dbObjects.Name;
 import club.wpia.gigi.dbObjects.NamePart;
-import club.wpia.gigi.dbObjects.User;
 import club.wpia.gigi.dbObjects.NamePart.NamePartType;
+import club.wpia.gigi.dbObjects.User;
 import club.wpia.gigi.localisation.Language;
 import club.wpia.gigi.output.template.Outputable;
 import club.wpia.gigi.output.template.Template;
@@ -103,6 +103,9 @@ public class NameInput implements Outputable {
         if (toSplit == null || toSplit.trim().isEmpty()) {
             return new String[0];
         }
+        toSplit = toSplit.replaceAll("(?>[\\p{Z}\\s]*)([\u002d\u058a\u05be\u1806\u2010\u2011\u2012\u2013\u2014\u2015\u2e3a\u2e3b\ufe58\ufe63\uff0d])(?>[\\p{Z}\\s]*)", "-");
+        toSplit = toSplit.replaceAll("(?>[\\p{Z}\\s]+)", " ").trim();
+
         return toSplit.split(" ");
     }
 
diff --git a/tests/club/wpia/gigi/pages/account/TestMyDetailsEdit.java b/tests/club/wpia/gigi/pages/account/TestMyDetailsEdit.java
index d5b1cf33..eed6b771 100644
--- a/tests/club/wpia/gigi/pages/account/TestMyDetailsEdit.java
+++ b/tests/club/wpia/gigi/pages/account/TestMyDetailsEdit.java
@@ -147,4 +147,78 @@ public class TestMyDetailsEdit extends ManagedTest {
         // test add invalid group
         assertNotNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "action=addGroup&groupToModify=non-existing", 0));
     }
+
+    @Test
+    public void testHyphen() throws IOException {
+
+        String fn = "Hans-Dieter";
+        String fnc = fn;
+        String ln = "Müller-Schmitz";
+        String lnc = ln;
+        testAddName(fn, ln, fnc, lnc);
+
+        fn = "Hans-   Dieter";
+        ln = "Müller-    Schmitz";
+        testAddName(fn, ln, fnc, lnc);
+
+        fn = "Hans    -Dieter";
+        ln = "Müller    -Schmitz";
+        testAddName(fn, ln, fnc, lnc);
+
+        fn = "Hans    -     Dieter";
+        ln = "Müller   -   Schmitz";
+        testAddName(fn, ln, fnc, lnc);
+
+        String[] hyphen = {
+                "\u002d", "\u058a", "\u05be", "\u1806", "\u2010", "\u2011", "\u2012", "\u2013", "\u2014", "\u2015", "\u2e3a", "\u2e3b", "\ufe58", "\ufe63", "\uff0d"
+        };
+
+        for (int i = 0; i < hyphen.length; i++) {
+            fn = "Hans    " + hyphen[i] + "     Dieter";
+            ln = "Müller   " + hyphen[i] + "   Schmitz";
+            testAddName(fn, ln, fnc, lnc);
+        }
+    }
+
+    @Test
+    public void testBlanks() throws IOException {
+
+        String fn = "Hans";
+        String fnc = fn;
+        String ln = "Müller";
+        String lnc = ln;
+        testAddName(fn, ln, fnc, lnc);
+
+        fn = "Hans  ";
+        ln = "Müller  ";
+        testAddName(fn, ln, fnc, lnc);
+
+        fn = "    Hans";
+        ln = "    Müller";
+        testAddName(fn, ln, fnc, lnc);
+
+        fn = "Hans    Dieter";
+        ln = "Müller    Schmitz";
+        testAddName(fn, ln, fnc, lnc, 4);
+
+        fn = "Hans    Dieter   ";
+        ln = "    Müller    Schmitz";
+        testAddName(fn, ln, fnc, lnc, 4);
+    }
+
+    public void testAddName(String fn, String ln, String fnc, String lnc) throws IOException {
+        testAddName(fn, ln, fnc, lnc, 2);
+    }
+
+    public void testAddName(String fn, String ln, String fnc, String lnc, int partLength) throws IOException {
+        int startn = User.getById(id).getNames().length;
+        assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "action=addName&name-type=western&fname=" + fn + "&lname=" + ln, 0));
+        User u = User.getById(id);
+
+        NamePart[] parts = u.getNames()[startn].getParts();
+        assertThat(Arrays.asList(parts), CoreMatchers.hasItem(new NamePart(NamePartType.FIRST_NAME, fnc)));
+        assertThat(Arrays.asList(parts), CoreMatchers.hasItem(new NamePart(NamePartType.LAST_NAME, lnc)));
+        assertEquals(partLength, parts.length);
+        assertEquals(startn + 1, User.getById(id).getNames().length);
+    }
 }