- r better support for splitting

approvals · Mar 4, 2024 · 1e28726 · 1e28726
1 parent 49e544f
commit 1e28726
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/approvaltests-util-tests/src/test/java/com/spun/util/StringUtilsTest.java b/approvaltests-util-tests/src/test/java/com/spun/util/StringUtilsTest.java
@@ -7,7 +7,6 @@
 import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -125,10 +124,14 @@ public ReplaceUseCase(String startingString, String find, String replace, String
   public void testSplitting()
   {
     var expected = """
-        1a2aa3aa -> [1, 2, , 3, ]
-        1a2aa3a -> [1, 2, , 3]
-        1a2aa3 -> [1, 2, , 3]
-        """;
-    ParseInput.from(expected).verifyAll(s -> Arrays.toString(StringUtils.splitt(s, "a")));
+      1a2aa3, a -> [1, 2, , 3]
+      1ś2śś3, ś -> [1, 2, , 3]
+      1a2aa3a, a -> [1, 2, , 3]
+      1ś2śś3ś, ś -> [1, 2, , 3]
+      1a2aa3aa, a -> [1, 2, , 3, ]
+      1ś2śś3śś, ś -> [1, 2, , 3, ]
+      """;
+    ParseInput.from(expected).withTypes(String.class, String.class)
+        .verifyAll((i, p) -> Arrays.toString(StringUtils.splitt(i, p)));
   }
 }
diff --git a/approvaltests-util/src/main/java/com/spun/util/StringUtils.java b/approvaltests-util/src/main/java/com/spun/util/StringUtils.java
@@ -635,7 +635,8 @@ public static String[] splitt(String input, String pattern)
   {
     if (input.endsWith(pattern))
     {
-      input = input + " ";
+      String ending = "ś".equals(pattern) ? "š" : "ś";
+      input = input + ending;
       String[] splitted = input.split(pattern, -1);
       return ArrayUtils.getSubsection(splitted, 0, splitted.length - 1);
     }