fix #156 - supporting tabs on the end

SERG-Delft · Jul 9, 2023 · 724e02f · 724e02f
1 parent 516e49f
commit 724e02f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...udelft/cse1110/andy/execution/metatest/library/evaluators/StringReplacementEvaluator.java b/...udelft/cse1110/andy/execution/metatest/library/evaluators/StringReplacementEvaluator.java
@@ -12,8 +12,8 @@ public StringReplacementEvaluator(String old, String replacement) {
 
     @Override
     public String evaluate(String oldLibraryCode) {
-        String shiftedOld = this.old.replaceAll("(?m)^\\s+|(?m) +$", "");
-        String shiftedOldLibraryCode = oldLibraryCode.replaceAll("(?m)^\\s+|(?m) +$", "");
+        String shiftedOld = this.old.replaceAll("(?m)^\\s+|(?m)\\s+$", "");
+        String shiftedOldLibraryCode = oldLibraryCode.replaceAll("(?m)^\\s+|(?m)\\s+$", "");
         String replaced = shiftedOldLibraryCode.replace(shiftedOld, this.replacement);
 
         if (replaced.equals(shiftedOldLibraryCode)) {

diff --git a/andy/src/test/java/unit/execution/metatest/LibraryMetaTestTest.java b/andy/src/test/java/unit/execution/metatest/LibraryMetaTestTest.java
@@ -146,7 +146,7 @@ static Stream<Arguments> withStringReplacementGenerator() {
                     "extra line 1\nextra line 2",
                     "line 1\nextra line 1\nextra line 2\nline 5"),
             // different amounts of whitespaces on the end in library and old code
-            Arguments.of(" line 1 \n   \t\t  line 2  \nline 3\n\tline 4   \n\tline 5",
+            Arguments.of(" line 1 \n   \t\t  line 2\t  \nline 3\n\tline 4\t\n\tline 5",
                     "\t line 2  \n\t\t \tline 3  \nline 4 ",
                     "extra line 1\nextra line 2",
                     "line 1\nextra line 1\nextra line 2\nline 5")