- B Fixed bug in InlineApprovals where spaces prevented a function fr…

…om being found
approvals · Mar 7, 2024 · 2b66e65 · 2b66e65
1 parent 6b7638b
commit 2b66e65
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/approvaltests-tests/src/test/java/org/approvaltests/inline/InlineApprovalsTest.java b/approvaltests-tests/src/test/java/org/approvaltests/inline/InlineApprovalsTest.java
@@ -48,6 +48,14 @@ public void testyMctest() {
                 ""\";
             Approvals.verify("", Options.inline(expected));
           }
+        ""","""
+          @Test
+          public void testyMctest () {
+            var expected = ""\"
+                Hello World***
+                ""\";
+            Approvals.verify("", Options.inline(expected));
+          }
         """, """
         \t@Test
         \tpublic void testyMctest()

diff --git a/...java/org/approvaltests/inline/InlineApprovalsTest.testCreateReceivedFileText.approved.txt b/...java/org/approvaltests/inline/InlineApprovalsTest.testCreateReceivedFileText.approved.txt
@@ -20,6 +20,25 @@ Becomes:
     Approvals.verify("", Options.inline(expected));
   }
 
+******
+  @Test
+  public void testyMctest () {
+    var expected = """
+        Hello World***
+        """;
+    Approvals.verify("", Options.inline(expected));
+  }
+
+Becomes:
+  @Test
+  public void testyMctest () {
+    var expected = """
+      1
+      2
+      """;
+    Approvals.verify("", Options.inline(expected));
+  }
+
 ******
 	@Test
 	public void testyMctest()

diff --git a/approvaltests/src/main/java/org/approvaltests/inline/CodeParts.java b/approvaltests/src/main/java/org/approvaltests/inline/CodeParts.java
@@ -22,7 +22,9 @@ public static CodeParts splitCode(String text, String methodName)
       String line = lines[i];
       if (start == 0)
       {
-        if (line.contains("void " + methodName + "("))
+        // Do a regex search to check if a line contains the text "void"
+
+        if (line.matches(".*void\\s+" + methodName + "\\s*\\(.*"))
         {
           start = i;
           codeParts.tab = extractLeadingWhitespace(line);