You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by fg...@apache.org on 2006/09/03 11:17:01 UTC
svn commit: r439746 - in
/maven/plugins/trunk/maven-surefire-report-plugin/src:
main/java/org/apache/maven/plugins/surefire/report/ main/resources/
test/java/org/apache/maven/plugins/surefire/report/
Author: fgiust
Date: Sun Sep 3 02:17:00 2006
New Revision: 439746
URL: http://svn.apache.org/viewvc?rev=439746&view=rev
Log:
MSUREFIREREP-27
add number of skipped test in html report
Modified:
maven/plugins/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java
maven/plugins/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
maven/plugins/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
maven/plugins/trunk/maven-surefire-report-plugin/src/main/resources/surefire-report.properties
maven/plugins/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java
maven/plugins/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java
Modified: maven/plugins/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java?rev=439746&r1=439745&r2=439746&view=diff
==============================================================================
--- maven/plugins/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java (original)
+++ maven/plugins/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java Sun Sep 3 02:17:00 2006
@@ -41,6 +41,8 @@
private int numberOfErrors;
private int numberOfFailures;
+
+ private int numberOfSkipped;
private int numberOfTests;
@@ -71,6 +73,18 @@
saxParser.parse( new File( xmlPath ), this );
}
+
+ private int getAttributeAsInt( Attributes attributes, String name )
+ {
+ // may or may not exist
+ String valueAsString = attributes.getValue( name );
+ if ( valueAsString != null )
+ {
+ return Integer.parseInt( valueAsString );
+ }
+ return 0;
+ }
+
public void startElement( String uri, String localName, String qName, Attributes attributes )
throws SAXException
{
@@ -78,11 +92,10 @@
{
if ( "testsuite".equals( qName ) )
{
- numberOfErrors = Integer.parseInt( attributes.getValue( "errors" ) );
-
- numberOfFailures = Integer.parseInt( attributes.getValue( "failures" ) );
-
- numberOfTests = Integer.parseInt( attributes.getValue( "tests" ) );
+ numberOfErrors = getAttributeAsInt( attributes, "errors" );
+ numberOfFailures = getAttributeAsInt( attributes, "failures" );
+ numberOfSkipped = getAttributeAsInt( attributes, "skipped" );
+ numberOfTests = getAttributeAsInt( attributes, "tests" );
Number time = numberFormat.parse( attributes.getValue( "time" ) );
@@ -212,6 +225,16 @@
public void setNumberOfFailures( int numberOfFailures )
{
this.numberOfFailures = numberOfFailures;
+ }
+
+ public int getNumberOfSkipped()
+ {
+ return numberOfSkipped;
+ }
+
+ public void setNumberOfSkipped( int numberOfSkipped )
+ {
+ this.numberOfSkipped = numberOfSkipped;
}
public int getNumberOfTests()
Modified: maven/plugins/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java?rev=439746&r1=439745&r2=439746&view=diff
==============================================================================
--- maven/plugins/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java (original)
+++ maven/plugins/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java Sun Sep 3 02:17:00 2006
@@ -134,6 +134,8 @@
sinkHeader( sink, bundle.getString( "report.surefire.label.errors" ) );
sinkHeader( sink, bundle.getString( "report.surefire.label.failures" ) );
+
+ sinkHeader( sink, bundle.getString( "report.surefire.label.skipped" ) );
sinkHeader( sink, bundle.getString( "report.surefire.label.successrate" ) );
@@ -149,6 +151,8 @@
sinkCell( sink, (String) summary.get( "totalFailures" ) );
+ sinkCell( sink, (String) summary.get( "totalSkipped" ) );
+
sinkCell( sink, summary.get( "totalPercentage" ) + "%" );
sinkCell( sink, (String) summary.get( "totalElapsedTime" ) );
@@ -192,6 +196,8 @@
sinkHeader( sink, bundle.getString( "report.surefire.label.failures" ) );
+ sinkHeader( sink, bundle.getString( "report.surefire.label.skipped" ) );
+
sinkHeader( sink, bundle.getString( "report.surefire.label.successrate" ) );
sinkHeader( sink, bundle.getString( "report.surefire.label.time" ) );
@@ -218,6 +224,8 @@
sinkCell( sink, (String) packageSummary.get( "totalFailures" ) );
+ sinkCell( sink, (String) packageSummary.get( "totalSkipped" ) );
+
sinkCell( sink, packageSummary.get( "totalPercentage" ) + "%" );
sinkCell( sink, (String) packageSummary.get( "totalElapsedTime" ) );
@@ -263,6 +271,8 @@
sinkHeader( sink, bundle.getString( "report.surefire.label.failures" ) );
+ sinkHeader( sink, bundle.getString( "report.surefire.label.skipped" ) );
+
sinkHeader( sink, bundle.getString( "report.surefire.label.successrate" ) );
sinkHeader( sink, bundle.getString( "report.surefire.label.time" ) );
@@ -307,8 +317,11 @@
sinkCell( sink, Integer.toString( suite.getNumberOfFailures() ) );
+ sinkCell( sink, Integer.toString( suite.getNumberOfSkipped() ) );
+
String percentage = report.computePercentage( suite.getNumberOfTests(), suite.getNumberOfErrors(),
- suite.getNumberOfFailures() );
+ suite.getNumberOfFailures(), suite
+ .getNumberOfSkipped() );
sinkCell( sink, percentage + "%" );
sinkCell( sink, numberFormat.format( suite.getTimeElapsed() ) );
Modified: maven/plugins/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java?rev=439746&r1=439745&r2=439746&view=diff
==============================================================================
--- maven/plugins/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java (original)
+++ maven/plugins/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java Sun Sep 3 02:17:00 2006
@@ -119,6 +119,8 @@
int totalNumberOfFailures = 0;
+ int totalNumberOfSkipped = 0;
+
float totalElapsedTime = 0.0f;
while ( iter.hasNext() )
@@ -131,10 +133,13 @@
totalNumberOfFailures += suite.getNumberOfFailures();
+ totalNumberOfSkipped += suite.getNumberOfSkipped();
+
totalElapsedTime += suite.getTimeElapsed();
}
- String totalPercentage = computePercentage( totalNumberOfTests, totalNumberOfErrors, totalNumberOfFailures );
+ String totalPercentage = computePercentage( totalNumberOfTests, totalNumberOfErrors, totalNumberOfFailures,
+ totalNumberOfSkipped );
totalSummary.put( "totalTests", Integer.toString( totalNumberOfTests ) );
@@ -142,6 +147,8 @@
totalSummary.put( "totalFailures", Integer.toString( totalNumberOfFailures ) );
+ totalSummary.put( "totalSkipped", Integer.toString( totalNumberOfSkipped ) );
+
totalSummary.put( "totalElapsedTime", numberFormat.format( totalElapsedTime ) );
totalSummary.put( "totalPercentage", totalPercentage );
@@ -205,7 +212,7 @@
return suitePackage;
}
- public String computePercentage( int tests, int errors, int failures )
+ public String computePercentage( int tests, int errors, int failures, int skipped )
{
float percentage;
if ( tests == 0 )
@@ -214,7 +221,7 @@
}
else
{
- percentage = ( (float) ( tests - errors - failures ) / (float) tests ) * PCENT;
+ percentage = ( (float) ( tests - errors - failures - skipped ) / (float) tests ) * PCENT;
}
return numberFormat.format( percentage );
Modified: maven/plugins/trunk/maven-surefire-report-plugin/src/main/resources/surefire-report.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-surefire-report-plugin/src/main/resources/surefire-report.properties?rev=439746&r1=439745&r2=439746&view=diff
==============================================================================
--- maven/plugins/trunk/maven-surefire-report-plugin/src/main/resources/surefire-report.properties (original)
+++ maven/plugins/trunk/maven-surefire-report-plugin/src/main/resources/surefire-report.properties Sun Sep 3 02:17:00 2006
@@ -5,6 +5,7 @@
report.surefire.label.tests=Tests
report.surefire.label.errors=Errors
report.surefire.label.failures=Failures
+report.surefire.label.skipped=Skipped
report.surefire.label.successrate=Success Rate
report.surefire.label.time=Time
report.surefire.label.packagelist=Package List
Modified: maven/plugins/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java?rev=439746&r1=439745&r2=439746&view=diff
==============================================================================
--- maven/plugins/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java (original)
+++ maven/plugins/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java Sun Sep 3 02:17:00 2006
@@ -61,6 +61,13 @@
assertEquals( 10, tSuite.getNumberOfFailures() );
}
+ public void testSetNumberOfSkipped()
+ {
+ tSuite.setNumberOfSkipped( 5 );
+
+ assertEquals( 5, tSuite.getNumberOfSkipped() );
+ }
+
public void testSetNumberOfTests()
{
tSuite.setNumberOfTests( 11 );
Modified: maven/plugins/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java?rev=439746&r1=439745&r2=439746&view=diff
==============================================================================
--- maven/plugins/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java (original)
+++ maven/plugins/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java Sun Sep 3 02:17:00 2006
@@ -87,6 +87,8 @@
tSuite1.setNumberOfFailures( 20 );
+ tSuite1.setNumberOfSkipped( 2 );
+
tSuite1.setTimeElapsed( 1.0f );
tSuite1.setNumberOfTests( 100 );
@@ -94,6 +96,8 @@
tSuite2.setNumberOfErrors( 10 );
tSuite2.setNumberOfFailures( 20 );
+
+ tSuite2.setNumberOfSkipped( 2 );
tSuite2.setTimeElapsed( 1.0f );
@@ -113,12 +117,14 @@
assertEquals( 200, Integer.parseInt( testMap.get( "totalTests" ).toString() ) );
+ assertEquals( 4, Integer.parseInt( testMap.get( "totalSkipped" ).toString() ) );
+
NumberFormat numberFormat = report.getNumberFormat();
assertEquals( 2.0f, numberFormat.parse( testMap.get( "totalElapsedTime" ).toString() )
.floatValue(), 0.0f );
- assertEquals( 70.00f, numberFormat.parse( (String) testMap.get( "totalPercentage" ) )
+ assertEquals( 68.00f, numberFormat.parse( (String) testMap.get( "totalPercentage" ) )
.floatValue(), 0 );
}
@@ -167,7 +173,7 @@
{
NumberFormat numberFormat = report.getNumberFormat();
- assertEquals( 70.00f, numberFormat.parse( report.computePercentage( 100, 20, 10 ) )
+ assertEquals( 70.00f, numberFormat.parse( report.computePercentage( 100, 20, 10, 0 ) )
.floatValue(), 0 );
}