Skip to content

Commit 21db0f6

Browse files
alblueiignatev
authored andcommittedMar 18, 2021
8263659: Reflow GTestResultParser for better readability
Reviewed-by: shade, iignatyev
1 parent e333b6e commit 21db0f6

File tree

1 file changed

+21
-22
lines changed

1 file changed

+21
-22
lines changed
 

‎test/hotspot/jtreg/gtest/GTestResultParser.java

+21-22
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
* questions.
2222
*/
2323

24+
import javax.xml.XMLConstants;
2425
import javax.xml.stream.XMLInputFactory;
2526
import javax.xml.stream.XMLStreamConstants;
2627
import javax.xml.stream.XMLStreamException;
@@ -39,34 +40,32 @@ public class GTestResultParser {
3940
public GTestResultParser(Path file) {
4041
List<String> failedTests = new ArrayList<>();
4142
try (Reader r = Files.newBufferedReader(file)) {
42-
try {
43-
XMLStreamReader xmlReader = XMLInputFactory.newInstance()
44-
.createXMLStreamReader(r);
45-
String testSuite = null;
46-
String testCase = null;
47-
while (xmlReader.hasNext()) {
48-
switch (xmlReader.next()) {
49-
case XMLStreamConstants.START_ELEMENT:
50-
switch (xmlReader.getLocalName()) {
51-
case "testsuite":
52-
testSuite = xmlReader.getAttributeValue("", "name");
53-
break;
54-
case "testcase":
55-
testCase = xmlReader.getAttributeValue("", "name");
56-
break;
57-
case "failure":
58-
failedTests.add(testSuite + "::" + testCase);
59-
default:
60-
// ignore
61-
}
43+
XMLInputFactory factory = XMLInputFactory.newInstance();
44+
factory.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "");
45+
factory.setProperty(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
46+
XMLStreamReader xmlReader = factory.createXMLStreamReader(r);
47+
String testSuite = null;
48+
String testCase = null;
49+
while (xmlReader.hasNext()) {
50+
int code = xmlReader.next();
51+
if (code == XMLStreamConstants.START_ELEMENT) {
52+
switch (xmlReader.getLocalName()) {
53+
case "testsuite":
54+
testSuite = xmlReader.getAttributeValue("", "name");
55+
break;
56+
case "testcase":
57+
testCase = xmlReader.getAttributeValue("", "name");
58+
break;
59+
case "failure":
60+
failedTests.add(testSuite + "::" + testCase);
6261
break;
6362
default:
6463
// ignore
6564
}
6665
}
67-
} catch (XMLStreamException e) {
68-
throw new IllegalArgumentException("can't open parse xml " + file, e);
6966
}
67+
} catch (XMLStreamException e) {
68+
throw new IllegalArgumentException("can't open parse xml " + file, e);
7069
} catch (IOException e) {
7170
throw new IllegalArgumentException("can't open result file " + file, e);
7271
}

0 commit comments

Comments
 (0)
Please sign in to comment.