URI is not absolute when service name is not set

[cps.git] / cps-ncmp-service / src / test / groovy / org / onap / cps / ncmp / api / impl / operations / YangModelCmHandleRetrieverSpec.groovy

diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/operations/YangModelCmHandleRetrieverSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/operations/YangModelCmHandleRetrieverSpec.groovy
index bc30c9c..5ecc8b0 100644 (file)
--- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/operations/YangModelCmHandleRetrieverSpec.groovy
+++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/operations/YangModelCmHandleRetrieverSpec.groovy
@@ -54,7 +54,7 @@ class YangModelCmHandleRetrieverSpec extends Specification {
             def dataNode = new DataNode(childDataNodes:childDataNodes, leaves: leaves)
             mockCpsDataService.getDataNode('NCMP-Admin', 'ncmp-dmi-registry', xpath, INCLUDE_ALL_DESCENDANTS) >> dataNode
         when: 'retrieving the yang modelled cm handle'
-            def result = objectUnderTest.getDmiServiceNamesAndProperties(cmHandleId)
+            def result = objectUnderTest.getYangModelCmHandle(cmHandleId)
         then: 'the result has the correct id and service names'
             result.id == cmHandleId
             result.dmiServiceName == 'common service name'
@@ -73,10 +73,22 @@ class YangModelCmHandleRetrieverSpec extends Specification {
 
     def "Retrieve CmHandle using datanode with invalid CmHandle id."() {
         when: 'retrieving the yang modelled cm handle with an invalid id'
-            def result = objectUnderTest.getDmiServiceNamesAndProperties('cm handle id with spaces')
+            def result = objectUnderTest.getYangModelCmHandle('cm handle id with spaces')
         then: 'a data validation exception is thrown'
             thrown(DataValidationException)
         and: 'the result is not returned'
             result == null
     }
+
+    def "Handling missing service names as null CPS-1043."() {
+        given: 'the cps data service returns a data node from the DMI registry with empty child and leaf attributes'
+            def dataNode = new DataNode(childDataNodes:[], leaves: [:])
+            mockCpsDataService.getDataNode('NCMP-Admin', 'ncmp-dmi-registry', xpath, INCLUDE_ALL_DESCENDANTS) >> dataNode
+        when: 'retrieving the yang modelled cm handle'
+            def result = objectUnderTest.getYangModelCmHandle(cmHandleId)
+        then: 'the service names ae returned as null'
+            result.dmiServiceName == null
+            result.dmiDataServiceName == null
+            result.dmiModelServiceName == null
+    }
 }