Return-Path: Delivered-To: apmail-maven-surefire-commits-archive@www.apache.org Received: (qmail 95921 invoked from network); 4 Dec 2007 18:09:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Dec 2007 18:09:44 -0000 Received: (qmail 75296 invoked by uid 500); 4 Dec 2007 18:09:32 -0000 Delivered-To: apmail-maven-surefire-commits-archive@maven.apache.org Received: (qmail 75276 invoked by uid 500); 4 Dec 2007 18:09:32 -0000 Mailing-List: contact surefire-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: surefire-dev@maven.apache.org Delivered-To: mailing list surefire-commits@maven.apache.org Received: (qmail 75265 invoked by uid 99); 4 Dec 2007 18:09:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2007 10:09:32 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2007 18:09:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EEA981A9832; Tue, 4 Dec 2007 10:09:22 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r601023 - in /maven/surefire/trunk: maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ surefire-api/src/main/java/org/apache/maven/surefire/report/ Date: Tue, 04 Dec 2007 18:09:20 -0000 To: surefire-commits@maven.apache.org From: dfabulich@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071204180922.EEA981A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dfabulich Date: Tue Dec 4 10:09:19 2007 New Revision: 601023 URL: http://svn.apache.org/viewvc?rev=601023&view=rev Log: [SUREFIRE-303] Report ignored/skipped tests. Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java?rev=601023&r1=601022&r2=601023&view=diff ============================================================================== --- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java (original) +++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java Tue Dec 4 10:09:19 2007 @@ -166,6 +166,10 @@ { testCase.addFailure( attributes.getValue( "message" ), attributes.getValue( "type" ) ); } + else if ( "skipped".equals( qName ) ) + { + testCase.addFailure( "skipped", "skipped" ); // TODO extract real reasons + } } catch ( ParseException e ) { Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java?rev=601023&r1=601022&r2=601023&view=diff ============================================================================== --- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java (original) +++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java Tue Dec 4 10:09:19 2007 @@ -303,6 +303,10 @@ { sinkIcon( "junit.framework", sink ); } + else if ( suite.getNumberOfSkipped() > 0 ) + { + sinkIcon( "skipped", sink ); + } else { sinkIcon( "success", sink ); @@ -647,7 +651,7 @@ { sink.figure(); - if ( type.startsWith( "junit.framework" ) ) + if ( type.startsWith( "junit.framework" ) || "skipped".equals( type ) ) { sink.figureGraphics( "images/icon_warning_sml.gif" ); } Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java?rev=601023&r1=601022&r2=601023&view=diff ============================================================================== --- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java (original) +++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java Tue Dec 4 10:09:19 2007 @@ -228,7 +228,9 @@ */ protected String getStackTrace( ReportEntry report ) { - return trimStackTrace ? report.getStackTraceWriter().writeTrimmedTraceToString() - : report.getStackTraceWriter().writeTraceToString(); + StackTraceWriter writer = report.getStackTraceWriter(); + if (writer == null) return null; + return trimStackTrace ? writer.writeTrimmedTraceToString() + : writer.writeTraceToString(); } } Modified: maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java?rev=601023&r1=601022&r2=601023&view=diff ============================================================================== --- maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java (original) +++ maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java Tue Dec 4 10:09:19 2007 @@ -174,6 +174,12 @@ writeTestProblems( report, stdOut, stdErr, "failure" ); } + + public void testSkipped( ReportEntry report ) + { + super.testSkipped( report ); + writeTestProblems( report, null, null, "skipped" ); + } private void writeTestProblems( ReportEntry report, String stdOut, String stdErr, String name ) { @@ -185,7 +191,11 @@ String stackTrace = getStackTrace( report ); - Throwable t = report.getStackTraceWriter().getThrowable(); + Throwable t = null; + if (report.getStackTraceWriter() != null) + { + t = report.getStackTraceWriter().getThrowable(); + } if ( t != null ) { @@ -207,7 +217,10 @@ } } - element.setValue( escapeAttribute(stackTrace) ); + if (stackTrace != null) + { + element.setValue( escapeAttribute(stackTrace) ); + } addOutputStreamElement( stdOut, "system-out", testCase );