Merge branch 'develop' into feature/dao-unit-tests

Author: VladislavKostyukevich

CHANGELOG.md

@@ -5,13 +5,16 @@
 Features:
   - Added unit tests for checking DAO's -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/80)
 
-## 0.3.8 (Unreleased)
+## 0.3.8 (2020-03-11)
 
 Features:
-  - [Doc] Update Swagger with Statistic endpoints -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/76)
+  - Update Swagger with Statistic endpoints -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/76)
+  - Mark import as failed when import is failed -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/79)
+
+Bugfixes:
+  - Import was finished with Error! You are trying to edit entity which is locked -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/44)
+  - Incorrect "Duration" count if import several *.json's -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/37)
 
-Features:
-  - [BUG] Import was finished with Error! You are trying to edit entity which is locked -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/44)
 ## 0.3.7 (2020-03-02)
 
 Features:

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

@@ -88,6 +88,7 @@ private void updateImportTestRun() throws AqualityException {
     }
 
     void logToImport(String log) throws AqualityException {
+        importDto.setProject_id(this.projectId);
         importDto.addToLog(log);
         importDto = importDao.create(importDto);
     }
@@ -105,22 +106,15 @@ private void createTestRun() throws AqualityException {
             }
         }
         else{
-            createTestRun((testRun.getBuild_name() != null && !testRun.getBuild_name().equals(""))
-                    ? testRun.getBuild_name()
-                    : file.getName().substring(0, file.getName().lastIndexOf(".")));
+            setTestRunStartDate();
+            setTestRunFinishDate();
+            testRun.setTest_suite_id(testSuite.getId());
+            testRun.setId(controllerFactory.getHandler(testRun).create(testRun).getId());
         }
         updateImportTestRun();
         logToImport("Test Run is updated.");
     }
 
-    private void createTestRun(String buildName) throws AqualityException {
-        testRun.setBuild_name(buildName);
-        setTestRunStartDate();
-        setTestRunFinishDate();
-        testRun.setTest_suite_id(testSuite.getId());
-        testRun.setId(controllerFactory.getHandler(testRun).create(testRun).getId());
-    }
-
     private void setTestRunStartDate(){
         Comparator<TestResultDto> startDate = Comparator.comparing(TestResultDto::getStart_date);
         if(testRun.getStart_time() == null){

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

@@ -16,6 +16,7 @@
 
 public abstract class Handler extends DefaultHandler {
     protected SAXParser parser;
+    protected TestRunDto testRun = new TestRunDto();
     public Handler() throws AqualityException {
         try {
             SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
@@ -33,4 +34,7 @@ public Handler() throws AqualityException {
     public abstract TestRunDto getTestRun();
     public abstract List<TestDto> getTests();
     public abstract List<TestResultDto> getTestResults();
+    public void setTestRun(TestRunDto testRun){
+        this.testRun = testRun;
+    }
 }

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

@@ -4,9 +4,10 @@
 import main.model.db.imports.ImportHandlers.*;
 
 import java.io.File;
+import java.util.Date;
 
 class HandlerFactory {
-    Handler getHandler(File file, String type, TestNameNodeType testNameNodeType) throws AqualityException {
+    Handler getHandler(File file, String type, TestNameNodeType testNameNodeType, Date finishTime) throws AqualityException {
         switch (ImportTypes.valueOf(type)){
             case MSTest:
                 if(testNameNodeType == null){
@@ -23,7 +24,7 @@ Handler getHandler(File file, String type, TestNameNodeType testNameNodeType) th
                 return new JavaTestNG(file, testNameNodeType);
             case Cucumber:
             case TestNGCucumber:
-                return new Cucumber(file);
+                return new Cucumber(file, finishTime);
             case PHPCodeception:
                 return new PHPCodeception(file);
             case NUnit_v2:

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

@@ -16,23 +16,23 @@
 
 public class Cucumber extends Handler{
         private List<FeatureDto> features;
-        private TestRunDto testRun;
         private List<TestDto> tests = new ArrayList<>();
         private List<TestResultDto> results = new ArrayList<>();
         private DateUtils dateUtils = new DateUtils();
         private FeatureDto currentFeature;
         private TestResultDto currentResult;
         private Integer testTime = 0;
-        private Date dateCounter = new Date();
+        private Date dateCounter;
         private boolean previousWasBackground = false;
         private TestDto currentTest;
 
-        public Cucumber(@NotNull File file) throws AqualityException {
+        public Cucumber(@NotNull File file, Date finishTime) throws AqualityException {
             super();
             FileUtils fileUtils = new FileUtils();
             String json = fileUtils.readFile(file.getPath());
             CucumberUtils cucumberUtils = new CucumberUtils(json);
             this.features = cucumberUtils.getFeatures();
+            dateCounter = finishTime;
             parse();
         }
 
@@ -42,9 +42,9 @@ private void parse() {
 
         private void handleTestRun() {
             testRun = new TestRunDto();
-            testRun.setStart_time(dateCounter);
-            features.forEach(this::handleFeature);
             testRun.setFinish_time(dateCounter);
+            features.forEach(this::handleFeature);
+            testRun.setStart_time(dateCounter);
         }
 
         private void handleFeature(@NotNull FeatureDto feature) {
@@ -72,14 +72,14 @@ private void handleScenario(@NotNull ScenarioDto scenario) {
                 String[] strings = scenario.getId().split(";;");
                 currentTest.setName(String.format("%s: %s%s", currentFeature.getName(), scenario.getName(), strings.length > 1 ? String.format(": %s", strings[1]) : ""));
 
-                currentResult.setStart_date(dateCounter);
+                currentResult.setFinish_date(dateCounter);
                 if(currentResult.getFail_reason() == null) currentResult.setFail_reason("");
                 if(scenario.getBefore() != null) scenario.getBefore().forEach(this::handleStep);
                 scenario.getSteps().forEach(this::handleStep);
                 if(scenario.getAfter() != null) scenario.getAfter().forEach(this::handleStep);
-                dateCounter = dateUtils.addMS(dateCounter, testTime);
+                dateCounter = dateUtils.removeMS(dateCounter, testTime);
+                currentResult.setStart_date(dateCounter);
                 testTime = 0;
-                currentResult.setFinish_date(dateCounter);
                 tests.add(currentTest);
                 results.add(currentResult);
             } else {

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

@@ -45,4 +45,8 @@ public List<TestDto> getTests() {
     public List<TestResultDto> getTestResults() {
         return handler.getTestResults();
     }
+    
+    public void setTestRun(TestRunDto testRun){
+        handler.setTestRun(testRun);
+    }
 }

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

@@ -45,4 +45,8 @@ public List<TestDto> getTests() {
     public List<TestResultDto> getTestResults() {
         return handler.getTestResults();
     }
+
+    public void setTestRun(TestRunDto testRun){
+        handler.setTestRun(testRun);
+    }
 }

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

@@ -46,4 +46,8 @@ public List<TestDto> getTests() {
     public List<TestResultDto> getTestResults() {
         return handler.getTestResults();
     }
+
+    public void setTestRun(TestRunDto testRun){
+        handler.setTestRun(testRun);
+    }
 }

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

@@ -45,4 +45,8 @@ public List<TestDto> getTests() {
     public List<TestResultDto> getTestResults() {
         return handler.getTestResults();
     }
+
+    public void setTestRun(TestRunDto testRun){
+        handler.setTestRun(testRun);
+    }
 }

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

@@ -45,4 +45,8 @@ public List<TestDto> getTests() {
     public List<TestResultDto> getTestResults() {
         return handler.getTestResults();
     }
+
+    public void setTestRun(TestRunDto testRun){
+        handler.setTestRun(testRun);
+    }
 }