Merge pull request #62 from aquality-automation/feature/import-handlers-unit-tests

unit tests for import handlers

Author: VladislavKostyukevich

.circleci/config.yml

@@ -23,7 +23,7 @@ jobs:
             - ~/.m2
           key: v1-dependencies-{{ checksum "pom.xml" }}
 
-      - run: mvn test -f pom.xml -P !run-migration
+      - run: mvn clean test -f pom.xml -P !run-migration
 
       - run:
           name: Save test results

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 0.3.9 (Unreleased)
 
 Features:
+  - Added unit tests for import handlers -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/81)
   - Added unit tests for checking DAO's -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/80)
 
 ## 0.3.8 (2020-03-11)

pom.xml

@@ -146,7 +146,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>6.14.3</version>
+            <version>7.0.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

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

@@ -21,12 +21,12 @@ Handler getHandler(File file, String type, TestNameNodeType testNameNodeType, Da
                 if(testNameNodeType == null){
                     throw new AqualityException("testNameNode is required");
                 }
-                return new JavaTestNG(file, testNameNodeType);
+                return new JavaJUnitTestNG(file, testNameNodeType, finishTime);
             case Cucumber:
             case TestNGCucumber:
                 return new Cucumber(file, finishTime);
             case PHPCodeception:
-                return new PHPCodeception(file);
+                return new PHPCodeception(file, finishTime);
             case NUnit_v2:
                 return new NUnitV2(file);
             case NUnit_v3:

src/main/java/main/model/db/imports/ImportHandlers/JavaTestNG.java renamed to src/main/java/main/model/db/imports/ImportHandlers/JavaJUnitTestNG.java

@@ -2,7 +2,7 @@
 
 import main.exceptions.AqualityException;
 import main.model.db.imports.Handler;
-import main.model.db.imports.SAXHandlers.JavaTestNGHandler;
+import main.model.db.imports.SAXHandlers.JavaJUnitTestNGHandler;
 import main.model.db.imports.TestNameNodeType;
 import main.model.dto.TestDto;
 import main.model.dto.TestResultDto;
@@ -12,13 +12,14 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Date;
 import java.util.List;
 
-public class JavaTestNG extends Handler{
-    private JavaTestNGHandler handler;
+public class JavaJUnitTestNG extends Handler{
+    private JavaJUnitTestNGHandler handler;
 
-    public JavaTestNG(File file, TestNameNodeType testNameNodeType) throws AqualityException {
-        handler = new JavaTestNGHandler(testNameNodeType);
+    public JavaJUnitTestNG(File file, TestNameNodeType testNameNodeType, Date finishTime) throws AqualityException {
+        handler = new JavaJUnitTestNGHandler(testNameNodeType, finishTime);
         try {
             this.parser.parse(file, handler);
         } catch (SAXException | IOException e) {

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

@@ -11,14 +11,15 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Date;
 import java.util.List;
 
 public class PHPCodeception extends Handler {
 
     private PHPCodeceptionHandler handler;
 
-    public PHPCodeception(File file) throws AqualityException {
-        handler = new PHPCodeceptionHandler();
+    public PHPCodeception(File file, Date finishTime) throws AqualityException {
+        handler = new PHPCodeceptionHandler(finishTime);
         try {
             this.parser.parse(file, handler);
         } catch (SAXException | IOException e) {

src/main/java/main/model/db/imports/SAXHandlers/JavaTestNGHandler.java renamed to src/main/java/main/model/db/imports/SAXHandlers/JavaJUnitTestNGHandler.java

@@ -14,7 +14,7 @@
 
 import static main.model.db.imports.ResultStatus.*;
 
-public class JavaTestNGHandler extends Handler {
+public class JavaJUnitTestNGHandler extends Handler {
     private TestSuiteDto testSuite = new TestSuiteDto();
     private List<TestResultDto> results = new ArrayList<>();
     private TestResultDto result = new TestResultDto();
@@ -25,11 +25,11 @@ public class JavaTestNGHandler extends Handler {
     private Date currentTimeSlot;
     private TestNameNodeType testNameNodeType;
 
-    public JavaTestNGHandler(TestNameNodeType testNameNodeType) throws AqualityException {
+    public JavaJUnitTestNGHandler(TestNameNodeType testNameNodeType, Date finishTime) throws AqualityException {
         super();
         this.testNameNodeType = testNameNodeType;
         result.setFail_reason("$blank");
-        testRun.setFinish_time(new Date());
+        testRun.setFinish_time(finishTime);
     }
 
     @Override

src/main/java/main/model/db/imports/SAXHandlers/NUnitV2Handler.java

@@ -44,40 +44,40 @@ public void endDocument() {
     @Override
     public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
         currentElement = qName;
-        if(qName.equals("test-results")){
+        if (qName.equals("test-results")) {
             try {
                 testRun.setFinish_time(convertToDate(attributes.getValue("date"), attributes.getValue("time")));
             } catch (ParseException e) {
                 e.printStackTrace();
             }
-        }
-        else if (qName.equals("environment")) {
+        } else if (qName.equals("environment")) {
             testRun.setExecution_environment(attributes.getValue("machine-name"));
             testRun.setAuthor(String.format("%s\\%s", attributes.getValue("user-domain"), attributes.getValue("user")));
 
-        }
-        else if (qName.equals("test-suite") && attributes.getValue("type").equals("TestSuite") && strTime == null) {
+        } else if (qName.equals("test-suite")
+                && (attributes.getValue("type").equals("TestSuite") || attributes.getValue("type").equals("Assembly"))
+                && strTime == null) {
 
             calendar.setTime(testRun.getFinish_time());
             strTime = attributes.getValue("time");
-            milliTime = Integer.parseInt(strTime.replaceAll("\\.",""));
+            milliTime = Integer.parseInt(strTime.replaceAll("\\.", ""));
             calendar.add(Calendar.MILLISECOND, -milliTime);
             testRun.setStart_time(calendar.getTime());
             currentTimeSlot = testRun.getStart_time();
-        } else if(qName.equals("test-suite") && attributes.getValue("type").equals("TestSuite")
-                && strTime.equals(attributes.getValue("time"))){
+        } else if (qName.equals("test-suite") && attributes.getValue("type").equals("TestSuite")
+                && strTime.equals(attributes.getValue("time"))) {
             testSuite.setName(attributes.getValue("name"));
-        } else if(qName.equals("test-case")) {
+        } else if (qName.equals("test-case")) {
             isTestCaseClose = false;
             test.setName(attributes.getValue("name"));
             result.setStart_date(currentTimeSlot);
             calendar.setTime(currentTimeSlot);
-            milliTime = Integer.parseInt(attributes.getValue("time").replaceAll("\\.",""));
+            milliTime = Integer.parseInt(attributes.getValue("time").replaceAll("\\.", ""));
             calendar.add(Calendar.MILLISECOND, milliTime);
             currentTimeSlot = calendar.getTime();
             result.setFinish_date(currentTimeSlot);
 
-            if(attributes.getValue("success").equals("False")){
+            if (attributes.getValue("success").equals("False")) {
                 isTestFailed = true;
             }
 
@@ -96,7 +96,7 @@ public void endElement(String uri, String localName, String qName) {
             tests.add(test);
             test = new TestDto();
             result.setInternalTestId(test.getName());
-            if(result.getFail_reason() != null && result.getFail_reason().equals("$blank")) result.setFail_reason("");
+            if (result.getFail_reason() != null && result.getFail_reason().equals("$blank")) result.setFail_reason("");
             results.add(result);
             result = new TestResultDto();
             result.setFail_reason("$blank");
@@ -105,7 +105,7 @@ public void endElement(String uri, String localName, String qName) {
 
     @Override
     public void characters(char[] ch, int start, int length) {
-        String value = new String(ch,start,length);
+        String value = new String(ch, start, length);
         if (isTestFailed) {
             if (currentElement.equals("message")) {
                 String res = result.getFail_reason();
@@ -129,7 +129,7 @@ private Date convertToDate(String dateString, String timeString) throws ParseExc
         return format.parse(date);
     }
 
-    private ResultStatus getStatus(String status){
+    private ResultStatus getStatus(String status) {
         switch (status) {
             case "Success":
                 return PASSED;
@@ -141,19 +141,19 @@ private ResultStatus getStatus(String status){
         }
     }
 
-    public TestSuiteDto getTestSuite(){
+    public TestSuiteDto getTestSuite() {
         return testSuite;
     }
 
-    public TestRunDto getTestRun(){
+    public TestRunDto getTestRun() {
         return testRun;
     }
 
-    public List<TestDto> getTests(){
+    public List<TestDto> getTests() {
         return tests;
     }
 
-    public List<TestResultDto> getTestResults(){
+    public List<TestResultDto> getTestResults() {
         return results;
     }
 }

src/main/java/main/model/db/imports/SAXHandlers/PHPCodeceptionHandler.java

@@ -23,10 +23,10 @@ public class PHPCodeceptionHandler extends Handler {
     private Calendar calendar = Calendar.getInstance();
     private boolean testcaseIsFound = false;
 
-    public PHPCodeceptionHandler() throws AqualityException {
+    public PHPCodeceptionHandler(Date finishTime) throws AqualityException {
         super();
         result.setFail_reason("$blank");
-        testRun.setFinish_time(new Date());
+        testRun.setFinish_time(finishTime);
     }
 
     @Override

src/main/java/main/model/db/imports/SAXHandlers/RobotHandler.java

@@ -49,7 +49,7 @@ public void startElement(String uri, String localName, String qName, Attributes
         currentElement = qName;
         if (qName.equals("robot")){
             try {
-                testRun.setFinish_time(convertToDate(attributes.getValue("generated")));
+                testRun.setStart_time(convertToDate(attributes.getValue("generated")));
             } catch (ParseException e) {
                 e.printStackTrace();
             }
@@ -63,10 +63,10 @@ public void startElement(String uri, String localName, String qName, Attributes
             currentKWName = attributes.getValue("name");
         } else if(qName.equals("status") && testStarted && !kwStarted){
             try {
-
                 result.setFinal_result_id(getStatus(attributes.getValue("status")).getValue());
                 result.setStart_date(convertToDate(attributes.getValue("starttime")));
                 result.setFinish_date(convertToDate(attributes.getValue("endtime")));
+                testRun.setFinish_time(convertToDate(attributes.getValue("endtime")));
             } catch (ParseException e) {
                 e.printStackTrace();
             }