ZEPHYR-28727

jenkinsci · Apr 14, 2020 · 9ec1bf7 · 9ec1bf7
1 parent eb74bc7
commit 9ec1bf7
Showing 1 changed file with 67 additions and 28 deletions.
diff --git a/src/main/java/com/thed/utils/ParserUtil.java b/src/main/java/com/thed/utils/ParserUtil.java
@@ -24,7 +24,8 @@
  */
 public class ParserUtil {
 
-    public static final String parserVariablePattern = "\\$\\{[^${}]*}";
+    public static final String PARSER_VARIABLE_PATTERN = "\\$\\{[^${}]*}";
+    public static final String PARSER_VARIABLE_PATTERN_EXISTS_FUNCTION = "\\$\\{exists\\([^${}]*\\)}";
 
     public Document getXMLDoc(String filePath) throws ParserConfigurationException, IOException, SAXException {
         File xmlFile = new File(filePath);
@@ -52,7 +53,7 @@ void getXmlPathDeepLinks(XMLLink xmlLink, Map<String, Object> parseTemplateMap,
                 }
                 List<String> xmlPathVarList = getVariablesFromString(String.valueOf(value));
                 for (String xmlPathVarStr : xmlPathVarList) {
-                    String xmlPathVar = getXmlPathVar(String.valueOf(xmlPathVarStr));
+                    String xmlPathVar = getXmlPath(String.valueOf(xmlPathVarStr));
                     xmlLink.attachLink(xmlPathVar.split("\\."), type);
                     if(deepLinks.size() == 0) {
                         deepLinks.add(xmlPathVar);
@@ -179,22 +180,18 @@ boolean startFillingMap(XMLLink xmlLink, Element element, Map<String, Object> ba
                 List<String> xmlPathVarList = getVariablesFromString(value.toString());
                 String resultValue = value.toString();
                 for (String xmlPathVar : xmlPathVarList) {
-                    if(xmlPathVar.equals("${"+xmlLink.getXMLPath()+"}")) {
-                        if(element == null) {
-                            resultValue = resultValue.replace(xmlPathVar, "");
-                        } else {
-                            resultValue = resultValue.replace(xmlPathVar, element.getTextContent());
-                            changed = true;
-                        }
 
-                    } else if(xmlPathVar.startsWith("${" + xmlLink.getXMLPath() + ":") && xmlPathVar.endsWith("}")) {
-                        if(element == null) {
-                            resultValue = resultValue.replace(xmlPathVar, "");
-                        } else {
-                            resultValue = resultValue.replace(xmlPathVar, element.getAttribute(getAttributeName(xmlPathVar)));
-                            changed = true;
-                        }
+                    if(!xmlLink.getXMLPath().equals(getXmlPath(xmlPathVar))) {
+                        //this xmlPath doesn't belong to xmlLink, skip it
+                        continue;
+                    }
 
+                    String replaceValue = getReplaceValue(element, xmlPathVar);
+                    if(replaceValue == null) {
+                        resultValue = resultValue.replace(xmlPathVar, "");
+                    } else {
+                        resultValue = resultValue.replace(xmlPathVar, replaceValue);
+                        changed = true;
                     }
                 }
                 dataMap.put(key, resultValue);
@@ -243,30 +240,68 @@ else if(value instanceof List) {
         return changed;
     }
 
+    String getReplaceValue(Element element, String xmlVar) {
+        String attributeName = getAttributeName(xmlVar);
+
+        if(getPatternMatchesFromString(xmlVar, PARSER_VARIABLE_PATTERN_EXISTS_FUNCTION).size() == 1) {
+            //exists function used for this variable
+            if(element == null) {
+                //neither xmlPath or attributeName exists
+                return Boolean.FALSE.toString();
+            } else if(attributeName == null) {
+                //variable doesn't ask for attribute name, so xmlPath exists
+                return Boolean.TRUE.toString();
+            } else {
+                //variable asking for attributeName
+                return String.valueOf(element.hasAttribute(attributeName));
+            }
+        } else {
+            //no function used, get value of xmlVar
+            if(element == null) {
+                return null;
+            } else if(attributeName == null) {
+                //variable doesn't ask for attribute name, so return element content
+                return element.getTextContent();
+            } else {
+                //variable asking for attributeName
+                return element.getAttribute(attributeName);
+            }
+        }
+    }
+
     /**
-     * For xmlPath like '${testsuite.testcase:name}', returns 'name'
-     * @param xmlPath
+     * For var like '${testsuite.testcase:name}', returns 'name'
+     * @param var
      * @return
      */
-    String getAttributeName(String xmlPath) {
-        String values[] = xmlPath.split(":");
+    String getAttributeName(String var) {
+        String values[] = getValueFromVariable(var).split(":");
         if(values.length == 1) {
             return null;
         }
-        String value = values[values.length - 1];
-        return value.substring(0, value.length()-1);
+        return values[1];
     }
 
     /**
-     * For xmlPath like '${testsuite.testcase:name}', returns 'testsuite.testcase'
-     * @param xmlPath
+     * For var like '${testsuite.testcase:name}', returns 'testsuite.testcase'
+     * @param var
      * @return
      */
-    String getXmlPathVar(String xmlPath) {
-        String values[] = xmlPath.split(":");
-        return values[0].replace("$", "").replace("{", "").replace("}", "");
+    String getXmlPath(String var) {
+        String values[] = getValueFromVariable(var).split(":");
+        return values[0];
     }
 
+    /**
+     * For var like ${testsuite.testcase:name}, returns 'testsuite.testcase:name'.
+     * Ex: ${exists(testsuite.testcase:name)}, returns 'testsuite.testcase:name'.
+     * @param var
+     * @return
+     */
+    String getValueFromVariable(String var) {
+        return var.replace("$", "").replace("{", "").replace("}", "") //basic variable
+                .replace("exists(", "").replace(")", ""); //exists function removal
+    }
 
     String joinString(String joinChar, int length, String[] list) {
         String value = list[0];
@@ -298,7 +333,11 @@ <T> T deepCopy(Object object) {
     }
 
     List<String> getVariablesFromString(String value) {
-        Pattern pattern = Pattern.compile(parserVariablePattern);
+        return getPatternMatchesFromString(value, PARSER_VARIABLE_PATTERN);
+    }
+
+    List<String> getPatternMatchesFromString(String value, String patternStr) {
+        Pattern pattern = Pattern.compile(patternStr);
         Matcher matcher = pattern.matcher(value);
         List<String> variables = new ArrayList<String>();
         while (matcher.find()) {