Merge pull request #3 from SmartBear/generic-parser-dev

ZEPHYR-28071
jenkinsci · Jan 10, 2020 · eb2653a · eb2653a
2 parents 5918bc8 + c314ff3
commit eb2653a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/src/main/java/com/thed/zephyr/jenkins/model/ZephyrConfigModel.java b/src/main/java/com/thed/zephyr/jenkins/model/ZephyrConfigModel.java
@@ -19,6 +19,8 @@ public class ZephyrConfigModel {
 	private ZephyrInstance selectedZephyrServer;
 	private int builNumber;
     private Map<String, List<CaseResult>> packageCaseResultMap;
+    private String resultXmlFilePath;
+    private Long parserIndex;
 
 
 	public boolean isCreatePackage() {
@@ -108,4 +110,20 @@ public Map<String, List<CaseResult>> getPackageCaseResultMap() {
     public void setPackageCaseResultMap(Map<String, List<CaseResult>> packageCaseResultMap) {
         this.packageCaseResultMap = packageCaseResultMap;
     }
+
+    public String getResultXmlFilePath() {
+        return resultXmlFilePath;
+    }
+
+    public void setResultXmlFilePath(String resultXmlFilePath) {
+        this.resultXmlFilePath = resultXmlFilePath;
+    }
+
+    public Long getParserIndex() {
+        return parserIndex;
+    }
+
+    public void setParserIndex(Long parserIndex) {
+        this.parserIndex = parserIndex;
+    }
 }
diff --git a/src/main/java/com/thed/zephyr/jenkins/reporter/ZeeReporter.java b/src/main/java/com/thed/zephyr/jenkins/reporter/ZeeReporter.java
@@ -58,7 +58,7 @@ public class ZeeReporter extends Notifier implements SimpleBuildStep {
 	private String cycleDuration;
 	private boolean createPackage;
     private String resultXmlFilePath;
-    private Integer parserIndex;
+    private String parserIndex;
     private Integer eggplantParserIndex = 3;
 
     private String[] parserTemplateArr = new String[] {
@@ -96,7 +96,7 @@ public ZeeReporter(String serverAddress, String projectKey,
 		this.createPackage = createPackage;
 		this.cycleDuration = cycleDuration;
         this.resultXmlFilePath = resultXmlFilePath;
-        this.parserIndex = Integer.parseInt(parserIndex);
+        this.parserIndex = parserIndex;
 	}
 
 	@Override
@@ -158,6 +158,9 @@ public boolean perform(final Run build, final TaskListener listener) throws IOEx
             }
 
             zephyrConfigModel.setCreatePackage(isCreatePackage());
+            zephyrConfigModel.setResultXmlFilePath(getResultXmlFilePath());
+            zephyrConfigModel.setParserIndex(Long.parseLong(getParserIndex()));
+
             zephyrConfigModel.setBuilNumber(number);
 
             ZephyrInstance zephyrInstance = getZephyrInstance(getServerAddress());
@@ -194,7 +197,7 @@ public boolean perform(final Run build, final TaskListener listener) throws IOEx
             }
 
             for(String xmlFilePath : xmlFiles) {
-                dataMapList.addAll(genericParserXML(xmlFilePath, parserTemplateArr[parserIndex]));
+                dataMapList.addAll(genericParserXML(xmlFilePath, parserTemplateArr[Integer.valueOf(String.valueOf(zephyrConfigModel.getParserIndex()))]));
             }
 
             zephyrConfigModel.setPackageNames(getPackageNamesFromXML(dataMapList));
@@ -852,4 +855,12 @@ public String getResultXmlFilePath() {
     public void setResultXmlFilePath(String resultXmlFilePath) {
         this.resultXmlFilePath = resultXmlFilePath;
     }
+
+    public String getParserIndex() {
+        return parserIndex;
+    }
+
+    public void setParserIndex(String parserIndex) {
+        this.parserIndex = parserIndex;
+    }
 }