@@ -26,6 +26,7 @@ import java.io.FileReader;
import java.io.FileWriter;
import java.io.FileWriter;
import java.io.IOException;
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStream;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.PrintWriter;
import java.lang.reflect.Constructor;
import java.lang.reflect.Constructor;
import java.net.URL;
import java.net.URL;
@@ -851,20 +852,28 @@ public class JUnitTask extends Task {
try {
try {
writer =
writer =
new PrintWriter(new BufferedWriter(new FileWriter(casesFile)));
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();
Iterator iter = testList.iterator();
while (iter.hasNext()) {
while (iter.hasNext()) {
test = (JUnitTest) iter.next();
test = (JUnitTest) iter.next();
writer.print(test.getName());
printDual(writer, logWriter, test.getName());
if (test.getTodir() == null) {
if (test.getTodir() == null) {
writer.print("," + getProject().resolveFile("."));
printDual(writer, logWriter,
"," + getProject().resolveFile("."));
} else {
} else {
writer.print( "," + test.getTodir());
printDual(writer, logWriter, "," + test.getTodir());
}
}
if (test.getOutfile() == null) {
if (test.getOutfile() == null) {
writer.println("," + "TEST-" + test.getName());
printlnDual(writer, logWriter,
"," + "TEST-" + test.getName());
} else {
} else {
writer.println( "," + test.getOutfile());
printlnDual(writer, logWriter, "," + test.getOutfile());
}
}
}
}
writer.flush();
writer.flush();
@@ -880,9 +889,7 @@ public class JUnitTask extends Task {
log(e.toString(), Project.MSG_ERR);
log(e.toString(), Project.MSG_ERR);
throw new BuildException(e);
throw new BuildException(e);
} finally {
} finally {
if (writer != null) {
writer.close();
}
FILE_UTILS.close(writer);
try {
try {
casesFile.delete();
casesFile.delete();
@@ -1958,4 +1965,16 @@ public class JUnitTask extends Task {
t.setName(pack + "Batch-With-Multiple-Tests");
t.setName(pack + "Batch-With-Multiple-Tests");
return t;
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);
}
}
}