stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8263659: Reflow GTestResultParser for better readability

Browse Source 
Reviewed-by: shade, iignatyev
This commit is contained in:
Alex Blewitt 2021-03-18 16:41:49 +00:00 committed by Igor Ignatyev
parent e333b6e153
commit 21db0f6768
1 changed files with 21 additions and 22 deletions

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

@ -21,6 +21,7 @@
* questions.
*/
import javax.xml.XMLConstants;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
@ -39,34 +40,32 @@ public class GTestResultParser {
public GTestResultParser(Path file) {
List<String> failedTests = new ArrayList<>();
try (Reader r = Files.newBufferedReader(file)) {
try {
XMLStreamReader xmlReader = XMLInputFactory.newInstance()
.createXMLStreamReader(r);
String testSuite = null;
String testCase = null;
while (xmlReader.hasNext()) {
switch (xmlReader.next()) {
case XMLStreamConstants.START_ELEMENT:
switch (xmlReader.getLocalName()) {
case "testsuite":
testSuite = xmlReader.getAttributeValue("", "name");
break;
case "testcase":
testCase = xmlReader.getAttributeValue("", "name");
break;
case "failure":
failedTests.add(testSuite + "::" + testCase);
default:
// ignore
}
XMLInputFactory factory = XMLInputFactory.newInstance();
factory.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "");
factory.setProperty(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
XMLStreamReader xmlReader = factory.createXMLStreamReader(r);
String testSuite = null;
String testCase = null;
while (xmlReader.hasNext()) {
int code = xmlReader.next();
if (code == XMLStreamConstants.START_ELEMENT) {
switch (xmlReader.getLocalName()) {
case "testsuite":
testSuite = xmlReader.getAttributeValue("", "name");
break;
case "testcase":
testCase = xmlReader.getAttributeValue("", "name");
break;
case "failure":
failedTests.add(testSuite + "::" + testCase);
break;
default:
// ignore
}
}
} catch (XMLStreamException e) {
throw new IllegalArgumentException("can't open parse xml " + file, e);
}
} catch (XMLStreamException e) {
throw new IllegalArgumentException("can't open parse xml " + file, e);
} catch (IOException e) {
throw new IllegalArgumentException("can't open result file " + file, e);
}