Merge pull request #23 from aquality-automation/develop

Develop

Author: VladislavKostyukevich

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## 0.3.2 (unreleased)
 
+Features:
+
+  - Import: NUnit V3 add possibility to import with fullname test name  -> [View Issue](https://github.com/aquality-automation/aquality-tracking-ui/issues/27)
+
 Bugfixes:
 
   - Import: Import to latest test Run not working when importing more than one file  -> [View Issue](https://github.com/aquality-automation/aquality-tracking-ui/issues/29)

src/main/java/main/controllers/Project/SuiteController.java

@@ -52,7 +52,7 @@ public TestSuiteDto get(String name, Integer projectId) throws AqualityException
         template.setProject_id(projectId);
         try{
             return get(template, false).get(0);
-        } catch (Exception e) {
+        } catch (IndexOutOfBoundsException e) {
             throw new AqualityException("The '%s' suite does not exist.", name);
         }
     }

src/main/java/main/exceptions/AqualitySQLException.java

@@ -17,6 +17,8 @@ private static String getErrorMessage(String sqlcode){
                 return "You are trying to create duplicate entity.";
             case "42000":
                 return "You Regular expression is not valid!";
+            case "40001":
+                return "You are trying to edit entity which is locked. Please retry the operation.";
             default:
                 return String.format("Unknown SQL Error: %s", sqlcode);
         }

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

@@ -80,7 +80,15 @@ void addLogToImport(String log) throws AqualityException {
 
     private void createTestRun() throws AqualityException {
         if(testRun.getId() != null){
-            this.testRun = controllerFactory.getHandler(testRun).get(testRun, false, 1).get(0);
+            TestRunDto template = new TestRunDto();
+            template.setProject_id(testRun.getProject_id());
+            template.setId(testRun.getId());
+            List<TestRunDto> testRuns = controllerFactory.getHandler(template).get(template, false, 1);
+            if(testRuns.size() > 0){
+                testRun = testRuns.get(0);
+            } else {
+                throw new AqualityException("Test run with %s id does not exist!", testRun.getId());
+            }
         }
         else{
             createTestRun((testRun.getBuild_name() != null && !testRun.getBuild_name().equals(""))

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

@@ -28,7 +28,10 @@ Handler getHandler(File file, String type, TestNameNodeType testNameNodeType) th
             case NUnit_v2:
                 return new NUnitV2(file);
             case NUnit_v3:
-                return new NUnitV3(file);
+                if(testNameNodeType == null){
+                    throw new AqualityException("testNameNode is required");
+                }
+                return new NUnitV3(file, testNameNodeType);
             default:
                 throw new AqualityException(String.format("Import Type '%s' is not implemented", type));
         }

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

@@ -3,6 +3,7 @@
 import main.exceptions.AqualityException;
 import main.model.db.imports.Handler;
 import main.model.db.imports.SAXHandlers.NUnitV3Handler;
+import main.model.db.imports.TestNameNodeType;
 import main.model.dto.TestDto;
 import main.model.dto.TestResultDto;
 import main.model.dto.TestRunDto;
@@ -17,8 +18,8 @@ public class NUnitV3 extends Handler {
 
     private NUnitV3Handler handler;
 
-    public NUnitV3(File file) throws AqualityException {
-        handler = new NUnitV3Handler();
+    public NUnitV3(File file, TestNameNodeType testNameNodeType) throws AqualityException {
+        handler = new NUnitV3Handler(testNameNodeType);
         try {
             this.parser.parse(file, handler);
         } catch (SAXException | IOException e) {

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

@@ -3,6 +3,7 @@
 import main.model.db.imports.ResultStatus;
 import main.exceptions.AqualityException;
 import main.model.db.imports.Handler;
+import main.model.db.imports.TestNameNodeType;
 import main.model.dto.*;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
@@ -13,6 +14,7 @@
 import java.util.*;
 
 import static main.model.db.imports.ResultStatus.*;
+import static main.model.db.imports.TestNameNodeType.*;
 
 public class NUnitV3Handler extends Handler {
     private TestSuiteDto testSuite = new TestSuiteDto();
@@ -28,9 +30,11 @@ public class NUnitV3Handler extends Handler {
     private Boolean isReasonStarted = false;
     private Boolean isTestCaseStarted = false;
     private Integer assertionNumber = 0;
+    private TestNameNodeType testNameNodeType;
 
-    public NUnitV3Handler() throws AqualityException {
+    public NUnitV3Handler(TestNameNodeType testNameNodeType) throws AqualityException {
         super();
+        this.testNameNodeType = testNameNodeType;
         result.setFail_reason("$blank");
     }
 
@@ -59,13 +63,13 @@ public void startElement(String uri, String localName, String qName, Attributes
                 testRun.setAuthor(String.format("%s\\%s", attributes.getValue("user-domain"), attributes.getValue("user")));
                 break;
             case "test-suite":
-                if(attributes.getValue("type").equals("TestFixture")) {
+                if(attributes.getValue("type").equals("TestFixture") && testNameNodeType == featureNameTestName) {
                     currentFixture = attributes.getValue("name");
                 }
                 break;
             case "test-case":
                 isTestCaseStarted = true;
-                test.setName(String.format("%s: %s", currentFixture, attributes.getValue("name")) );
+                setTestName(attributes);
                 try {
                     result.setStart_date(convertToDate(attributes.getValue("start-time")));
                     result.setFinish_date(convertToDate(attributes.getValue("end-time")));
@@ -166,6 +170,18 @@ public void characters(char[] ch, int start, int length) {
         }
     }
 
+    private void setTestName(Attributes attributes) throws SAXException {
+        switch (testNameNodeType) {
+            case featureNameTestName:
+                test.setName(String.format("%s: %s", currentFixture, attributes.getValue("name")) );
+                break;
+            case className:
+                test.setName(attributes.getValue("fullname"));
+                break;
+            default:
+                throw new SAXException("testNameNodeType is not correct for NUnitV3 parser.");
+        }
+    }
 
     private Date convertToDate(String dateString) throws ParseException {
         DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

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

@@ -3,5 +3,6 @@
 public enum TestNameNodeType {
     className,
     testName,
-    descriptionNode
+    descriptionNode,
+    featureNameTestName
 }

src/main/java/main/view/Project/ExecuteImportServlet.java

@@ -156,13 +156,16 @@ private TestNameNodeType getTestNameNodeType(HttpServletRequest req) {
         String testNameKey = getStringQueryParameter(req, ImportParams.testNameKey.name());
 
         if(testNameKey == null){
+            if(format.equals(ImportTypes.NUnit_v3.name())) {
+                return TestNameNodeType.featureNameTestName;
+            }
             return null;
         }
 
         try {
             return TestNameNodeType.valueOf(testNameKey);
         } catch (IllegalArgumentException e) {
-            throw new InvalidParameterException("TestNameKey parameter you provide is not correct. The correct values are:'testName', 'className', 'descriptionNode'.");
+            throw new InvalidParameterException("TestNameKey parameter you provide is not correct. The correct values are:'testName', 'className', 'descriptionNode', 'featureNameTestName'.");
         }
     }
 }

src/test/java/tests/workers/imports/ClassNameNUnitHandlerTest.java

@@ -0,0 +1,52 @@
+package tests.workers.imports;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import main.model.db.imports.ImportHandlers.NUnitV3;
+import main.model.db.imports.TestNameNodeType;
+import main.model.dto.*;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+import utils.FileUtils;
+
+import java.util.List;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+
+public class ClassNameNUnitHandlerTest {
+    private NUnitV3 nUnitV3;
+    private  DtoMapperGeneral mapper = new DtoMapperGeneral();
+
+    @BeforeMethod
+    public void tryParse(){
+        try {
+            nUnitV3 = new NUnitV3(FileUtils.getResourceFile("reports/Nunit3/Nunit3.xml"), TestNameNodeType.className);
+        } catch (Exception e){
+            assertNull(e, String.format("Failed on Handler Creating: %s", e.getMessage()));
+        }
+    }
+
+    @Test
+    public void validateTests() throws JsonProcessingException {
+        List<TestDto> actualTests = nUnitV3.getTests();
+        assertEquals(mapper.serialize(actualTests), FileUtils.getResourceFileAsString("reports/Nunit3/testWithClassName.json"));
+    }
+
+    @Test
+    public void validateTestSuite() throws JsonProcessingException {
+        TestSuiteDto actualTestSuite = nUnitV3.getTestSuite();
+        assertEquals(mapper.serialize(actualTestSuite), FileUtils.getResourceFileAsString("reports/Nunit3/suite.json"));
+    }
+
+    @Test
+    public void validateTestRun() throws JsonProcessingException {
+        TestRunDto actualTestRun = nUnitV3.getTestRun();
+        assertEquals(mapper.serialize(actualTestRun), FileUtils.getResourceFileAsString("reports/Nunit3/testrun.json"));
+    }
+
+    @Test
+    public void validateTestResults() throws JsonProcessingException {
+        List<TestResultDto> actualTestResults = nUnitV3.getTestResults();
+        assertEquals(mapper.serialize(actualTestResults), FileUtils.getResourceFileAsString("reports/Nunit3/results.json"));
+    }
+}