From 1b6ccf50d60585b137d8af6adbc521b94b0784b6 Mon Sep 17 00:00:00 2001
From: Paul Bender <paul.bender@acm.org>
Date: Fri, 14 Feb 2020 01:35:34 -0500
Subject: [PATCH] improve error reporting of single test targets

---
 build.xml                                           | 13 ++++++++++---
 java/test/jmri/util/junit/PrintingTestListener.java |  7 ++++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 08692b56c24..bff914772a7 100644
--- a/build.xml
+++ b/build.xml
@@ -738,7 +738,7 @@
     <target depends="-test-single-src,-test-single-test,tests,runtime-library-selection" description="Run single unit test." name="test-single">
         <junitlauncher printSummary="true">
             <classpath refid="test.class.path" />
-            <test haltOnFailure="false" failureProperty="test.failed" includeEngines="junit-jupiter,junit-vintage" name="${test.test}" >
+            <test haltOnFailure="false" failureProperty="test.failed" includeEngines="junit-jupiter,junit-vintage" name="${test.test}" outputdir="${testreport}">
                 <fork>
                     <sysproperty key="java.security.policy" value="${libdir}/security.policy"/>
                     <sysproperty key="apple.laf.useScreenMenuBar" value="true"/>
@@ -748,8 +748,12 @@
                     <sysproperty key="jmri.shutdownmanager" value="jmri.util.MockShutDownManager" />
                     <sysproperty key="user.language" value="en"/>
                     <sysproperty key="user.country" value="US"/>
+                    <sysproperty key="jmri.util.junit.PrintingTestListener.verbose" value="true" />
                     <jvmarg line="${test-single.jvmargs}"/>
                 </fork>
+                <listener classname="jmri.util.junit.PrintingTestListener" />
+                <listener type="legacy-xml" sendSysOut="true" sendSysErr="true" />
+                <listener type="legacy-brief" sendSysOut="true" sendSysErr="true" />
             </test>
         </junitlauncher>
         <fail>
@@ -773,10 +777,13 @@
                     <sysproperty key="jmri.shutdownmanager" value="jmri.util.MockShutDownManager" />
                     <sysproperty key="user.language" value="en"/>
                     <sysproperty key="user.country" value="US"/>
+                    <sysproperty key="jmri.util.junit.PrintingTestListener.verbose" value="true" />
                     <jvmarg value="${jacocoagent}"/>
-		    <jvmarg line="${test-single.jvmargs}"/>
+		            <jvmarg line="${test-single.jvmargs}"/>
                 </fork>
-                <listener type="legacy-brief" sendSysOut="false" sendSysErr="false" />
+                <listener classname="jmri.util.junit.PrintingTestListener" />
+                <listener type="legacy-xml" sendSysOut="true" sendSysErr="true" />
+                <listener type="legacy-brief" sendSysOut="true" sendSysErr="true" />
             </test>
         </junitlauncher>
         <fail>
diff --git a/java/test/jmri/util/junit/PrintingTestListener.java b/java/test/jmri/util/junit/PrintingTestListener.java
index d328923480f..f31d3acbc54 100644
--- a/java/test/jmri/util/junit/PrintingTestListener.java
+++ b/java/test/jmri/util/junit/PrintingTestListener.java
@@ -14,6 +14,7 @@
 
 public class PrintingTestListener extends SummaryGeneratingListener {
 
+
     /**
      * A {@link TextListener} implementation that can display the name
      * of run, failed and ignored tests run by JUnit
@@ -27,7 +28,11 @@ public class PrintingTestListener extends SummaryGeneratingListener {
      * property is non-empty and non-false, the output is reduced to a minimal
      * summary.
      */
-    
+
+    public PrintingTestListener(){
+        this(new PrintStream(System.out));
+    }
+
     public PrintingTestListener(PrintStream writer) {
         super();
         this.writer = writer;