squeaky-clean: add more tests (exercism#2131)

emiliolg · web-flow · commit cf818244920a · 2022-07-04T17:59:49.000+01:00
diff --git a/exercises/concept/squeaky-clean/.meta/src/reference/java/SqueakyClean.java b/exercises/concept/squeaky-clean/.meta/src/reference/java/SqueakyClean.java
@@ -1,20 +1,25 @@
 class SqueakyClean {
     static String clean(String identifier) {
         final StringBuilder cleanIdentifier = new StringBuilder();
+        boolean kebab = false;
         for (int i = 0; i < identifier.length(); i++) {
             final char ch = identifier.charAt(i);
             if (Character.isSpaceChar(ch)) {
                 cleanIdentifier.append("_");
             } else if (Character.isISOControl(ch)) {
                 cleanIdentifier.append("CTRL");
-            } else if (ch == '-' && i < identifier.length() + 1) {
-                i++;
-                cleanIdentifier.append(Character.toUpperCase(identifier.charAt(i)));
-            } else if (ch >= 'α' && ch <= 'ω') {
-            } else if (Character.isAlphabetic(ch)) {
-                cleanIdentifier.append(ch);
+            } else if (ch == '-') {
+                kebab = true;
+            } else if (isLetter(ch)) {
+                cleanIdentifier.append(
+                        kebab ? Character.toUpperCase(ch) : ch
+                );
+                kebab = false;
             }
         }
         return cleanIdentifier.toString();
     }
+    private static boolean isLetter(char ch) {
+        return Character.isLetter(ch) && !(ch >= 'α' && ch <= 'ω');
+    }
 }
diff --git a/exercises/concept/squeaky-clean/src/test/java/SqueakyCleanTest.java b/exercises/concept/squeaky-clean/src/test/java/SqueakyCleanTest.java
@@ -31,7 +31,7 @@ public void leading_and_trailing_spaces() {
 
     @Test
     public void ctrl() {
-        assertThat(SqueakyClean.clean("my\0Id")).isEqualTo("myCTRLId");
+        assertThat(SqueakyClean.clean("my\0\r\u007FId")).isEqualTo("myCTRLCTRLCTRLId");
     }
 
     @Test
@@ -49,6 +49,11 @@ public void kebab_to_camel_case() {
         assertThat(SqueakyClean.clean("à-ḃç")).isEqualTo("àḂç");
     }
 
+    @Test
+    public void kebab_to_camel_case_no_letter() {
+        assertThat(SqueakyClean.clean("a-1C")).isEqualTo("aC");
+    }
+
     @Test
     public void omit_lower_case_greek_letters() {
         assertThat(SqueakyClean.clean("MyΟβιεγτFinder")).isEqualTo("MyΟFinder");
