bodewig 2002/10/10 00:12:38
Modified: . Tag: ANT_15_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs/optional/junit Tag:
ANT_15_BRANCH PlainJUnitResultFormatter.java
Log:
merge from HEAD.
PR: 13465
Revision Changes Path
No revision
No revision
1.263.2.88 +3 -0 jakarta-ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
retrieving revision 1.263.2.87
retrieving revision 1.263.2.88
diff -u -r1.263.2.87 -r1.263.2.88
--- WHATSNEW 8 Oct 2002 08:15:26 -0000 1.263.2.87
+++ WHATSNEW 10 Oct 2002 07:12:38 -0000 1.263.2.88
@@ -10,6 +10,9 @@
* ant.bat now supports the ANT_ARGS environment variable again (like
Ant 1.5 did).
+* The "plain" <junit> <formatter> could throw a NullPointerException
+ if an error occured in setUp.
+
Changes from Ant 1.5.1Beta1 to 1.5.1
====================================
No revision
No revision
1.14.2.1 +8 -4
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
Index: PlainJUnitResultFormatter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- PlainJUnitResultFormatter.java 15 Apr 2002 12:11:48 -0000 1.14
+++ PlainJUnitResultFormatter.java 10 Oct 2002 07:12:38 -0000 1.14.2.1
@@ -205,10 +205,14 @@
return;
}
Long l = (Long) testStarts.get(test);
- wri.println(" took "
- + nf.format((System.currentTimeMillis() -
l.longValue())
- / 1000.0)
- + " sec");
+ double seconds = 0;
+ // can be null if an error occured in setUp
+ if (l != null) {
+ seconds =
+ (System.currentTimeMillis() - l.longValue()) / 1000.0;
+ }
+
+ wri.println(" took " + nf.format(seconds) + " sec");
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
