issue_125 change cucumber test run duration calculation (#80)

* issue_125 change cucumber test run duration calculation
Co-authored-by: runetsK <[email protected]>

Author: runetsk-zz

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.0.4 (2020-11-02)
+
+Bugfixes:
+  - Changed testRun start and finish time calculation for Cucumber version 4.3.0+ -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/125)
+
 ## 1.0.3 (2020-08-27)
 
 Features: 

pom.xml

@@ -6,7 +6,7 @@
     <groupId>unifi_reporting_api</groupId>
     <artifactId>api</artifactId>
     <packaging>war</packaging>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/main/model/db/imports/ImportHandlers/Cucumber.java

@@ -1,6 +1,7 @@
 package main.model.db.imports.ImportHandlers;
 
 import main.exceptions.AqualityException;
+import main.model.db.imports.TestRunTiming;
 import main.model.dto.project.TestDto;
 import main.model.dto.project.TestResultDto;
 import main.model.dto.project.TestRunDto;
@@ -28,6 +29,7 @@ public class Cucumber extends Handler{
         private Date dateCounter;
         private boolean previousWasBackground = false;
         private TestDto currentTest;
+        private List<TestRunTiming> timings = new ArrayList<>();
 
         public Cucumber(@NotNull File file, Date finishTime) throws AqualityException {
             super();
@@ -45,9 +47,13 @@ private void parse() {
 
         private void handleTestRun() {
             testRun = new TestRunDto();
-            testRun.setFinish_time(dateCounter);
-            features.forEach(this::handleFeature);
             testRun.setStart_time(dateCounter);
+            features.forEach(this::handleFeature);
+            testRun.setFinish_time(dateCounter);
+
+            if(!timings.isEmpty()){
+                calculateTimings();
+            }
         }
 
         private void handleFeature(@NotNull FeatureDto feature) {
@@ -57,6 +63,11 @@ private void handleFeature(@NotNull FeatureDto feature) {
             }
         }
 
+        public void calculateTimings(){
+            testRun.setStart_time(timings.stream().min(Comparator.comparing(TestRunTiming::getStart)).get().getStart());
+            testRun.setFinish_time(timings.stream().max(Comparator.comparing(TestRunTiming::getFinish)).get().getFinish());
+        }
+
         private void handleScenario(@NotNull ScenarioDto scenario) {
             String type = scenario.getType()==null ? scenario.getKeyword().toLowerCase() :scenario.getType();
             if(Objects.equals(type, "background")){
@@ -82,6 +93,11 @@ private void handleScenario(@NotNull ScenarioDto scenario) {
                 if(scenario.getAfter() != null) scenario.getAfter().forEach(this::handleStep);
                 dateCounter = dateUtils.removeMS(dateCounter, testTime);
                 currentResult.setStart_date(dateCounter);
+
+                if(scenario.getStart_timestamp() != null){
+                    timings.add(getTestRunTiming(scenario));
+                }
+
                 testTime = 0;
                 tests.add(currentTest);
                 results.add(currentResult);
@@ -102,6 +118,13 @@ private Integer getStepDuration(@NotNull StepDto step) {
             return (0);
         }
 
+        private TestRunTiming getTestRunTiming(@NotNull ScenarioDto scenario){
+            TestRunTiming testRunTiming = new TestRunTiming();
+            testRunTiming.setStart(scenario.getStart_timestamp());
+            testRunTiming.setFinish(Date.from(scenario.getStart_timestamp().toInstant().plusMillis(testTime)));
+            return testRunTiming;
+        }
+
         private void handleStep(@NotNull StepDto step) {
             if(step.getName() != null){
                 currentTest.setBody((currentTest.getBody() == null ? "" : currentTest.getBody() + "\r\n") + step.getKeyword() + " " + step.getName());

src/main/java/main/model/db/imports/TestRunTiming.java

@@ -0,0 +1,11 @@
+package main.model.db.imports;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class TestRunTiming {
+    private Date start;
+    private Date finish;
+}

src/main/java/main/utils/TestNGCucumberJsonParser/ScenarioDto.java

@@ -2,10 +2,12 @@
 
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 @Data
 public class ScenarioDto {
+    private Date start_timestamp;
     private String id;
     private String name;
     private String keyword;

src/test/resources/reports/cucumber/testRun.json

@@ -1 +1 @@
-{"start_time":1262390386947,"finish_time":1262390400000}
+{"start_time":1262390400000,"finish_time":1262390386947}