Merge "[Cps Path Parser] Fixes for parent path & normalization"

2 files changed, 42 insertions, 20 deletions

diff --git a/cps-path-parser/src/test/groovy/org/onap/cps/cpspath/parser/CpsPathQuerySpec.groovy b/cps-path-parser/src/test/groovy/org/onap/cps/cpspath/parser/CpsPathQuerySpec.groovy
index d0df3c745a..16430d2fa5 100644
--- a/cps-path-parser/src/test/groovy/org/onap/cps/cpspath/parser/CpsPathQuerySpec.groovy
+++ b/cps-path-parser/src/test/groovy/org/onap/cps/cpspath/parser/CpsPathQuerySpec.groovy
@@ -91,13 +91,14 @@ class CpsPathQuerySpec extends Specification {
             'descendant with leaf condition has "<" operator'             | '//cps-path[@key<10]'                                          || "//cps-path[@key<'10']"
             'descendant with leaf condition has ">=" operator'            | '//cps-path[@key>=8]'                                          || "//cps-path[@key>='8']"
             'descendant with leaf condition has "<=" operator'            | '//cps-path[@key<=12]'                                         || "//cps-path[@key<='12']"
-            'descendant with leaf value and ancestor'                     | '//cps-path[@key=1]/ancestor:parent[@key=1]'                   || "//cps-path[@key='1']/ancestor:parent[@key='1']"
+            'descendant with leaf value and ancestor'                     | '//cps-path[@key=1]/ancestor::parent[@key=1]'                  || "//cps-path[@key='1']/ancestor::parent[@key='1']"
             'parent & child'                                              | '/parent/child'                                                || '/parent/child'
             'parent leaf of type Integer & child'                         | '/parent/child[@code=1]/child2'                                || "/parent/child[@code='1']/child2"
             'parent leaf with double quotes'                              | '/parent/child[@code="1"]/child2'                              || "/parent/child[@code='1']/child2"
             'parent leaf with double quotes inside single quotes'         | '/parent/child[@code=\'"1"\']/child2'                          || "/parent/child[@code='\"1\"']/child2"
             'parent leaf with single quotes inside double quotes'         | '/parent/child[@code="\'1\'"]/child2'                          || "/parent/child[@code='''1''']/child2"
             'leaf with single quotes inside double quotes'                | '/parent/child[@code="\'1\'"]'                                 || "/parent/child[@code='''1''']"
+            'leaf with single quotes inside single quotes'                | "/parent/child[@code='I''m quoted']"                           || "/parent/child[@code='I''m quoted']"
             'leaf with more than one attribute'                           | '/parent/child[@key1=1 and @key2="abc"]'                       || "/parent/child[@key1='1' and @key2='abc']"
             'parent & child with more than one attribute'                 | '/parent/child[@key1=1 and @key2="abc"]/child2'                || "/parent/child[@key1='1' and @key2='abc']/child2"
             'leaf with more than one attribute has OR operator'           | '/parent/child[@key1=1 or @key2="abc"]'                        || "/parent/child[@key1='1' or @key2='abc']"
diff --git a/cps-path-parser/src/test/groovy/org/onap/cps/cpspath/parser/CpsPathUtilSpec.groovy b/cps-path-parser/src/test/groovy/org/onap/cps/cpspath/parser/CpsPathUtilSpec.groovy
index d62f337b75..29bb3c7b58 100644
--- a/cps-path-parser/src/test/groovy/org/onap/cps/cpspath/parser/CpsPathUtilSpec.groovy
+++ b/cps-path-parser/src/test/groovy/org/onap/cps/cpspath/parser/CpsPathUtilSpec.groovy
@@ -1,6 +1,6 @@
 /*
  *  ============LICENSE_START=======================================================
- *  Copyright (C) 2022 Nordix Foundation
+ *  Copyright (C) 2022-2024 Nordix Foundation
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -36,21 +36,40 @@ class CpsPathUtilSpec extends Specification {
             'single quotes' | "/parent/child[@common-leaf-name='123']"
     }
 
-    def 'Normalized parent xpaths'() {
-        when: 'a given xpath with #scenario is parsed'
-            def result = CpsPathUtil.getNormalizedParentXpath(xpath)
+    def 'Normalized parent paths of absolute paths'() {
+        when: 'a given cps path is parsed'
+            def result = CpsPathUtil.getNormalizedParentXpath(cpsPath)
         then: 'the result is the expected parent path'
             assert result == expectedParentPath
-        where: 'the following xpaths are used'
-            scenario                         | xpath                                 || expectedParentPath
-            'no child'                       | '/parent'                             || ''
-            'child and parent'               | '/parent/child'                       || '/parent'
-            'grand child'                    | '/parent/child/grandChild'            || '/parent/child'
-            'parent & top is list element'   | '/parent[@id=1]/child'                || "/parent[@id='1']"
-            'parent is list element'         | '/parent/child[@id=1]/grandChild'     || "/parent/child[@id='1']"
-            'parent is list element with /'  | "/parent/child[@id='a/b']/grandChild" || "/parent/child[@id='a/b']"
-            'parent is list element with ['  | "/parent/child[@id='a[b']/grandChild" || "/parent/child[@id='a[b']"
-            'parent is list element using "' | '/parent/child[@id="x"]/grandChild'   || "/parent/child[@id='x']"
+        where: 'the following absolute cps paths are used'
+            cpsPath                               || expectedParentPath
+            '/parent'                             || ''
+            '/parent/child'                       || '/parent'
+            '/parent/child/grandChild'            || '/parent/child'
+            '/parent[@id=1]/child'                || "/parent[@id='1']"
+            '/parent/child[@id=1]/grandChild'     || "/parent/child[@id='1']"
+            '/parent/child/grandChild[@id="x"]'   || "/parent/child"
+            '/parent/ancestor::grandparent'       || ''
+            '/parent/child/ancestor::grandparent' || '/parent'
+            '/parent/child/name[text()="value"]'  || '/parent'
+    }
+
+    def 'Normalized parent paths of descendant paths'() {
+        when: 'a given cps path is parsed'
+            def result = CpsPathUtil.getNormalizedParentXpath(cpsPath)
+        then: 'the result is the expected parent path'
+            assert result == expectedParentPath
+        where: 'the following descendant cps paths are used'
+            cpsPath                                || expectedParentPath
+            '//parent'                             || ''
+            '//parent/child'                       || '//parent'
+            '//parent/child/grandChild'            || '//parent/child'
+            '//parent[@id=1]/child'                || "//parent[@id='1']"
+            '//parent/child[@id=1]/grandChild'     || "//parent/child[@id='1']"
+            '//parent/child/grandChild[@id="x"]'   || "//parent/child"
+            '//parent/ancestor::grandparent'       || ''
+            '//parent/child/ancestor::grandparent' || '//parent'
+            '//parent/child/name[text()="value"]'  || '//parent'
     }
 
     def 'Get node ID sequence for given xpath'() {
@@ -67,17 +86,19 @@ class CpsPathUtilSpec extends Specification {
             'parent is list element'         | '/parent/child[@id=1]/grandChild'     || ["parent","child","grandChild"]
             'parent is list element with /'  | "/parent/child[@id='a/b']/grandChild" || ["parent","child","grandChild"]
             'parent is list element with ['  | "/parent/child[@id='a[b']/grandChild" || ["parent","child","grandChild"]
+            'does not include ancestor node' | '/parent/child/ancestor::grandparent' || ["parent","child"]
     }
 
     def 'Recognizing (absolute) xpaths to List elements'() {
         expect: 'check for list returns the correct values'
             assert CpsPathUtil.isPathToListElement(xpath) == expectList
         where: 'the following xpaths are used'
-            xpath                  || expectList
-            '/parent[@id=1]'       || true
-            '/parent[@id=1]/child' || false
-            '/parent/child[@id=1]' || true
-            '//child[@id=1]'       || false
+            xpath                                  || expectList
+            '/parent[@id=1]'                       || true
+            '/parent[@id=1]/child'                 || false
+            '/parent/child[@id=1]'                 || true
+            '//child[@id=1]'                       || false
+            '/parent/ancestor::grandparent[@id=1]' || false
     }
 
     def 'Parsing Exception'() {