Bug 531057- JUnit 5 support for tests
Adjust results generator for the change in ant junitlauncher from errors
to aborted element in xml.
Change-Id: Ifb7af115fa14e836b4aaad73d261dcc8a0dd23bf
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.build.tools/src/org/eclipse/releng/generators/TestResultsGenerator.java b/bundles/org.eclipse.build.tools/src/org/eclipse/releng/generators/TestResultsGenerator.java
index 88f7d3f..bd4dc5f 100644
--- a/bundles/org.eclipse.build.tools/src/org/eclipse/releng/generators/TestResultsGenerator.java
+++ b/bundles/org.eclipse.build.tools/src/org/eclipse/releng/generators/TestResultsGenerator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2018 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -458,7 +458,10 @@
for (int i = 0; i < elementCount; i++) {
final Element element = (Element) elements.item(i);
final NamedNodeMap attributes = element.getAttributes();
- Node aNode = attributes.getNamedItem("errors");
+ Node aNode = attributes.getNamedItem("aborted");
+ if (aNode == null) {
+ attributes.getNamedItem("errors");
+ }
errorCount = errorCount + Integer.parseInt(aNode.getNodeValue());
aNode = attributes.getNamedItem("failures");
errorCount = errorCount + Integer.parseInt(aNode.getNodeValue());
diff --git a/pom.xml b/pom.xml
index 78270e4..7b8ca36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
<buildTimestamp>${maven.build.timestamp}</buildTimestamp>
<buildType>I</buildType>
<buildId>${buildType}${buildTimestamp}</buildId>
- <comparator.repo>http://download.eclipse.org/eclipse/updates/4.7-I-builds</comparator.repo>
+ <comparator.repo>http://download.eclipse.org/eclipse/updates/4.9-I-builds</comparator.repo>
<egit-repo.url>http://download.eclipse.org/egit/updates</egit-repo.url>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cbi-jdt-repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</cbi-jdt-repo.url>
@@ -95,7 +95,7 @@
<repository>
<id>eclipse-platform-repository</id>
<layout>p2</layout>
- <!-- Normally should be "latest milestone" for stability, once we have one for 4.8. -->
+ <!-- Normally should be "latest milestone" for stability, once we have one for 4.9. -->
<url>http://download.eclipse.org/eclipse/updates/4.9-I-builds/</url>
</repository>
<repository>
