diff options
author | 2021-01-28 12:15:23 +0200 | |
---|---|---|
committer | 2021-01-28 16:28:56 +0200 | |
commit | c59254f9b7c604aa5f085e3f71971b6d67c70ba8 (patch) | |
tree | 2335ee7a3e701f5755fd10e3e091ad8d4cd04c41 /cps-service/src/test/groovy/org/onap | |
parent | b4164f104d61bcaff8d84d65b8a9fffcd3280dce (diff) |
Fix the datanode build logic (incorrect parsing of containers and mapped lists)
Issue-ID: CPS-198
Change-Id: Ideb89f777a1bc155603152991174680fad8bb513
Signed-off-by: Ruslan Kashapov <ruslan.kashapov@pantheon.tech>
Diffstat (limited to 'cps-service/src/test/groovy/org/onap')
-rw-r--r-- | cps-service/src/test/groovy/org/onap/cps/model/DataNodeBuilderSpec.groovy | 53 |
1 files changed, 42 insertions, 11 deletions
diff --git a/cps-service/src/test/groovy/org/onap/cps/model/DataNodeBuilderSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/model/DataNodeBuilderSpec.groovy index 0dbde889a..d881e77ad 100644 --- a/cps-service/src/test/groovy/org/onap/cps/model/DataNodeBuilderSpec.groovy +++ b/cps-service/src/test/groovy/org/onap/cps/model/DataNodeBuilderSpec.groovy @@ -1,6 +1,7 @@ package org.onap.cps.model import org.onap.cps.TestUtils +import org.onap.cps.spi.model.DataNode import org.onap.cps.spi.model.DataNodeBuilder import org.onap.cps.utils.YangUtils import org.onap.cps.yang.YangTextSchemaSourceSetBuilder @@ -8,22 +9,52 @@ import spock.lang.Specification class DataNodeBuilderSpec extends Specification { + Map<String, Map<String, Object>> expectedLeavesByXpathMap = [ + '/test-tree' : [], + '/test-tree/branch[@name=\'Left\']' : [name: 'Left'], + '/test-tree/branch[@name=\'Left\']/nest' : [name: 'Small', birds: ['Sparrow', 'Robin', 'Finch']], + '/test-tree/branch[@name=\'Right\']' : [name: 'Right'], + '/test-tree/branch[@name=\'Right\']/nest': [name: 'Big', birds: ['Owl', 'Raven', 'Crow']] + ] + def 'Converting Normalized Node (tree) to a DataNode (tree).'() { given: 'a Yang module' - def yangResourceNameToContent = TestUtils.getYangResourcesAsMap('bookstore.yang') - def schemaContext = YangTextSchemaSourceSetBuilder.of(yangResourceNameToContent)getSchemaContext() + def yangResourceNameToContent = TestUtils.getYangResourcesAsMap('test-tree.yang') + def schemaContext = YangTextSchemaSourceSetBuilder.of(yangResourceNameToContent) getSchemaContext() and: 'a normalized node for that model' - def jsonData = TestUtils.getResourceFileContent('bookstore.json') + def jsonData = TestUtils.getResourceFileContent('test-tree.json') def normalizedNode = YangUtils.parseJsonData(jsonData, schemaContext) when: 'the normalized node is converted to a DataNode (tree)' def result = new DataNodeBuilder().withNormalizedNodeTree(normalizedNode).build() - then: 'the system creates a (root) fragment without a parent and 2 children (categories)' - result.childDataNodes.size() == 2 - and: 'each child (category) has the root fragment (result) as parent and in turn as 1 child (a list of books)' - result.childDataNodes.each { it.childDataNodes.size() == 1 } - and: 'the fragments have the correct xpaths' - assert result.xpath == '/bookstore' - assert result.childDataNodes.collect { it.xpath } - .containsAll(["/bookstore/categories[@code='01']", "/bookstore/categories[@code='02']"]) + def mappedResult = treeToFlatMapByXpath(new HashMap<>(), result) + then: '5 DataNode objects with unique xpath were created in total' + mappedResult.size() == 5 + and: 'all expected xpaths were built' + mappedResult.keySet().containsAll(expectedLeavesByXpathMap.keySet()) + and: 'each data node contains the expected attributes' + mappedResult.each { + xpath, dataNode -> assertLeavesMaps(dataNode.getLeaves(), expectedLeavesByXpathMap[xpath]) + } + } + + def static assertLeavesMaps(actualLeavesMap, expectedLeavesMap) { + expectedLeavesMap.each { key, value -> + { + def actualValue = actualLeavesMap[key] + if (value instanceof Collection<?> && actualValue instanceof Collection<?>) { + assert value.size() == actualValue.size() + assert value.containsAll(actualValue) + } else { + assert value == actualValue + } + } + } + } + + def treeToFlatMapByXpath(Map<String, DataNode> flatMap, DataNode dataNodeTree) { + flatMap.put(dataNodeTree.getXpath(), dataNodeTree) + dataNodeTree.getChildDataNodes() + .forEach(childDataNode -> treeToFlatMapByXpath(flatMap, childDataNode)) + return flatMap } } |