Complete implementation of feature #7

lindgren · Apr 13, 2017 · db8666d · db8666d
1 parent 3837f43
commit db8666d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/uk/co/lindgrens/stringcalculator/StringCalculator.java b/src/main/java/uk/co/lindgrens/stringcalculator/StringCalculator.java
@@ -42,11 +42,11 @@ private boolean isDefaultDelimiter(String numbers) {
     }
 
     private String getDelimiter(String numbers) {
-        Pattern pattern = Pattern.compile("//(.)");
+        Pattern pattern = Pattern.compile("//\\[?(.*?)\\]?\n");
         Matcher matcher = pattern.matcher(numbers);
 
         if(matcher.find()) {
-            return matcher.group(1);
+            return "\\Q" +matcher.group(1) +"\\E";
         }
 
         return DEFAULT_DELIMITER;

diff --git a/src/test/groovy/StringCalculatorTest.groovy b/src/test/groovy/StringCalculatorTest.groovy
@@ -15,12 +15,13 @@ class StringCalculatorTest extends Specification {
         stringCalculator.add(NUMBERS) == SUM
 
         where:
-        NUMBERS         | SUM
-        ''              | 0
-        '1'             | 1
-        '1,2'           | 3
-        '1\n2,3'        | 6
-        '//;\n1;2'      | 3
+        NUMBERS                 | SUM
+        ''                      | 0
+        '1'                     | 1
+        '1,2'                   | 3
+        '1\n2,3'                | 6
+        '//;\n1;2'              | 3
+        '//[***]\n1***2***3'    | 6
     }
 
     def "should throw exception for negative numbers"() {