From b550611aa78ea488574589cac566f133bb328928 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Tue, 26 Aug 2008 16:13:52 +0000
Subject: [PATCH] some additional diagnostics

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@689125 13f79535-47bb-0310-9956-ffa450edef68
---
 .../taskdefs/optional/junit/JUnitTask.java    | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index 405df31c1..a103ba82c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -26,6 +26,7 @@ import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.lang.reflect.Constructor;
 import java.net.URL;
@@ -851,20 +852,28 @@ public class JUnitTask extends Task {
         try {
             writer =
                 new PrintWriter(new BufferedWriter(new FileWriter(casesFile)));
+
+            log("Creating casesfile '" + casesFile.getAbsolutePath()
+                + "' with content: ", Project.MSG_VERBOSE);
+            PrintStream logWriter =
+                new PrintStream(new LogOutputStream(this, Project.MSG_VERBOSE));
+
             Iterator iter = testList.iterator();
             while (iter.hasNext()) {
                 test = (JUnitTest) iter.next();
-                writer.print(test.getName());
+                printDual(writer, logWriter, test.getName());
                 if (test.getTodir() == null) {
-                    writer.print("," + getProject().resolveFile("."));
+                    printDual(writer, logWriter,
+                              "," + getProject().resolveFile("."));
                 } else {
-                    writer.print("," + test.getTodir());
+                    printDual(writer, logWriter, "," + test.getTodir());
                 }
 
                 if (test.getOutfile() == null) {
-                    writer.println("," + "TEST-" + test.getName());
+                    printlnDual(writer, logWriter,
+                                "," + "TEST-" + test.getName());
                 } else {
-                    writer.println("," + test.getOutfile());
+                    printlnDual(writer, logWriter, "," + test.getOutfile());
                 }
             }
             writer.flush();
@@ -880,9 +889,7 @@ public class JUnitTask extends Task {
             log(e.toString(), Project.MSG_ERR);
             throw new BuildException(e);
         } finally {
-            if (writer != null) {
-                writer.close();
-            }
+            FILE_UTILS.close(writer);
 
             try {
                 casesFile.delete();
@@ -1958,4 +1965,16 @@ public class JUnitTask extends Task {
         t.setName(pack + "Batch-With-Multiple-Tests");
         return t;
     }
+
+    private static void printDual(PrintWriter w, PrintStream s, String text)
+        throws IOException {
+        w.print(text);
+        s.print(text);
+    }
+
+    private static void printlnDual(PrintWriter w, PrintStream s, String text)
+        throws IOException {
+        w.println(text);
+        s.println(text);
+    }
 }