You are viewing a plain text version of this content. The canonical link for it is here.
Posted to surefire-commits@maven.apache.org by br...@apache.org on 2006/03/01 05:43:15 UTC
svn commit: r381901 -
/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/
Author: brett
Date: Tue Feb 28 20:43:13 2006
New Revision: 381901
URL: http://svn.apache.org/viewcvs?rev=381901&view=rev
Log:
remove duplicate code in reports
Modified:
maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java
maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java
maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java
maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java
maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ForkingSummaryConsoleReporter.java
maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/SummaryConsoleReporter.java
maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/TestNGReporter.java
maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java?rev=381901&r1=381900&r2=381901&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/AbstractConsoleReporter.java Tue Feb 28 20:43:13 2006
@@ -39,14 +39,6 @@
writer = new PrintWriter( new OutputStreamWriter( new BufferedOutputStream( System.out, BUFFER_SIZE ) ) );
}
- public void batteryStarting( ReportEntry report )
- {
- batteryStartTime = System.currentTimeMillis();
-
- writer.println( "[surefire] Running " + report.getName() );
- writer.flush();
- }
-
public void writeMessage( String message )
{
writer.println( message );
@@ -59,6 +51,14 @@
writer.println( "-------------------------------------------------------" );
writer.println( " T E S T S" );
writer.println( "-------------------------------------------------------" );
+ writer.flush();
+ }
+
+ public void batteryStarting( ReportEntry report )
+ {
+ batteryStartTime = System.currentTimeMillis();
+
+ writer.println( "[surefire] Running " + report.getName() );
writer.flush();
}
Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java?rev=381901&r1=381900&r2=381901&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/BriefConsoleReporter.java Tue Feb 28 20:43:13 2006
@@ -56,6 +56,7 @@
{
super.testError( report, stdOut, stdErr );
+ reportContent.append( "[surefire] " );
appendOutput( report, "ERROR" );
}
@@ -63,12 +64,13 @@
{
super.testFailed( report, stdOut, stdErr );
+ reportContent.append( "[surefire] " );
appendOutput( report, "FAILURE" );
}
private void appendOutput( ReportEntry report, String msg )
{
- reportContent.append( "[surefire] " ).append( report.getName() );
+ reportContent.append( report.getName() );
long runTime = this.endTime - this.startTime;
@@ -86,11 +88,6 @@
failures = 0;
completedCount = 0;
- }
-
- private void writeTimeElapsed( long sec )
- {
- reportContent.append( " Time elapsed: " ).append( elapsedTimeAsString( sec ) ).append( " sec" );
}
/**
Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java?rev=381901&r1=381900&r2=381901&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java Tue Feb 28 20:43:13 2006
@@ -86,32 +86,25 @@
{
super.testError( report, stdOut, stdErr );
- reportContent.append( report.getName() );
-
- long runTime = this.endTime - this.startTime;
-
- writeTimeElapsed( runTime );
-
- reportContent.append( " <<< ERROR!" ).append( NL );
-
- writeStdLogs( stdOut, stdErr );
-
- reportContent.append( getStackTrace( report ) ).append( NL );
+ appendOutput( report, "ERROR" );
}
public void testFailed( ReportEntry report, String stdOut, String stdErr )
{
super.testFailed( report, stdOut, stdErr );
+ appendOutput( report, "FAILURE" );
+ }
+
+ private void appendOutput( ReportEntry report, String msg )
+ {
reportContent.append( report.getName() );
long runTime = this.endTime - this.startTime;
- writeTimeElapsed( runTime );
-
- reportContent.append( " <<< FAILURE!" ).append( NL );
+ reportContent.append( " Time elapsed: " ).append( elapsedTimeAsString( runTime ) ).append( " sec" );
- writeStdLogs( stdOut, stdErr );
+ reportContent.append( " <<< " ).append( msg ).append( "!" ).append( NL );
reportContent.append( getStackTrace( report ) ).append( NL );
}
Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java?rev=381901&r1=381900&r2=381901&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ConsoleReporter.java Tue Feb 28 20:43:13 2006
@@ -31,7 +31,7 @@
if ( failures > 0 || errors > 0 )
{
- batterySummary.append( " <<<<<<<< FAILURE !! " );
+ batterySummary.append( " <<< FAILURE! " );
}
writer.println( batterySummary );
@@ -47,17 +47,17 @@
public void runAborted( ReportEntry report )
{
- writer.println( "RUN ABORTED" );
- writer.println( report.getSource().getClass().getName() );
- writer.println( report.getName() );
- writer.println( report.getMessage() );
- writer.println( report.getThrowable().getMessage() );
- writer.flush();
+ printAbortionError( "RUN ABORTED", report );
}
public void batteryAborted( ReportEntry report )
{
- writer.println( "BATTERY ABORTED" );
+ printAbortionError( "BATTERY ABORTED", report );
+ }
+
+ private void printAbortionError( String msg, ReportEntry report )
+ {
+ writer.println( msg );
writer.println( report.getSource().getClass().getName() );
writer.println( report.getName() );
writer.println( report.getMessage() );
Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java?rev=381901&r1=381900&r2=381901&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/DetailedConsoleReporter.java Tue Feb 28 20:43:13 2006
@@ -16,75 +16,30 @@
* limitations under the License.
*/
-import java.io.BufferedOutputStream;
-import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.StringWriter;
/**
* Detailed console reporter.
- * <p/>
- * TODO: this seems to have a lot in common with other console reporters. Check CPD.
*
* @author <a href="mailto:jruiz@exist.com">Johnny R. Ruiz III</a>
* @version $Id$
*/
public class DetailedConsoleReporter
- extends AbstractReporter
+ extends AbstractConsoleReporter
{
- private static final int BUFFER_SIZE = 4096;
-
- private PrintWriter writer;
-
private StringBuffer reportContent;
- private long batteryStartTime;
-
- public DetailedConsoleReporter()
- {
- writer = new PrintWriter( new OutputStreamWriter( new BufferedOutputStream( System.out, BUFFER_SIZE ) ) );
- }
-
- public void writeMessage( String message )
- {
- writer.println( message );
- writer.flush();
- }
-
- public void runStarting( int testCount )
- {
- writer.println();
- writer.println( "-------------------------------------------------------" );
- writer.println( " T E S T S" );
- writer.println( "-------------------------------------------------------" );
- writer.flush();
- }
-
public void batteryStarting( ReportEntry report )
{
- batteryStartTime = System.currentTimeMillis();
+ super.batteryStarting( report );
reportContent = new StringBuffer();
-
- writer.println( "[surefire] Running " + report.getName() );
- writer.flush();
}
public void batteryCompleted( ReportEntry report )
{
- long runTime = System.currentTimeMillis() - batteryStartTime;
-
- StringBuffer batterySummary = new StringBuffer();
-
- batterySummary.append( "[surefire] Tests run: " );
- batterySummary.append( completedCount );
- batterySummary.append( ", Failures: " );
- batterySummary.append( failures );
- batterySummary.append( ", Errors: " );
- batterySummary.append( errors );
- batterySummary.append( ", Time elapsed: " );
- batterySummary.append( elapsedTimeAsString( runTime ) );
- batterySummary.append( " sec" );
+ StringBuffer batterySummary = getBatterySummary();
batterySummary.append( NL );
batterySummary.append( "[surefire] " ).append( NL );
@@ -108,7 +63,7 @@
long runTime = this.endTime - this.startTime;
- writeTimeElapsed( runTime );
+ reportContent.append( " Time elapsed: " ).append( elapsedTimeAsString( runTime ) ).append( " sec" );
reportContent.append( NL );
}
@@ -117,24 +72,25 @@
{
super.testError( report, stdOut, stdErr );
- long runTime = this.endTime - this.startTime;
-
- writeTimeElapsed( runTime );
-
- reportContent.append( " <<< ERROR!" ).append( NL );
-
- reportContent.append( getStackTrace( report ) ).append( NL );
+ appendOutput( report, "ERROR" );
}
public void testFailed( ReportEntry report, String stdOut, String stdErr )
{
super.testFailed( report, stdOut, stdErr );
+ appendOutput( report, "FAILURE" );
+ }
+
+ private void appendOutput( ReportEntry report, String msg )
+ {
+ reportContent.append( report.getName() );
+
long runTime = this.endTime - this.startTime;
- writeTimeElapsed( runTime );
+ reportContent.append( " Time elapsed: " ).append( elapsedTimeAsString( runTime ) ).append( " sec" );
- reportContent.append( " <<< FAILURE!" ).append( NL );
+ reportContent.append( " <<< " ).append( msg ).append( "!" ).append( NL );
reportContent.append( getStackTrace( report ) ).append( NL );
}
@@ -146,11 +102,6 @@
failures = 0;
completedCount = 0;
- }
-
- private void writeTimeElapsed( long sec )
- {
- reportContent.append( " Time elapsed: " ).append( elapsedTimeAsString( sec ) ).append( " sec" );
}
/**
Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ForkingSummaryConsoleReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ForkingSummaryConsoleReporter.java?rev=381901&r1=381900&r2=381901&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ForkingSummaryConsoleReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ForkingSummaryConsoleReporter.java Tue Feb 28 20:43:13 2006
@@ -33,7 +33,7 @@
{
if ( failures > 0 || errors > 0 )
{
- println( "[surefire] " + report.getName() + " <<<<<<<< FAILURE !! " );
+ println( "[surefire] " + report.getName() + " <<< FAILURE! " );
}
completedCount = 0;
Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ReportEntry.java?rev=381901&r1=381900&r2=381901&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ReportEntry.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/ReportEntry.java Tue Feb 28 20:43:13 2006
@@ -35,26 +35,7 @@
public ReportEntry( Object source, String name, String group, String message )
{
- if ( source == null )
- {
- throw new NullPointerException( "source is null" );
- }
- if ( name == null )
- {
- throw new NullPointerException( "name is null" );
- }
- if ( message == null )
- {
- throw new NullPointerException( "message is null" );
- }
-
- this.source = source;
-
- this.name = name;
-
- this.group = group;
-
- this.message = message;
+ this( source, name, group, message, null );
}
public ReportEntry( Object source, String name, String message, Throwable throwable )
@@ -75,10 +56,6 @@
if ( message == null )
{
throw new NullPointerException( "message is null" );
- }
- if ( throwable == null )
- {
- throw new NullPointerException( "throwable is null" );
}
this.source = source;
Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/SummaryConsoleReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/SummaryConsoleReporter.java?rev=381901&r1=381900&r2=381901&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/SummaryConsoleReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/SummaryConsoleReporter.java Tue Feb 28 20:43:13 2006
@@ -33,7 +33,7 @@
{
if ( failures > 0 || errors > 0 )
{
- writeMessage( "[surefire] " + report.getName() + " <<<<<<<< FAILURE !! " );
+ writeMessage( "[surefire] " + report.getName() + " <<< FAILURE! " );
}
completedCount = 0;
Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/TestNGReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/TestNGReporter.java?rev=381901&r1=381900&r2=381901&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/TestNGReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/TestNGReporter.java Tue Feb 28 20:43:13 2006
@@ -94,11 +94,7 @@
*/
public void onTestSuccess( ITestResult result )
{
- String rawString = Surefire.getResources().getString( "testSuccessful" );
-
- ReportEntry report = new ReportEntry( surefire, result.getName(), rawString );
-
- reportManager.testSucceeded( report );
+ reportManager.testSucceeded( createReport( result, "testSuccessful" ) );
}
/* (non-Javadoc)
@@ -121,11 +117,13 @@
*/
public void onTestSkipped( ITestResult result )
{
- String rawString = Surefire.getResources().getString( "testSkipped" );
-
- ReportEntry report = new ReportEntry( surefire, result.getName(), rawString );
+ // TODO: is this correct?
+ reportManager.testSucceeded( createReport( result, "testSkipped" ) );
+ }
- reportManager.testSucceeded( report );
+ private ReportEntry createReport( ITestResult result, String key )
+ {
+ return new ReportEntry( surefire, result.getName(), Surefire.getResources().getString( key ) );
}
/* (non-Javadoc)
Modified: maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/XMLReporter.java?rev=381901&r1=381900&r2=381901&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/XMLReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire/src/main/java/org/apache/maven/surefire/report/XMLReporter.java Tue Feb 28 20:43:13 2006
@@ -185,19 +185,21 @@
element.setValue( stackTrace );
- if ( stdOut != null && stdOut.trim().length() > 0 )
- {
- createElement( testCase, "system-out" ).setValue( stdOut );
- }
+ addOutputStreamElement( stdOut, "system-out" );
- if ( stdErr != null && stdErr.trim().length() > 0 )
- {
- createElement( testCase, "system-err" ).setValue( stdErr );
- }
+ addOutputStreamElement( stdErr, "system-err" );
long runTime = endTime - startTime;
testCase.setAttribute( "time", elapsedTimeAsString( runTime ) );
+ }
+
+ private void addOutputStreamElement( String stdOut, String name )
+ {
+ if ( stdOut != null && stdOut.trim().length() > 0 )
+ {
+ createElement( testCase, name ).setValue( stdOut );
+ }
}
public void dispose()