fixed errors on non-existent timestamp

trivago · Apr 16, 2019 · b1d96f3 · b1d96f3
1 parent dad90cb
commit b1d96f3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.../trivago/cluecumber/rendering/pages/pojos/pagecollections/AllScenariosPageCollection.java b/.../trivago/cluecumber/rendering/pages/pojos/pagecollections/AllScenariosPageCollection.java
@@ -122,7 +122,8 @@ private ZonedDateTime getEarliestStartDateTime() {
         for (Report report : reports) {
             for (Element element : report.getElements()) {
                 ZonedDateTime currentStartDateTime = element.getStartDateTime();
-                if (earliestStartDateTime == null || currentStartDateTime.isBefore(earliestStartDateTime)) {
+                if (currentStartDateTime != null &&
+                        (earliestStartDateTime == null || currentStartDateTime.isBefore(earliestStartDateTime))) {
                     earliestStartDateTime = currentStartDateTime;
                 }
             }
@@ -135,15 +136,16 @@ private ZonedDateTime getLatestEndDateTime() {
         for (Report report : reports) {
             for (Element element : report.getElements()) {
                 ZonedDateTime currentEndDateTime = element.getEndDateTime();
-                if (latestEndDateTime == null || currentEndDateTime.isAfter(latestEndDateTime)) {
+                if (currentEndDateTime != null &&
+                        (latestEndDateTime == null || currentEndDateTime.isAfter(latestEndDateTime))) {
                     latestEndDateTime = currentEndDateTime;
                 }
             }
         }
         return latestEndDateTime;
     }
 
-    public String getStartDateTimeString() {
+    public String returnStartDateTimeString() {
         ZonedDateTime earliestStartDateTime = getEarliestStartDateTime();
         if (earliestStartDateTime != null) {
             return RenderingUtils.convertZonedDateTimeToDateString(earliestStartDateTime) + " " +
@@ -152,7 +154,7 @@ public String getStartDateTimeString() {
         return "";
     }
 
-    public String getEndDateTimeString() {
+    public String returnEndDateTimeString() {
         ZonedDateTime latestEndDateTime = getLatestEndDateTime();
         if (latestEndDateTime != null) {
             return RenderingUtils.convertZonedDateTimeToDateString(latestEndDateTime) + " " +

diff --git a/...ivago/cluecumber/rendering/pages/pojos/pagecollections/ScenarioSummaryPageCollection.java b/...ivago/cluecumber/rendering/pages/pojos/pagecollections/ScenarioSummaryPageCollection.java
@@ -42,6 +42,5 @@ public void addScenarioIndexByStatus(final Status status, final int scenarioInde
                 totalSkipped.add(scenarioIndex);
             default:
         }
-
     }
 }
diff --git a/plugin-code/src/main/resources/template/scenario-summary.ftl b/plugin-code/src/main/resources/template/scenario-summary.ftl
@@ -85,10 +85,14 @@ preheadlineLink="">
                     ${totalNumberOfFailedScenarios} <@common.status status="failed"/>
                     ${totalNumberOfSkippedScenarios} <@common.status status="skipped"/>
                 </li>
+
+                <#assign startDateTimeString = returnStartDateTimeString()>
                 <#if startDateTimeString?has_content>
                     <li class="list-group-item" data-cluecumber-item="total-start">
                         Started on:<br>${startDateTimeString}</li>
                 </#if>
+
+                <#assign endDateTimeString = returnEndDateTimeString()>
                 <#if endDateTimeString?has_content>
                     <li class="list-group-item" data-cluecumber-item="total-end">
                         Ended on:<br>${endDateTimeString}</li>
-Original file line number
+Diff line change
@@ Expand Up @@
                     totalSkipped.add(scenarioIndex);
                 default:
             }
         }
     }