fix: handling of irregulars in singularize / pluralize

sundrio · Jul 21, 2021 · 51dcf95 · 51dcf95
1 parent aa2e4b8
commit 51dcf95
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/core/src/main/java/io/sundr/functions/Pluralize.java b/core/src/main/java/io/sundr/functions/Pluralize.java
@@ -29,12 +29,12 @@ public enum Pluralize implements Function<String, String> {
 
   private static final List<Function<String, String>> PLURALS = Arrays.<Function<String, String>> asList(
       //Irregulars
-      new StringReplace("(p)eople$", "$1erson"),
-      new StringReplace("(m)en$", "$1an"),
-      new StringReplace("(c)hildren$", "$1hild"),
-      new StringReplace("(s)exes$", "$1ex"),
-      new StringReplace("(m)oves$", "$1ove"),
-      new StringReplace("(s)tadiums$", "$1tadium"),
+      new StringReplace("(p)erson$", "$1eople"),
+      new StringReplace("(m)an$", "$1en"),
+      new StringReplace("(c)hild$", "$1hildren"),
+      new StringReplace("(s)ex$", "$1exes"),
+      new StringReplace("(m)ove$", "$1oves"),
+      new StringReplace("(s)tadium$", "$1tadiums"),
 
       //Rules
       new StringReplace("(quiz)$", "$1zes"),

diff --git a/core/src/main/java/io/sundr/functions/Singularize.java b/core/src/main/java/io/sundr/functions/Singularize.java
@@ -34,12 +34,12 @@ public enum Singularize implements Function<String, String> {
 
   private static final List<Function<String, String>> SINGULARS = Arrays.<Function<String, String>> asList(
       //Irregulars
-      new StringReplace("(p)erson$", "$1eople"),
-      new StringReplace("(m)an$", "$1en"),
-      new StringReplace("(c)hild$", "$1hildren"),
-      new StringReplace("(s)ex$", "$1exes"),
-      new StringReplace("(m)ove$", "$1oves"),
-      new StringReplace("(s)tadium$", "$1tadiums"),
+      new StringReplace("(p)eople$", "$1erson"),
+      new StringReplace("(m)en$", "$1an"),
+      new StringReplace("(c)hildren$", "$1hild"),
+      new StringReplace("(s)exes$", "$1ex"),
+      new StringReplace("(m)oves$", "$1ove"),
+      new StringReplace("(s)tadiums$", "$1tadium"),
 
       //Rules
       new StringReplace("(quiz)zes$", "$1"),

diff --git a/core/src/test/java/io/sundr/functions/SingularizeTest.java b/core/src/test/java/io/sundr/functions/SingularizeTest.java
@@ -26,10 +26,12 @@ public class SingularizeTest {
   public void testSingularize() {
 
     assertEquals("address", Singularize.FUNCTION.apply("addresses"));
-    assertEquals("ADDRESS", Singularize.FUNCTION.apply("ADDRESSES"));
+    assertEquals("Address", Singularize.FUNCTION.apply("Addresses"));
 
     assertEquals("number", Singularize.FUNCTION.apply("numbers"));
-    assertEquals("NUMBER", Singularize.FUNCTION.apply("NUMBERS"));
-  }
+    assertEquals("Number", Singularize.FUNCTION.apply("Numbers"));
 
+    assertEquals("child", Singularize.FUNCTION.apply("children"));
+    assertEquals("Child", Singularize.FUNCTION.apply("Children"));
+  }
 }