← Back to branch summary

~ubuntu-branches/ubuntu/precise/surefire/precise

« back to all changes in this revision

Viewing changes to surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java

  • Committer: Bazaar Package Importer
  • Author(s): Miguel Landaeta
  • Date: 2011-10-10 20:42:16 UTC
  • mfrom: (2.2.4 sid)
  • Revision ID: james.westby@ubuntu.com-20111010204216-cemva69wkagf4fay
Tags: 2.10-1
* Team upload.
* New upstream release.
* Refresh and remove unneccesary patches.
* Add Build-Depends on libsurefire-java and
  libmaven-common-artifact-filters-java.
* Drop outdated Maven artifact surefire-junit.
* Provide new Maven artifacts: surefire-junit3, maven-surefire-common,
  common-junit3, common-junit4, surefire-junit47 and surefire-testng-utils.
* Fix clean target to allow "two in a row" builds.
* Update Vcs-Browser field.

Show diffs side-by-side

added added

removed removed

Lines of Context:
surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractFileReporter.java
32
32
public abstract class AbstractFileReporter
33
33
    extends AbstractTextReporter
34
34
{
35
 
    private File reportsDirectory;
36
 
 
37
 
    protected AbstractFileReporter( File reportsDirectory, String format, Boolean trimStackTrace )
38
 
    {
39
 
        super( format, trimStackTrace );
40
 
 
 
35
    private final File reportsDirectory;
 
36
 
 
37
    private final boolean deleteOnStarting;
 
38
 
 
39
    private final String reportNameSuffix;
 
40
 
 
41
    AbstractFileReporter( boolean trimStackTrace, String format, File reportsDirectory )
 
42
    {
 
43
        this( trimStackTrace, format, reportsDirectory, null );
 
44
    }
 
45
    
 
46
    AbstractFileReporter( boolean trimStackTrace, String format, File reportsDirectory, String reportNameSuffix )
 
47
    {
 
48
        super( trimStackTrace, format );
41
49
        this.reportsDirectory = reportsDirectory;
 
50
        this.deleteOnStarting = false;
 
51
        this.reportNameSuffix = reportNameSuffix;
42
52
    }
43
53
 
44
54
    public void testSetStarting( ReportEntry report )
46
56
    {
47
57
        super.testSetStarting( report );
48
58
 
49
 
        File reportFile = new File( reportsDirectory, report.getName() + ".txt" );
 
59
        File reportFile = getReportFile( reportsDirectory, report.getName(), reportNameSuffix, ".txt" );
50
60
 
51
61
        File reportDir = reportFile.getParentFile();
52
62
 
 
63
        //noinspection ResultOfMethodCallIgnored
53
64
        reportDir.mkdirs();
54
65
 
 
66
        if ( deleteOnStarting && reportFile.exists() )
 
67
        {
 
68
            //noinspection ResultOfMethodCallIgnored
 
69
            reportFile.delete();
 
70
        }
 
71
 
55
72
        try
56
73
        {
57
74
            PrintWriter writer = new PrintWriter( new FileWriter( reportFile ) );
70
87
        }
71
88
    }
72
89
 
 
90
    public static File getReportFile( File reportsDirectory, String reportEntryName, 
 
91
            String reportNameSuffix, String fileExtension )
 
92
    {
 
93
        File reportFile;
 
94
 
 
95
        if ( reportNameSuffix != null && reportNameSuffix.length() > 0)
 
96
        {
 
97
            reportFile = new File( reportsDirectory, reportEntryName + "-" + reportNameSuffix + fileExtension );
 
98
        }
 
99
        else
 
100
        {
 
101
            reportFile = new File( reportsDirectory, reportEntryName + fileExtension );
 
102
        }
 
103
        return reportFile;
 
104
    }
 
105
 
73
106
    public void testSetCompleted( ReportEntry report )
74
107
        throws ReporterException
75
108
    {