You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/01/02 16:22:17 UTC
git commit: o Rearranged try/catch and renamed a method
Updated Branches:
refs/heads/master 06415dee0 -> 12b7012a3
o Rearranged try/catch and renamed a method
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/12b7012a
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/12b7012a
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/12b7012a
Branch: refs/heads/master
Commit: 12b7012a334509b2ae6eb3662fb243375edc6d7c
Parents: 06415de
Author: Kristian Rosenvold <kr...@apache.org>
Authored: Wed Jan 2 16:21:59 2013 +0100
Committer: Kristian Rosenvold <kr...@apache.org>
Committed: Wed Jan 2 16:21:59 2013 +0100
----------------------------------------------------------------------
.../surefire/report/StatelessXmlReporter.java | 51 +++++++--------
1 files changed, 23 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/12b7012a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
index 57778bb..ec150b6 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
@@ -65,7 +65,6 @@ import org.apache.maven.surefire.report.SafeThrowable;
*/
public class StatelessXmlReporter
{
- private static final String LS = System.getProperty( "line.separator" );
private final File reportsDirectory;
@@ -84,37 +83,32 @@ public class StatelessXmlReporter
throws ReporterException
{
- FileWriter fw = getFileOutputStream( testSetReportEntry );
-
- org.apache.maven.shared.utils.xml.XMLWriter ppw =
- new org.apache.maven.shared.utils.xml.PrettyPrintXMLWriter( fw );
- ppw.setEncoding( "UTF-8" );
-
- createTestSuiteElement( ppw, testSetReportEntry, testSetStats, reportNameSuffix );
-
- showProperties( ppw );
-
-
- for ( WrappedReportEntry entry : testSetStats.getReportEntries() )
+ FileWriter fw = getFileWriter( testSetReportEntry );
+ try
{
- if ( ReportEntryType.success.equals( entry.getReportEntryType() ) )
- {
- startTestElement( ppw, entry, reportNameSuffix );
- ppw.endElement();
- }
- else
- {
- getTestProblems( ppw, entry, trimStackTrace, reportNameSuffix );
- }
- }
+ org.apache.maven.shared.utils.xml.XMLWriter ppw =
+ new org.apache.maven.shared.utils.xml.PrettyPrintXMLWriter( fw );
+ ppw.setEncoding( "UTF-8" );
- ppw.endElement(); // TestSuite
+ createTestSuiteElement( ppw, testSetReportEntry, testSetStats, reportNameSuffix );
+ showProperties( ppw );
+ for ( WrappedReportEntry entry : testSetStats.getReportEntries() )
+ {
+ if ( ReportEntryType.success.equals( entry.getReportEntryType() ) )
+ {
+ startTestElement( ppw, entry, reportNameSuffix );
+ ppw.endElement();
+ }
+ else
+ {
+ getTestProblems( ppw, entry, trimStackTrace, reportNameSuffix );
+ }
- try
- {
+ }
+ ppw.endElement(); // TestSuite
}
finally
@@ -123,7 +117,7 @@ public class StatelessXmlReporter
}
}
- private FileWriter getFileOutputStream( WrappedReportEntry testSetReportEntry )
+ private FileWriter getFileWriter( WrappedReportEntry testSetReportEntry )
{
File reportFile = getReportFile( testSetReportEntry, reportsDirectory, reportNameSuffix );
@@ -205,7 +199,8 @@ public class StatelessXmlReporter
}
- private void getTestProblems( XMLWriter ppw, WrappedReportEntry report, boolean trimStackTrace, String reportNameSuffix )
+ private void getTestProblems( XMLWriter ppw, WrappedReportEntry report, boolean trimStackTrace,
+ String reportNameSuffix )
{
startTestElement( ppw, report, reportNameSuffix );