← Back to branch summary

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

« back to all changes in this revision

Viewing changes to maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.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:
maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
24
24
import java.text.NumberFormat;
25
25
import java.util.ArrayList;
26
26
import java.util.Collection;
 
27
import java.util.Collections;
27
28
import java.util.HashMap;
28
29
import java.util.List;
29
30
import java.util.ListIterator;
37
38
import org.codehaus.plexus.util.StringUtils;
38
39
import org.xml.sax.SAXException;
39
40
 
 
41
/**
 
42
 * @version $Id: SurefireReportParser.java 1074755 2011-02-26 00:12:21Z hboutemy $
 
43
 */
40
44
public class SurefireReportParser
41
45
{
42
46
    private NumberFormat numberFormat = NumberFormat.getInstance();
43
47
 
44
 
    private File[] reportsDirectories;
45
 
 
46
 
    private List testSuites = new ArrayList();
47
 
 
48
 
    private Locale locale;
 
48
    private List reportsDirectories;
 
49
 
 
50
    private final List testSuites = new ArrayList();
49
51
 
50
52
    private static final int PCENT = 100;
51
53
 
53
55
    {
54
56
    }
55
57
 
56
 
    public SurefireReportParser( File[] reportsDirectories, Locale locale )
 
58
    public SurefireReportParser( List reportsDirectoriesFiles , Locale locale )
57
59
    {
58
 
        this.reportsDirectories = reportsDirectories;
 
60
        this.reportsDirectories = reportsDirectoriesFiles;
59
61
 
60
62
        setLocale( locale );
61
63
    }
64
66
        throws MavenReportException
65
67
    {
66
68
        List xmlReportFileList = new ArrayList();
67
 
        for ( int i = 0; i < reportsDirectories.length; i++ )
 
69
        for ( int i = 0; i < reportsDirectories.size(); i++ )
68
70
        {
69
 
            File reportsDirectory = reportsDirectories[i];
70
 
            if ( !reportsDirectory.exists() ) continue;
71
 
            String[] xmlReportFiles = getIncludedFiles( reportsDirectory, "*.xml", "*.txt, testng-failed.xml, testng-failures.xml, testng-results.xml" );
 
71
            File reportsDirectory = (File) reportsDirectories.get( i );
 
72
            if ( !reportsDirectory.exists() )
 
73
            {
 
74
                continue;
 
75
            }
 
76
            String[] xmlReportFiles =
 
77
                getIncludedFiles( reportsDirectory, "*.xml",
 
78
                                  "*.txt, testng-failed.xml, testng-failures.xml, testng-results.xml" );
72
79
            for ( int j = 0; j < xmlReportFiles.length; j++ )
73
80
            {
74
81
                File xmlReport = new File( reportsDirectory, xmlReportFiles[j] );
171
178
 
172
179
    public void setReportsDirectory( File reportsDirectory )
173
180
    {
174
 
        this.reportsDirectories = new File[] { reportsDirectory };
175
 
    }
176
 
    
177
 
    public void setReportsDirectories( File[] reportsDirectories )
178
 
    {
179
 
        this.reportsDirectories = reportsDirectories;
180
 
    }
181
 
 
182
 
    public File[] getReportsDirectories()
183
 
    {
184
 
        return this.reportsDirectories;
 
181
        this.reportsDirectories = Collections.singletonList( reportsDirectory );
185
182
    }
186
183
 
187
184
    public final void setLocale( Locale locale )
188
185
    {
189
 
        this.locale = locale;
190
186
        numberFormat = NumberFormat.getInstance( locale );
191
187
    }
192
188
 
193
 
    public Locale getLocale()
194
 
    {
195
 
        return this.locale;
196
 
    }
197
 
 
198
 
    public void setNumberFormat( NumberFormat numberFormat )
199
 
    {
200
 
        this.numberFormat = numberFormat;
201
 
    }
202
 
 
203
189
    public NumberFormat getNumberFormat()
204
190
    {
205
191
        return this.numberFormat;