You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@apache.org on 2002/10/10 09:03:43 UTC

cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit PlainJUnitResultFormatter.java

bodewig     2002/10/10 00:03:43

  Modified:    .        WHATSNEW
               src/main/org/apache/tools/ant/taskdefs/optional/junit
                        PlainJUnitResultFormatter.java
  Log:
  "plain" result formatter could throw NPE if an exception occured in
  the test's setUp method.
  
  PR: 13465
  
  Revision  Changes    Path
  1.301     +3 -0      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.300
  retrieving revision 1.301
  diff -u -r1.300 -r1.301
  --- WHATSNEW	8 Oct 2002 08:11:39 -0000	1.300
  +++ WHATSNEW	10 Oct 2002 07:03:43 -0000	1.301
  @@ -25,6 +25,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.
  +
   Other changes:
   --------------
   
  
  
  
  1.16      +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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- PlainJUnitResultFormatter.java	25 Jul 2002 15:21:16 -0000	1.15
  +++ PlainJUnitResultFormatter.java	10 Oct 2002 07:03:43 -0000	1.16
  @@ -203,10 +203,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:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>