svn commit: r345324 - in /maven/surefire/trunk/surefire/src: main/java/org/codehaus/surefire/report/ test/java/org/codehaus/surefire/suite/directory/a/ test/java/org/codehaus/surefire/suite/directory/b/

[jdcasey]

Author: jdcasey
Date: Thu Nov 17 12:31:24 2005
New Revision: 345324

URL: http://svn.apache.org/viewcvs?rev=345324&view=rev
Log:
PR: SUREFIRE-12
Submitted By: Johnny Ruiz
Reviewed By: John Casey

Patch applied, thanks Johnny.

This patch fixed the timing output for a battery run to the console, where the 
time output was only the time for the last test in the battery.

ALSO: I'm fixing a package/directory-structure mismatch in two test suites for 
this project.


Modified:
    
maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/report/ConsoleReporter.java
    
maven/surefire/trunk/surefire/src/test/java/org/codehaus/surefire/suite/directory/a/JUnitTestSuite.java
    
maven/surefire/trunk/surefire/src/test/java/org/codehaus/surefire/suite/directory/b/JUnitTestSuite.java

Modified: 
maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/report/ConsoleReporter.java
URL: 
http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/report/ConsoleReporter.java?rev=345324&r1=345323&r2=345324&view=diff
==============================================================================
--- 
maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/report/ConsoleReporter.java
 (original)
+++ 
maven/surefire/trunk/surefire/src/main/java/org/codehaus/surefire/report/ConsoleReporter.java
 Thu Nov 17 12:31:24 2005
@@ -26,6 +26,8 @@
     private static final int BUFFER_SIZE = 4096;
 
     private PrintWriter writer;
+    
+    private long batteryStartTime;
 
     public ConsoleReporter()
     {
@@ -82,12 +84,14 @@
     public void batteryStarting( ReportEntry report )
         throws Exception
     {
+        batteryStartTime = System.currentTimeMillis();
+        
         writer.println( "[surefire] Running " + report.getName() );
     }
 
     public void batteryCompleted( ReportEntry report )
     {
-        long runTime = endTime - startTime;
+        long runTime = System.currentTimeMillis() - batteryStartTime;
 
         writer.print( "[surefire] Tests run: " + completedCount +
                              ", Failures: " + failures +

Modified: 
maven/surefire/trunk/surefire/src/test/java/org/codehaus/surefire/suite/directory/a/JUnitTestSuite.java
URL: 
http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/test/java/org/codehaus/surefire/suite/directory/a/JUnitTestSuite.java?rev=345324&r1=345323&r2=345324&view=diff
==============================================================================
--- 
maven/surefire/trunk/surefire/src/test/java/org/codehaus/surefire/suite/directory/a/JUnitTestSuite.java
 (original)
+++ 
maven/surefire/trunk/surefire/src/test/java/org/codehaus/surefire/suite/directory/a/JUnitTestSuite.java
 Thu Nov 17 12:31:24 2005
@@ -1,4 +1,4 @@
-package org.codehaus.surefire.battery.directory.a;
+package org.codehaus.surefire.suite.directory.a;
 
 /*
  * Copyright 2001-2005 The Codehaus.

Modified: 
maven/surefire/trunk/surefire/src/test/java/org/codehaus/surefire/suite/directory/b/JUnitTestSuite.java
URL: 
http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/src/test/java/org/codehaus/surefire/suite/directory/b/JUnitTestSuite.java?rev=345324&r1=345323&r2=345324&view=diff
==============================================================================
--- 
maven/surefire/trunk/surefire/src/test/java/org/codehaus/surefire/suite/directory/b/JUnitTestSuite.java
 (original)
+++ 
maven/surefire/trunk/surefire/src/test/java/org/codehaus/surefire/suite/directory/b/JUnitTestSuite.java
 Thu Nov 17 12:31:24 2005
@@ -1,4 +1,4 @@
-package org.codehaus.surefire.battery.directory.b;
+package org.codehaus.surefire.suite.directory.b;
 
 /*
  * Copyright 2001-2005 The Codehaus.