X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cps-ri%2Fsrc%2Ftest%2Fgroovy%2Forg%2Fonap%2Fcps%2Fspi%2Fquery%2FCpsPathQuerySpec.groovy;h=708761326b371e7185c8c95da609b95bed3b72f9;hb=50130c04626e0c5b09b344b2e11bb99c62dbf926;hp=1e457fb0621f0e67a79763e36d88efc89cb2bbb2;hpb=333f2b5a7a54f325a8d7137e6b8c0502fc860441;p=cps.git

diff --git a/cps-ri/src/test/groovy/org/onap/cps/spi/query/CpsPathQuerySpec.groovy b/cps-ri/src/test/groovy/org/onap/cps/spi/query/CpsPathQuerySpec.groovy
index 1e457fb06..708761326 100644
--- a/cps-ri/src/test/groovy/org/onap/cps/spi/query/CpsPathQuerySpec.groovy
+++ b/cps-ri/src/test/groovy/org/onap/cps/spi/query/CpsPathQuerySpec.groovy
@@ -28,28 +28,45 @@ class CpsPathQuerySpec extends Specification {
     def objectUnderTest = new CpsPathQuery()
 
     @Unroll
-    def 'Parse cps path with valid cps path and a filter for a leaf of type : #type.'()
-    {   when: 'the given cps path is parsed'
-        def result = objectUnderTest.createFrom(cpsPath)
-        then: 'object has the expected attribute'
+    def 'Parse cps path with valid cps path and a filter for a leaf of type : #type.'() {
+        when: 'the given cps path is parsed'
+            def result = objectUnderTest.createFrom(cpsPath)
+        then: 'the query has the right type'
+            result.cpsPathQueryType == CpsPathQueryType.XPATH_LEAF_VALUE
+        and: 'the right query parameters are set'
             result.xpathPrefix == '/parent-200/child-202'
             result.leafName == expectedLeafName
             result.leafValue == expectedLeafValue
         where: 'the following data is used'
-            type      | cpsPath                                                          || expectedLeafName       | expectedLeafValue
-            'String'  | '/parent-200/child-202[@common-leaf-name=\'common-leaf-value\']' || 'common-leaf-name'     | 'common-leaf-value'
-            'Integer' | '/parent-200/child-202[@common-leaf-name-int=5]'                 || 'common-leaf-name-int' | 5
+            type                        | cpsPath                                                          || expectedLeafName       | expectedLeafValue
+            'String'                    | '/parent-200/child-202[@common-leaf-name=\'common-leaf-value\']' || 'common-leaf-name'     | 'common-leaf-value'
+            'Integer'                   | '/parent-200/child-202[@common-leaf-name-int=5]'                 || 'common-leaf-name-int' | 5
+            'Integer value with spaces' | '/parent-200/child-202[@common-leaf-name-int = 5]'               || 'common-leaf-name-int' | 5
     }
 
     @Unroll
-    def 'Parse cps path with : #scenario.'()
-    {   when: 'the given cps path is parsed'
+    def 'Parse cps path of type ends with a #scenario.'() {
+        when: 'the given cps path is parsed'
+            def result = objectUnderTest.createFrom(cpsPath)
+        then: 'the query has the right type'
+            result.cpsPathQueryType == CpsPathQueryType.XPATH_ENDS_WITH
+        and: 'the right ends with parameters are set'
+            result.endsWith == expectedEndsWithValue
+        where: 'the following data is used'
+            scenario         | cpsPath                   || expectedEndsWithValue
+            'yang container' | '///cps-path'             || '/cps-path'
+            'yang list'      | '///cps-path[@key=value]' || '/cps-path[@key=value]'
+    }
+
+    @Unroll
+    def 'Parse cps path with #scenario.'() {
+        when: 'the given cps path is parsed'
             objectUnderTest.createFrom(cpsPath)
         then: 'a CpsPathException is thrown'
             thrown(CpsPathException)
         where: 'the following data is used'
-            scenario                    | cpsPath
-            'invalid cps path'          | 'invalid-cps-path'
-            'cps path with float value' | '/parent-200/child-202[@common-leaf-name-float=5.0]'
+            scenario            | cpsPath
+            'no / at the start' | 'invalid-cps-path/child'
+            'float value'       | '/parent-200/child-202[@common-leaf-name-float=5.0]'
     }
 }