diff options
author | Victor Rubezhny | 2021-04-21 18:51:05 +0000 |
---|---|---|
committer | Mickael Istria | 2021-04-26 15:29:32 +0000 |
commit | 501de1edc114d3de825cd7b770b8c96498b83012 (patch) | |
tree | 2a0bb29395d1a777c14d29ed95a812e329c16ea0 | |
parent | 83664920473076bf1dc4d1d439809125bfdf0008 (diff) | |
download | eclipse.platform.debug-501de1edc114d3de825cd7b770b8c96498b83012.tar.gz eclipse.platform.debug-501de1edc114d3de825cd7b770b8c96498b83012.tar.xz eclipse.platform.debug-501de1edc114d3de825cd7b770b8c96498b83012.zip |
Bug 573078 - Prevent NPE in TestRunSessionSerializerI20210428-0330I20210428-0040I20210427-1800I20210426-2110I20210426-1800
Change-Id: I7775d0999e54ecb20990334969aca77122f73fd7
Signed-off-by: Victor Rubezhny <vrubezhny@redhat.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.debug/+/179663
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Mickael Istria <mistria@redhat.com>
3 files changed, 11 insertions, 5 deletions
diff --git a/org.eclipse.unittest.ui/META-INF/MANIFEST.MF b/org.eclipse.unittest.ui/META-INF/MANIFEST.MF index 4c63e04ca..3849febd5 100644 --- a/org.eclipse.unittest.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.unittest.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.unittest.ui Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.unittest.ui;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.100.qualifier Bundle-Activator: org.eclipse.unittest.internal.UnitTestPlugin Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName diff --git a/org.eclipse.unittest.ui/pom.xml b/org.eclipse.unittest.ui/pom.xml index 2e25f5972..13fc94da8 100644 --- a/org.eclipse.unittest.ui/pom.xml +++ b/org.eclipse.unittest.ui/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.debug</groupId> <artifactId>org.eclipse.unittest.ui</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/junitXmlReport/TestRunSessionSerializer.java b/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/junitXmlReport/TestRunSessionSerializer.java index 4147bfb80..c5c6d3c85 100644 --- a/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/junitXmlReport/TestRunSessionSerializer.java +++ b/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/junitXmlReport/TestRunSessionSerializer.java @@ -15,6 +15,8 @@ package org.eclipse.unittest.internal.junitXmlReport; import java.io.IOException; +import java.time.Duration; +import java.time.Instant; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; @@ -89,9 +91,13 @@ public class TestRunSessionSerializer implements XMLReader { addCDATA(atts, IXMLTags.ATTR_FAILURES, fTestRunSession.getCurrentFailureCount()); addCDATA(atts, IXMLTags.ATTR_ERRORS, fTestRunSession.getCurrentErrorCount()); addCDATA(atts, IXMLTags.ATTR_IGNORED, fTestRunSession.getCurrentIgnoredCount()); - addCDATA(atts, IXMLTags.ATTR_START_TIME, fTestRunSession.getStartTime().toString()); - if (fTestRunSession.getDuration() != null) { - addCDATA(atts, IXMLTags.ATTR_DURATION, fTestRunSession.getDuration().toString()); + Instant startTime = fTestRunSession.getStartTime(); + if (startTime != null) { + addCDATA(atts, IXMLTags.ATTR_START_TIME, startTime.toString()); + } + Duration duration = fTestRunSession.getDuration(); + if (duration != null) { + addCDATA(atts, IXMLTags.ATTR_DURATION, duration.toString()); } startElement(IXMLTags.NODE_TESTRUN, atts); |