The jqwik report now shows inline instead of being at the end of the log

Author: Jaswar

src/main/java/nl/tudelft/cse1110/grader/GraderRunner.java

@@ -16,19 +16,16 @@ public static void main(String[] args) {
         CheckScript codeCheckerScript = new CheckScript(Arrays.asList(new SingleCheck("TestMethodsHaveAssertions")));
 
         DefaultConfiguration cfg = new DefaultConfiguration(
-            "/Users/mauricioaniche/education/cse1110/test/code",
-            "/Users/mauricioaniche/education/cse1110/test/libs",
-            "/Users/mauricioaniche/education/cse1110/test/reports",
+            "E:\\TUDelft\\CSE1110 Summer\\code",
+                "E:\\TUDelft\\CSE1110 Summer\\libs",
+            "E:\\TUDelft\\CSE1110 Summer\\reports",
                 codeCheckerScript
         );
 
         ResultBuilder result = new ResultBuilder();
 
-        result.startCapturingConsole();
-
         ExecutionFlow flow = ExecutionFlow.fullMode(cfg, result);
         flow.run();
-        result.stopCapturingConsole();
 
         System.out.println(result.buildDebugResult());
     }

src/main/java/nl/tudelft/cse1110/grader/execution/AdditionalReportJUnitListener.java

@@ -0,0 +1,20 @@
+package nl.tudelft.cse1110.grader.execution;
+
+import nl.tudelft.cse1110.grader.result.ResultBuilder;
+import org.junit.platform.engine.reporting.ReportEntry;
+import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestIdentifier;
+
+public class AdditionalReportJUnitListener implements TestExecutionListener {
+
+    private ResultBuilder result;
+
+    public AdditionalReportJUnitListener(ResultBuilder result) {
+        this.result = result;
+    }
+
+    @Override
+    public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry entry) {
+        this.result.logAdditionalReport(testIdentifier, entry);
+    }
+}

src/main/java/nl/tudelft/cse1110/grader/execution/step/RunJUnitTests.java

@@ -4,6 +4,7 @@
 import nl.tudelft.cse1110.grader.config.Configuration;
 import nl.tudelft.cse1110.grader.execution.ExecutionStep;
 import nl.tudelft.cse1110.grader.result.ResultBuilder;
+import nl.tudelft.cse1110.grader.execution.AdditionalReportJUnitListener;
 import org.junit.platform.launcher.Launcher;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
@@ -18,13 +19,17 @@ public class RunJUnitTests implements ExecutionStep {
     public void execute(Configuration cfg, ResultBuilder result) {
         try {
             SummaryGeneratingListener listener = new SummaryGeneratingListener();
+            AdditionalReportJUnitListener additionalReportJUnitListener = new AdditionalReportJUnitListener(result);
+
             String testClass = ClassUtils.getTestClass(cfg.getNewClassNames());
 
             Launcher launcher = LauncherFactory.create();
             launcher.registerTestExecutionListeners(listener);
+            launcher.registerTestExecutionListeners(additionalReportJUnitListener);
 
             LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
                     .selectors(selectClass(testClass))
+                    .configurationParameter("jqwik.reporting.usejunitplatform", "true")
                     .build();
             launcher.execute(request);
 

src/main/java/nl/tudelft/cse1110/grader/result/ResultBuilder.java

@@ -7,16 +7,15 @@
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.reporting.ReportEntry;
 import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.listeners.TestExecutionSummary;
 import org.pitest.mutationtest.tooling.CombinedStatistics;
 
 import javax.tools.Diagnostic;
 import javax.tools.JavaFileObject;
 import java.io.*;
 import java.time.LocalDateTime;
-import java.util.InputMismatchException;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import static javax.tools.Diagnostic.Kind.ERROR;
 
@@ -25,28 +24,7 @@ public class ResultBuilder {
     private boolean failed;
     private StringBuilder result = new StringBuilder();
     private StringBuilder debug = new StringBuilder();
-    private StringBuilder consoleOutput = new StringBuilder();
-    private OutputStream outputStream;
-    private PrintStream console;
-
-    public ResultBuilder() {
-        this.console = System.out;
-
-        this.outputStream = new OutputStream() {
-            @Override
-            public void write(int b) throws IOException {
-                consoleOutput.append((char)b);
-            }
-        };
-    }
-
-    public void startCapturingConsole() {
-        System.setOut(new PrintStream(this.outputStream));
-    }
-
-    public void stopCapturingConsole() {
-        System.setOut(this.console);
-    }
+    private Map<TestIdentifier, ReportEntry> additionalReports = new HashMap<>();
 
     public void compilationFail(List<Diagnostic<? extends JavaFileObject>> diagnostics) {
         l("We could not compile your code. See the compilation errors below:");
@@ -120,23 +98,32 @@ public void logJUnitRun(TestExecutionSummary summary) {
             failed();
     }
 
+    public void logAdditionalReport(TestIdentifier testIdentifier, ReportEntry report) {
+        this.additionalReports.put(testIdentifier, report);
+    }
+
     private void logJUnitFailedTest(TestExecutionSummary.Failure failure) {
         UniqueId.Segment lastSegment = failure.getTestIdentifier().getUniqueIdObject().getLastSegment();
 
         switch (lastSegment.getType()) {
             case "test-template-invocation" -> {
                 String methodName = this.getParameterizedMethodName(failure);
                 l(String.format("\n- Parameterized test \"%s\", test case %s failed:", methodName, lastSegment.getValue()));
+                l(String.format("%s", failure.getException()));
             }
             case "property" -> {
-                l(String.format("\n- Property test \"%s\" failed (see full output below for more info):", failure.getTestIdentifier().getDisplayName()));
+                l(String.format("\n- Property test \"%s\" failed:", failure.getTestIdentifier().getDisplayName()));
+                l(String.format("%s", failure.getException()));
+
+                if (this.additionalReports.containsKey(failure.getTestIdentifier())) {
+                    l(this.additionalReports.get(failure.getTestIdentifier()).getKeyValuePairs().toString());
+                }
             }
             default -> {
                 l(String.format("\n- Test \"%s\" failed:", failure.getTestIdentifier().getDisplayName()));
+                l(String.format("%s", failure.getException()));
             }
         }
-
-        l(String.format("%s", failure.getException()));
     }
 
     private String getParameterizedMethodName(TestExecutionSummary.Failure failure) {
@@ -153,7 +140,7 @@ public String buildEndUserResult() {
     }
 
     public String buildDebugResult() {
-        return debug.toString() + "\n\n" + result.toString() + "\n\n\n\n\n" + this.consoleOutput.toString();
+        return debug.toString() + "\n\n" + result.toString();
     }
 
 

src/main/java/nl/tudelft/cse1110/grader/util/ClassUtils.java

@@ -57,7 +57,7 @@ public static String asClassPath(String librariesDir) {
             libraries.add(file.getAbsolutePath());
         }
 
-        return libraries.stream().collect(Collectors.joining(":"));
+        return libraries.stream().collect(Collectors.joining(";"));
     }
 
     /**

src/test/java/nl/tudelft/cse1110/grader/integration/GraderIntegrationTestBase.java

@@ -76,10 +76,8 @@ public String run(List<ExecutionStep> plan, CheckScript codeCheckerScript, Strin
 
         ResultBuilder result = new ResultBuilder();
 
-        result.startCapturingConsole();
         ExecutionFlow flow = ExecutionFlow.asSteps(plan, cfg, result);
         flow.run();
-        result.stopCapturingConsole();
 
         return result.buildEndUserResult();
     }