correction to naming now allows lowercase suffixes as should be

'*s' + 'Case' -> 'Cases' and not 'CaseS' as was previously
immutables · Jan 2, 2016 · fb45b44 · fb45b44
1 parent 36dc296
commit fb45b44
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/generator/src/org/immutables/generator/Naming.java b/generator/src/org/immutables/generator/Naming.java
@@ -204,7 +204,7 @@ public boolean isConstant() {
     public Naming requireNonConstant(Preference preference) {
       switch (preference) {
       case SUFFIX:
-        return new PrefixSuffixNaming("", name);
+        return new PrefixSuffixNaming("", Usage.CAPITALIZED.apply(name));
       case PREFIX:
       default:
         return new PrefixSuffixNaming(name, "");
@@ -235,7 +235,7 @@ public String apply(String input) {
           ? Usage.INDIFFERENT
           : Usage.CAPITALIZED;
 
-      return prefix + resultFormat.apply(input) + Usage.CAPITALIZED.apply(suffix);
+      return prefix + resultFormat.apply(input) + suffix;
     }
 
     @Override

diff --git a/generator/test/org/immutables/generator/NamingTest.java b/generator/test/org/immutables/generator/NamingTest.java
@@ -17,7 +17,7 @@
 
 import org.immutables.generator.Naming.Preference;
 import org.junit.Test;
-import static org.immutables.check.Checkers.*;
+import static org.immutables.check.Checkers.check;
 
 public class NamingTest {
   @Test(expected = IllegalArgumentException.class)
@@ -125,10 +125,18 @@ public void requireNonConstant() {
     check(Naming.from("new*").requireNonConstant(Preference.SUFFIX).apply("x")).is("newX");
   }
 
+  @Test
+  public void lowercaseSuffix() {
+    check(Naming.from("check*out").detect("checkThisout")).is("this");
+    check(Naming.from("check*out").apply("it")).is("checkItout");
+  }
+
   @Test
   public void usageCorrection() {
-    String apply = Naming.from("of").requireNonConstant(Preference.SUFFIX).apply("Hen");
+    String suffix = Naming.from("of").requireNonConstant(Preference.SUFFIX).apply("Hen");
-    check(Naming.Usage.LOWERIZED.apply(apply)).is("henOf");
+    check(Naming.Usage.LOWERIZED.apply(suffix)).is("henOf");
-    check(Naming.from("check*out").apply("it")).is("checkItOut");
+
+    String prefix = Naming.from("of").requireNonConstant(Preference.PREFIX).apply("Hen");
+    check(Naming.Usage.CAPITALIZED.apply(prefix)).is("OfHen");
   }
 }