- r added tests for InlineJavaReporter

we're not sure this are good tests but we don't want to not have them either right now

Author: LarsEckart

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

@@ -2,15 +2,19 @@
 
 import org.approvaltests.Approvals;
 import org.approvaltests.core.Options;
+import org.approvaltests.reporters.AutoApproveReporter;
 import org.approvaltests.reporters.DiffMergeReporter;
 import org.approvaltests.reporters.FirstWorkingReporter;
 import org.approvaltests.reporters.QuietReporter;
 import org.approvaltests.reporters.UseReporter;
 import org.junit.jupiter.api.Test;
+import org.lambda.actions.Action1;
+import org.lambda.utils.Mutable;
 
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class InlineApprovalsTest
 {
@@ -128,4 +132,50 @@ private String greet(String name)
 
         """.formatted(name, name, name, name, name, name);
   }
-}
+  @Test
+  void testSemiAutomatic()
+  {
+    var expected = """
+        hello Lars
+        ***** DELETE ME TO APPROVE *****
+        """;
+    Options options = new Options().inline("", InlineOptions.semiAutomatic());
+    Mutable<String> result = hijackInlineReporter(options, AutoApproveReporter.class);
+    Action1<Throwable> assertion = e -> assertEquals(expected, result.get());
+    assertApprovalFailure("hello Lars", options, assertion);
+  }
+  @Test
+  void testAutomatic()
+  {
+    var expected = """
+        hello Oskar
+        """;
+    Options options = new Options().inline("", InlineOptions.automatic());
+    Mutable<String> result = hijackInlineReporter(options, AutoApproveReporter.class);
+    Action1<Throwable> assertion = e -> assertEquals(expected, result.get());
+    assertApprovalFailure("hello Oskar", options, assertion);
+  }
+  private static void assertApprovalFailure(String actual, Options options, Action1<Throwable> azzert)
+  {
+    boolean failed = true;
+    try
+    {
+      Approvals.verify(actual, options);
+      failed = false;
+    }
+    catch (Throwable t)
+    {
+      azzert.call(t);
+    }
+    assertTrue(failed, "Approval should have failed");
+  }
+  private static Mutable<String> hijackInlineReporter(Options options, Class<AutoApproveReporter> reporterClass)
+  {
+    InlineJavaReporter reporter = (InlineJavaReporter) options.getReporter();
+    assertEquals(reporter.reporter.getClass(), reporterClass);
+    reporter.reporter = new QuietReporter();
+    Mutable<String> result = new Mutable<>("");
+    reporter.createNewReceivedFileText = (s, a, m) -> result.set(a);
+    return result;
+  }
+}

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

@@ -2,26 +2,30 @@
 
 import com.spun.util.StringUtils;
 import com.spun.util.io.FileUtils;
+import org.apache.commons.lang3.function.TriFunction;
 import org.approvaltests.core.ApprovalFailureReporter;
 import org.approvaltests.core.ApprovalReporterWithCleanUp;
 import org.approvaltests.namer.StackTraceNamer;
+import org.lambda.functions.Function3;
 
 import java.io.File;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class InlineJavaReporter implements ApprovalFailureReporter, ApprovalReporterWithCleanUp
 {
-  private final String                  sourceFilePath;
-  private final StackTraceNamer         stackTraceNamer;
-  private final ApprovalFailureReporter reporter;
-  private final String                  additionalLines;
+  private final String                             sourceFilePath;
+  private final StackTraceNamer                    stackTraceNamer;
+  public ApprovalFailureReporter                   reporter;
+  private final String                             additionalLines;
+  public Function3<String, String, String, String> createNewReceivedFileText;
   public InlineJavaReporter(ApprovalFailureReporter reporter, boolean addApprovalLine)
   {
     this.reporter = reporter;
     this.stackTraceNamer = new StackTraceNamer();
     this.sourceFilePath = stackTraceNamer.getSourceFilePath();
-    this.additionalLines = addApprovalLine ? "***** DELETE ME TO APPROVE *****" : "";
+    this.additionalLines = addApprovalLine ? "***** DELETE ME TO APPROVE *****\n" : "";
+    this.createNewReceivedFileText = InlineJavaReporter::createNewReceivedFileText;
   }
   public String getSourceFilePath()
   {
@@ -39,7 +43,7 @@ public String createReceived(String actual)
     String file = sourceFilePath + stackTraceNamer.getInfo().getClassName() + ".java";
     String received = getReceivedFileName();
     String text = FileUtils.readFile(file);
-    String fullText = createNewReceivedFileText(text, actual + additionalLines,
+    String fullText = this.createNewReceivedFileText.call(text, actual + additionalLines,
         this.stackTraceNamer.getInfo().getMethodName());
     FileUtils.writeFile(new File(received), fullText);
     return received;
@@ -48,10 +52,10 @@ private String getReceivedFileName()
   {
     return sourceFilePath + stackTraceNamer.getInfo().getClassName() + ".received.txt";
   }
-  public static String createNewReceivedFileText(String text, String actual, String methodName)
+  public static String createNewReceivedFileText(String javaSourceCode, String actual, String methodName)
   {
-    text = text.replaceAll("\r\n", "\n");
-    CodeParts codeParts = CodeParts.splitCode(text, methodName);
+    javaSourceCode = javaSourceCode.replaceAll("\r\n", "\n");
+    CodeParts codeParts = CodeParts.splitCode(javaSourceCode, methodName);
     if (codeParts.method.contains("expected = \"\"\""))
     {
       replaceExpected(codeParts, actual);