← Back to branch summary

~ubuntu-branches/ubuntu/precise/jenkins/precise-updates

« back to all changes in this revision

Viewing changes to core/src/main/java/hudson/tasks/junit/SuiteResult.java

  • Committer: Package Import Robot
  • Author(s): James Page, Miguel Landaeta, James Page
  • Date: 2012-01-31 10:33:56 UTC
  • mfrom: (1.1.4) (5.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20120131103356-kg3w0k3s5dfdnsw8
Tags: 1.424.2+dfsg-1
http://bugs.debian.org/655906
[ Miguel Landaeta ]
* Replace dependencies on Spring Framework 2.5 libraries with 3.0 ones.
  (Closes: #655906).

[ James Page ]
* New upstream release.
  - d/control: Add new dependencies on libjenkins-remoting-java, 
    libstapler-adjunct-codemirror-java and libmaven-hpi-plugin-java.
  - d/control: Dropped libjcaptcha-java; no longer needed.
* d/control: Switch to using packaged animal-sniffer.
* Refreshed patches:
  - d/patches/build/{debianize-antrun-war,animal-sniffer-annotation}.patch:
    dropped as no longer required.

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/src/main/java/hudson/tasks/junit/SuiteResult.java
25
25
 
26
26
import hudson.tasks.test.TestObject;
27
27
import hudson.util.IOException2;
 
28
import hudson.util.io.ParserConfigurator;
28
29
import org.apache.commons.io.FileUtils;
29
30
import org.dom4j.Document;
30
31
import org.dom4j.DocumentException;
85
86
    }
86
87
 
87
88
    /**
 
89
     * Passed to {@link ParserConfigurator}.
 
90
     * @since 1.416
 
91
     */
 
92
    public static class SuiteResultParserConfigurationContext {
 
93
        public final File xmlReport;
 
94
 
 
95
        SuiteResultParserConfigurationContext(File xmlReport) {
 
96
            this.xmlReport = xmlReport;
 
97
        }
 
98
    }
 
99
 
 
100
    /**
88
101
     * Parses the JUnit XML file into {@link SuiteResult}s.
89
102
     * This method returns a collection, as a single XML may have multiple <testsuite>
90
103
     * elements wrapped into the top-level <testsuites>.
91
104
     */
92
 
    static List<SuiteResult> parse(File xmlReport, boolean keepLongStdio) throws DocumentException, IOException {
 
105
    static List<SuiteResult> parse(File xmlReport, boolean keepLongStdio) throws DocumentException, IOException, InterruptedException {
93
106
        List<SuiteResult> r = new ArrayList<SuiteResult>();
94
107
 
95
108
        // parse into DOM
96
109
        SAXReader saxReader = new SAXReader();
97
 
        // install EntityResolver for resolving DTDs, which are in files created by TestNG.
98
 
        // (see https://hudson.dev.java.net/servlets/ReadMsg?listName=users&msgNo=5530)
99
 
        XMLEntityResolver resolver = new XMLEntityResolver();
100
 
        saxReader.setEntityResolver(resolver);
 
110
        ParserConfigurator.applyConfiguration(saxReader,new SuiteResultParserConfigurationContext(xmlReport));
 
111
 
101
112
        Document result = saxReader.read(xmlReport);
102
113
        Element root = result.getRootElement();
103
114