*** added CodeParts

Author: lexler

approvaltests-tests/src/test/java/org/approvaltests/InlineApprovalsTest.java

@@ -74,6 +74,22 @@ public void testyMctest(int foo) {
                 ""\";
             Approvals.verify("", Options.inline(expected));
           }
+        """, """
+          @Test
+          void testyMctest() {
+              Customer customer = Customer.create()
+                  .existingCustomer()
+                  .speakingEnglish()
+                  .build();
+              stateService.save(TestUtils.userId().build(), customer);
+              var expected = ""\"
+                  [Customer]: account lookup
+                  [     Bot]: Hi there!
+                  [     Bot]: Let me try to help.
+                  [     Bot]: routes to '12345'
+                  ""\";
+              verifyConversation(expected, "account lookup");
+          }
         """);
     Approvals.verifyAll("Substitution", inputs, i -> "******\n" + i + "\nBecomes:\n"
         + InlineJavaReporter.createNewReceivedFileText(i, "1\n2", "testyMctest"));

approvaltests-tests/src/test/java/org/approvaltests/InlineApprovalsTest.testCreateReceivedFileText.approved.txt

@@ -78,3 +78,35 @@ Becomes:
     Approvals.verify("", Options.inline(expected));
   }
 
+******
+  @Test
+  void testyMctest() {
+      Customer customer = Customer.create()
+          .existingCustomer()
+          .speakingEnglish()
+          .build();
+      stateService.save(TestUtils.userId().build(), customer);
+      var expected = """
+          [Customer]: account lookup
+          [     Bot]: Hi there!
+          [     Bot]: Let me try to help.
+          [     Bot]: routes to '12345'
+          """;
+      verifyConversation(expected, "account lookup");
+  }
+
+Becomes:
+  @Test
+  void testyMctest() {
+        Customer customer = Customer.create()
+          .existingCustomer()
+          .speakingEnglish()
+          .build();
+      stateService.save(TestUtils.userId().build(), customer);
+    var expected = """
+      1
+      2
+      """;
+      verifyConversation(expected, "account lookup");
+  }
+

approvaltests-tests/src/test/java/org/approvaltests/inline/CodePartsTest.java

@@ -0,0 +1,30 @@
+package org.approvaltests.inline;
+
+import org.approvaltests.Approvals;
+import org.junit.jupiter.api.Test;
+
+class CodePartsTest {
+    @Test
+    public void testSplit() {
+        var code = """
+            public class Test {
+                @Test
+                void testyMctest() {
+                    Customer customer = Customer.create()
+                        .existingCustomer()
+                        .speakingEnglish()
+                        .build();
+                    stateService.save(TestUtils.userId().build(), customer);
+                    var expected = ""\"
+                        [Customer]: account lookup
+                        [     Bot]: Hi there!
+                        [     Bot]: Let me try to help.
+                        [     Bot]: routes to '12345'
+                        ""\";
+                    verifyConversation(expected, "account lookup");
+                }
+            }
+            """;
+        Approvals.verify(CodeParts.splitCode(code, "testyMctest"));
+    }
+}

approvaltests-tests/src/test/java/org/approvaltests/inline/CodePartsTest.testSplit.approved.txt

@@ -0,0 +1,24 @@
+CodeParts{
+before:
+public class Test {
+    @Test
+method:
+    void testyMctest() {
+        Customer customer = Customer.create()
+            .existingCustomer()
+            .speakingEnglish()
+            .build();
+        stateService.save(TestUtils.userId().build(), customer);
+        var expected = """
+            [Customer]: account lookup
+            [     Bot]: Hi there!
+            [     Bot]: Let me try to help.
+            [     Bot]: routes to '12345'
+            """;
+        verifyConversation(expected, "account lookup");
+    }
+after:
+}
+tab:
+    
+}

approvaltests/src/main/java/org/approvaltests/inline/CodeParts.java

@@ -0,0 +1,58 @@
+package org.approvaltests.inline;
+
+import com.spun.util.ArrayUtils;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class CodeParts {
+    public String before;
+    public String method;
+    public String after;
+    public String tab;
+
+    public static CodeParts splitCode(String text, String methodName) {
+        CodeParts codeParts = new CodeParts();
+        String[] lines = text.split("\n");
+        int start = 0;
+        int end = 0;
+        for (int i = 0; i < lines.length; i++) {
+            String line = lines[i];
+            if (start == 0) {
+                if (line.contains("void " + methodName + "(")) {
+                    start = i;
+                    codeParts.tab = extractLeadingWhitespace(line);
+
+                }
+            } else if (end == 0) {
+                if (line.startsWith(codeParts.tab + "}")) {
+                    end = i + 1;
+                    break;
+                }
+            }
+        }
+        codeParts.before = String.join("\n", ArrayUtils.getSubsection(lines, 0, start));
+        codeParts.method = String.join("\n", ArrayUtils.getSubsection(lines, start, end));
+        codeParts.after = String.join("\n", ArrayUtils.getSubsection(lines, end, lines.length));
+        return codeParts;
+    }
+
+    private static String extractLeadingWhitespace(String text)
+    {
+        Pattern pattern = Pattern.compile("^\\s+");
+        Matcher matcher = pattern.matcher(text);
+        if (matcher.find())
+        { return matcher.group(); }
+        return "\t";
+    }
+
+    @Override
+    public String toString() {
+        return "CodeParts{\n" +
+            "before:\n" + before + "\n" +
+            "method:\n" + method + "\n" +
+            "after:\n" + after + "\n" +
+            "tab:\n" + tab + "\n" +
+            '}';
+    }
+}

approvaltests/src/main/java/org/approvaltests/inline/InlineJavaReporter.java

@@ -42,15 +42,17 @@ public String createReceived(String actual)
   public static String createNewReceivedFileText(String text, String actual, String methodName)
   {
     text = text.replaceAll("\r\n", "\n");
+    CodeParts codeParts = CodeParts.splitCode(text, methodName);
     int start = text.indexOf("void " + methodName + "(");
     int startOfLine = text.substring(0, start).lastIndexOf("\n") + 1;
     String line = text.substring(startOfLine, start);
     String tab = extractLeadingWhitespace(line);
     start = text.indexOf("{", start);
-    int next = text.indexOf("\n", start);
-    int end = text.indexOf("}", next);
-    int endString = text.indexOf("\"\"\";", next);
-    String part1 = text.substring(0, next);
+    int codeBeforeExpected = text.indexOf("\n", start);
+    int end = text.indexOf("}", codeBeforeExpected);
+    // if there is an expected = then set the code before to the beginning of this line
+    int endString = text.indexOf("\"\"\";", codeBeforeExpected);
+    String part1 = text.substring(0, codeBeforeExpected);
     String part2 = null;
     if (0 < endString && endString < end)
     {
@@ -60,12 +62,12 @@ public static String createNewReceivedFileText(String text, String actual, Strin
     }
     else
     {
-      part2 = text.substring(next + 1);
+      part2 = text.substring(codeBeforeExpected + 1);
     }
-    String fullText = String.format("%s\n%s%svar expected = \"\"\"\n%s%s%s%s\"\"\";\n%s", part1, tab, tab,
+      return String.format("%s\n%s%svar expected = \"\"\"\n%s%s%s%s\"\"\";\n%s", part1, tab, tab,
         indent(actual, tab), tab, tab, tab, part2);
-    return fullText;
   }
+
   public static String indent(String actual, String tab)
   {
     String[] split = actual.split("\n");