From: Šimon Ukuš Date: Mon, 26 Jun 2023 11:29:11 +0000 (+0200) Subject: Remove TestData and move fields to user X-Git-Tag: v7.0.0~851 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=83885bf7f9846676772dbf5c34aa8165a94aac6c;p=netconf.git Remove TestData and move fields to user The sole purpose of TestData was to hold constants of ReadDataTransactionUtilTest. This change moves all the constants to the ReadDataTransactionUtilTest and removes the TestData. JIRA: NETCONF-1063 Change-Id: I3104c33a2f2b5284b99ea52c93e4504c6df42b33 Signed-off-by: Šimon Ukuš --- diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtilTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtilTest.java index 67e5d37210..b9d54cd174 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtilTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtilTest.java @@ -34,12 +34,17 @@ import org.opendaylight.restconf.nb.rfc8040.rests.transactions.RestconfStrategy; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; +import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode; +import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode; +import org.opendaylight.yangtools.yang.data.api.schema.UserMapNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; @@ -47,7 +52,122 @@ import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class ReadDataTransactionUtilTest { - private static final TestData DATA = new TestData(); + private static final QName BASE = QName.create("ns", "2016-02-28", "base"); + private static final QName LIST_KEY_QNAME = QName.create(BASE, "list-key"); + private static final QName LEAF_LIST_QNAME = QName.create(BASE, "leaf-list"); + private static final QName LIST_QNAME = QName.create(BASE, "list"); + private static final NodeIdentifierWithPredicates NODE_WITH_KEY = + NodeIdentifierWithPredicates.of(LIST_QNAME, LIST_KEY_QNAME, "keyValue"); + private static final NodeIdentifierWithPredicates NODE_WITH_KEY_2 = + NodeIdentifierWithPredicates.of(LIST_QNAME, LIST_KEY_QNAME, "keyValue2"); + private static final LeafNode CONTENT = Builders.leafBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(BASE, "leaf-content"))) + .withValue("content") + .build(); + private static final LeafNode CONTENT_2 = Builders.leafBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(BASE, "leaf-content-different"))) + .withValue("content-different") + .build(); + private static final YangInstanceIdentifier PATH = YangInstanceIdentifier.builder() + .node(QName.create(BASE, "cont")) + .node(LIST_QNAME) + .node(NODE_WITH_KEY) + .build(); + private static final YangInstanceIdentifier PATH_2 = YangInstanceIdentifier.builder() + .node(QName.create(BASE, "cont")) + .node(LIST_QNAME) + .node(NODE_WITH_KEY_2) + .build(); + private static final YangInstanceIdentifier PATH_3 = YangInstanceIdentifier.builder() + .node(QName.create(BASE, "cont")) + .node(LIST_QNAME) + .build(); + private static final MapEntryNode DATA = Builders.mapEntryBuilder() + .withNodeIdentifier(NODE_WITH_KEY) + .withChild(CONTENT) + .build(); + private static final MapEntryNode DATA_2 = Builders.mapEntryBuilder() + .withNodeIdentifier(NODE_WITH_KEY) + .withChild(CONTENT_2) + .build(); + private static final LeafNode CONTENT_LEAF = Builders.leafBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(BASE, "content"))) + .withValue("test") + .build(); + private static final LeafNode CONTENT_LEAF_2 = Builders.leafBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(BASE, "content2"))) + .withValue("test2") + .build(); + private static final ContainerNode DATA_3 = Builders.containerBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(BASE, "container"))) + .withChild(CONTENT_LEAF) + .build(); + private static final ContainerNode DATA_4 = Builders.containerBuilder() + .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(BASE, "container2"))) + .withChild(CONTENT_LEAF_2) + .build(); + private static final MapNode LIST_DATA = Builders.mapBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(LIST_QNAME, "list"))) + .withChild(DATA) + .build(); + private static final MapNode LIST_DATA_2 = Builders.mapBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(LIST_QNAME, "list"))) + .withChild(DATA) + .withChild(DATA_2) + .build(); + private static final UserMapNode ORDERED_MAP_NODE_1 = Builders.orderedMapBuilder() + .withNodeIdentifier(new NodeIdentifier(LIST_QNAME)) + .withChild(DATA) + .build(); + private static final UserMapNode ORDERED_MAP_NODE_2 = Builders.orderedMapBuilder() + .withNodeIdentifier(new NodeIdentifier(LIST_QNAME)) + .withChild(DATA) + .withChild(DATA_2) + .build(); + private static final MapEntryNode CHECK_DATA = Builders.mapEntryBuilder() + .withNodeIdentifier(NODE_WITH_KEY) + .withChild(CONTENT_2) + .withChild(CONTENT) + .build(); + private static final LeafSetNode LEAF_SET_NODE_1 = Builders.leafSetBuilder() + .withNodeIdentifier(new NodeIdentifier(LEAF_LIST_QNAME)) + .withChildValue("one") + .withChildValue("two") + .build(); + private static final LeafSetNode LEAF_SET_NODE_2 = Builders.leafSetBuilder() + .withNodeIdentifier(new NodeIdentifier(LEAF_LIST_QNAME)) + .withChildValue("three") + .build(); + private static final LeafSetNode ORDERED_LEAF_SET_NODE_1 = Builders.orderedLeafSetBuilder() + .withNodeIdentifier(new NodeIdentifier(LEAF_LIST_QNAME)) + .withChildValue("one") + .withChildValue("two") + .build(); + private static final LeafSetNode ORDERED_LEAF_SET_NODE_2 = Builders.orderedLeafSetBuilder() + .withNodeIdentifier(new NodeIdentifier(LEAF_LIST_QNAME)) + .withChildValue("three") + .withChildValue("four") + .build(); + private static final YangInstanceIdentifier LEAF_SET_NODE_PATH = YangInstanceIdentifier.builder() + .node(QName.create(BASE, "cont")) + .node(LEAF_LIST_QNAME) + .build(); + private static final UnkeyedListEntryNode UNKEYED_LIST_ENTRY_NODE_1 = Builders.unkeyedListEntryBuilder() + .withNodeIdentifier(new NodeIdentifier(LIST_QNAME)) + .withChild(CONTENT) + .build(); + private static final UnkeyedListEntryNode UNKEYED_LIST_ENTRY_NODE_2 = Builders.unkeyedListEntryBuilder() + .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(LIST_QNAME)) + .withChild(CONTENT_2) + .build(); + private static final UnkeyedListNode UNKEYED_LIST_NODE_1 = Builders.unkeyedListBuilder() + .withNodeIdentifier(new NodeIdentifier(LIST_QNAME)) + .withChild(UNKEYED_LIST_ENTRY_NODE_1) + .build(); + private static final UnkeyedListNode UNKEYED_LIST_NODE_2 = Builders.unkeyedListBuilder() + .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(LIST_QNAME)) + .withChild(UNKEYED_LIST_ENTRY_NODE_2) + .build(); private static final NodeIdentifier NODE_IDENTIFIER = new NodeIdentifier(QName.create("ns", "2016-02-28", "container")); @@ -76,84 +196,84 @@ public class ReadDataTransactionUtilTest { @Test public void readDataConfigTest() { - doReturn(immediateFluentFuture(Optional.of(DATA.data3))).when(read) - .read(LogicalDatastoreType.CONFIGURATION, DATA.path); - doReturn(immediateFluentFuture(Optional.of(DATA.data3))).when(netconfService).getConfig(DATA.path); - NormalizedNode normalizedNode = readData(ContentParam.CONFIG, DATA.path, mdsalStrategy); - assertEquals(DATA.data3, normalizedNode); - - normalizedNode = readData(ContentParam.CONFIG, DATA.path, netconfStrategy); - assertEquals(DATA.data3, normalizedNode); + doReturn(immediateFluentFuture(Optional.of(DATA_3))).when(read) + .read(LogicalDatastoreType.CONFIGURATION, PATH); + doReturn(immediateFluentFuture(Optional.of(DATA_3))).when(netconfService).getConfig(PATH); + NormalizedNode normalizedNode = readData(ContentParam.CONFIG, PATH, mdsalStrategy); + assertEquals(DATA_3, normalizedNode); + + normalizedNode = readData(ContentParam.CONFIG, PATH, netconfStrategy); + assertEquals(DATA_3, normalizedNode); } @Test public void readAllHavingOnlyConfigTest() { - doReturn(immediateFluentFuture(Optional.of(DATA.data3))).when(read) - .read(LogicalDatastoreType.CONFIGURATION, DATA.path); + doReturn(immediateFluentFuture(Optional.of(DATA_3))).when(read) + .read(LogicalDatastoreType.CONFIGURATION, PATH); doReturn(immediateFluentFuture(Optional.empty())).when(read) - .read(LogicalDatastoreType.OPERATIONAL, DATA.path); - doReturn(immediateFluentFuture(Optional.of(DATA.data3))).when(netconfService).getConfig(DATA.path); - doReturn(immediateFluentFuture(Optional.empty())).when(netconfService).get(DATA.path); - NormalizedNode normalizedNode = readData(ContentParam.ALL, DATA.path, mdsalStrategy); - assertEquals(DATA.data3, normalizedNode); - - normalizedNode = readData(ContentParam.ALL, DATA.path, netconfStrategy); - assertEquals(DATA.data3, normalizedNode); + .read(LogicalDatastoreType.OPERATIONAL, PATH); + doReturn(immediateFluentFuture(Optional.of(DATA_3))).when(netconfService).getConfig(PATH); + doReturn(immediateFluentFuture(Optional.empty())).when(netconfService).get(PATH); + NormalizedNode normalizedNode = readData(ContentParam.ALL, PATH, mdsalStrategy); + assertEquals(DATA_3, normalizedNode); + + normalizedNode = readData(ContentParam.ALL, PATH, netconfStrategy); + assertEquals(DATA_3, normalizedNode); } @Test public void readAllHavingOnlyNonConfigTest() { - doReturn(immediateFluentFuture(Optional.of(DATA.data2))).when(read) - .read(LogicalDatastoreType.OPERATIONAL, DATA.path2); + doReturn(immediateFluentFuture(Optional.of(DATA_2))).when(read) + .read(LogicalDatastoreType.OPERATIONAL, PATH_2); doReturn(immediateFluentFuture(Optional.empty())).when(read) - .read(LogicalDatastoreType.CONFIGURATION, DATA.path2); - doReturn(immediateFluentFuture(Optional.of(DATA.data2))).when(netconfService).get(DATA.path2); - doReturn(immediateFluentFuture(Optional.empty())).when(netconfService).getConfig(DATA.path2); - NormalizedNode normalizedNode = readData(ContentParam.ALL, DATA.path2, mdsalStrategy); - assertEquals(DATA.data2, normalizedNode); - - normalizedNode = readData(ContentParam.ALL, DATA.path2, netconfStrategy); - assertEquals(DATA.data2, normalizedNode); + .read(LogicalDatastoreType.CONFIGURATION, PATH_2); + doReturn(immediateFluentFuture(Optional.of(DATA_2))).when(netconfService).get(PATH_2); + doReturn(immediateFluentFuture(Optional.empty())).when(netconfService).getConfig(PATH_2); + NormalizedNode normalizedNode = readData(ContentParam.ALL, PATH_2, mdsalStrategy); + assertEquals(DATA_2, normalizedNode); + + normalizedNode = readData(ContentParam.ALL, PATH_2, netconfStrategy); + assertEquals(DATA_2, normalizedNode); } @Test public void readDataNonConfigTest() { - doReturn(immediateFluentFuture(Optional.of(DATA.data2))).when(read) - .read(LogicalDatastoreType.OPERATIONAL, DATA.path2); - doReturn(immediateFluentFuture(Optional.of(DATA.data2))).when(netconfService).get(DATA.path2); - NormalizedNode normalizedNode = readData(ContentParam.NONCONFIG, DATA.path2, mdsalStrategy); - assertEquals(DATA.data2, normalizedNode); - - normalizedNode = readData(ContentParam.NONCONFIG, DATA.path2, netconfStrategy); - assertEquals(DATA.data2, normalizedNode); + doReturn(immediateFluentFuture(Optional.of(DATA_2))).when(read) + .read(LogicalDatastoreType.OPERATIONAL, PATH_2); + doReturn(immediateFluentFuture(Optional.of(DATA_2))).when(netconfService).get(PATH_2); + NormalizedNode normalizedNode = readData(ContentParam.NONCONFIG, PATH_2, mdsalStrategy); + assertEquals(DATA_2, normalizedNode); + + normalizedNode = readData(ContentParam.NONCONFIG, PATH_2, netconfStrategy); + assertEquals(DATA_2, normalizedNode); } @Test public void readContainerDataAllTest() { - doReturn(immediateFluentFuture(Optional.of(DATA.data3))).when(read) - .read(LogicalDatastoreType.CONFIGURATION, DATA.path); - doReturn(immediateFluentFuture(Optional.of(DATA.data4))).when(read) - .read(LogicalDatastoreType.OPERATIONAL, DATA.path); - doReturn(immediateFluentFuture(Optional.of(DATA.data3))).when(netconfService).getConfig(DATA.path); - doReturn(immediateFluentFuture(Optional.of(DATA.data4))).when(netconfService).get(DATA.path); + doReturn(immediateFluentFuture(Optional.of(DATA_3))).when(read) + .read(LogicalDatastoreType.CONFIGURATION, PATH); + doReturn(immediateFluentFuture(Optional.of(DATA_4))).when(read) + .read(LogicalDatastoreType.OPERATIONAL, PATH); + doReturn(immediateFluentFuture(Optional.of(DATA_3))).when(netconfService).getConfig(PATH); + doReturn(immediateFluentFuture(Optional.of(DATA_4))).when(netconfService).get(PATH); final ContainerNode checkingData = Builders .containerBuilder() .withNodeIdentifier(NODE_IDENTIFIER) - .withChild(DATA.contentLeaf) - .withChild(DATA.contentLeaf2) + .withChild(CONTENT_LEAF) + .withChild(CONTENT_LEAF_2) .build(); - NormalizedNode normalizedNode = readData(ContentParam.ALL, DATA.path, mdsalStrategy); + NormalizedNode normalizedNode = readData(ContentParam.ALL, PATH, mdsalStrategy); assertEquals(checkingData, normalizedNode); - normalizedNode = readData(ContentParam.ALL, DATA.path, netconfStrategy); + normalizedNode = readData(ContentParam.ALL, PATH, netconfStrategy); assertEquals(checkingData, normalizedNode); } @Test public void readLeafWithDefaultParameters() { final ContainerNode content = Builders.containerBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create(DATA.base, "cont"))) - .withChild(ImmutableNodes.leafNode(QName.create(DATA.base, "exampleLeaf"), "i am leaf")) + .withNodeIdentifier(new NodeIdentifier(QName.create(BASE, "cont"))) + .withChild(ImmutableNodes.leafNode(QName.create(BASE, "exampleLeaf"), "i am leaf")) .build(); final YangInstanceIdentifier path = YangInstanceIdentifier.builder().node(content.name()).build(); @@ -170,12 +290,12 @@ public class ReadDataTransactionUtilTest { @Test public void readContainerWithDefaultParameters() { - final QName leafBool = QName.create(DATA.base, "leafBool"); - final QName containerBool = QName.create(DATA.base, "containerBool"); - final QName containerInt = QName.create(DATA.base, "containerInt"); - final QName leafInt = QName.create(DATA.base, "leafInt"); - final QName exampleList = QName.create(DATA.base, "exampleList"); - final QName cont = QName.create(DATA.base, "cont"); + final QName leafBool = QName.create(BASE, "leafBool"); + final QName containerBool = QName.create(BASE, "containerBool"); + final QName containerInt = QName.create(BASE, "containerInt"); + final QName leafInt = QName.create(BASE, "leafInt"); + final QName exampleList = QName.create(BASE, "exampleList"); + final QName cont = QName.create(BASE, "cont"); final ContainerNode content = Builders.containerBuilder() .withNodeIdentifier(new NodeIdentifier(cont)) @@ -210,14 +330,14 @@ public class ReadDataTransactionUtilTest { @Test public void readLeafInListWithDefaultParameters() { - final QName leafInList = QName.create(DATA.base, "leafInList"); - final QName exampleList = QName.create(DATA.base, "exampleList"); - final QName container = QName.create(DATA.base, "cont"); + final QName leafInList = QName.create(BASE, "leafInList"); + final QName exampleList = QName.create(BASE, "exampleList"); + final QName container = QName.create(BASE, "cont"); final ContainerNode content = Builders.containerBuilder() .withNodeIdentifier(new NodeIdentifier(container)) .withChild(Builders.unkeyedListBuilder() - .withNodeIdentifier(NodeIdentifier.create(QName.create(DATA.base, "exampleList"))) + .withNodeIdentifier(NodeIdentifier.create(QName.create(BASE, "exampleList"))) .withChild(Builders.unkeyedListEntryBuilder() .withNodeIdentifier(new NodeIdentifier(exampleList)) .addChild(ImmutableNodes.leafNode(leafInList, "I am leaf in list")) @@ -239,147 +359,147 @@ public class ReadDataTransactionUtilTest { @Test public void readContainerDataConfigNoValueOfContentTest() { - doReturn(immediateFluentFuture(Optional.of(DATA.data3))).when(read) - .read(LogicalDatastoreType.CONFIGURATION, DATA.path); - doReturn(immediateFluentFuture(Optional.of(DATA.data4))).when(read) - .read(LogicalDatastoreType.OPERATIONAL, DATA.path); - doReturn(immediateFluentFuture(Optional.of(DATA.data3))).when(netconfService).getConfig(DATA.path); - doReturn(immediateFluentFuture(Optional.of(DATA.data4))).when(netconfService).get(DATA.path); + doReturn(immediateFluentFuture(Optional.of(DATA_3))).when(read) + .read(LogicalDatastoreType.CONFIGURATION, PATH); + doReturn(immediateFluentFuture(Optional.of(DATA_4))).when(read) + .read(LogicalDatastoreType.OPERATIONAL, PATH); + doReturn(immediateFluentFuture(Optional.of(DATA_3))).when(netconfService).getConfig(PATH); + doReturn(immediateFluentFuture(Optional.of(DATA_4))).when(netconfService).get(PATH); final ContainerNode checkingData = Builders .containerBuilder() .withNodeIdentifier(NODE_IDENTIFIER) - .withChild(DATA.contentLeaf) - .withChild(DATA.contentLeaf2) + .withChild(CONTENT_LEAF) + .withChild(CONTENT_LEAF_2) .build(); - NormalizedNode normalizedNode = readData(ContentParam.ALL, DATA.path, mdsalStrategy); + NormalizedNode normalizedNode = readData(ContentParam.ALL, PATH, mdsalStrategy); assertEquals(checkingData, normalizedNode); - normalizedNode = readData(ContentParam.ALL, DATA.path, netconfStrategy); + normalizedNode = readData(ContentParam.ALL, PATH, netconfStrategy); assertEquals(checkingData, normalizedNode); } @Test public void readListDataAllTest() { - doReturn(immediateFluentFuture(Optional.of(DATA.listData))).when(read) - .read(LogicalDatastoreType.OPERATIONAL, DATA.path3); - doReturn(immediateFluentFuture(Optional.of(DATA.listData2))).when(read) - .read(LogicalDatastoreType.CONFIGURATION, DATA.path3); - doReturn(immediateFluentFuture(Optional.of(DATA.listData))).when(netconfService).get(DATA.path3); - doReturn(immediateFluentFuture(Optional.of(DATA.listData2))).when(netconfService).getConfig(DATA.path3); + doReturn(immediateFluentFuture(Optional.of(LIST_DATA))).when(read) + .read(LogicalDatastoreType.OPERATIONAL, PATH_3); + doReturn(immediateFluentFuture(Optional.of(LIST_DATA_2))).when(read) + .read(LogicalDatastoreType.CONFIGURATION, PATH_3); + doReturn(immediateFluentFuture(Optional.of(LIST_DATA))).when(netconfService).get(PATH_3); + doReturn(immediateFluentFuture(Optional.of(LIST_DATA_2))).when(netconfService).getConfig(PATH_3); final MapNode checkingData = Builders .mapBuilder() .withNodeIdentifier(new NodeIdentifier(QName.create("ns", "2016-02-28", "list"))) - .withChild(DATA.checkData) + .withChild(CHECK_DATA) .build(); - NormalizedNode normalizedNode = readData(ContentParam.ALL, DATA.path3, mdsalStrategy); + NormalizedNode normalizedNode = readData(ContentParam.ALL, PATH_3, mdsalStrategy); assertEquals(checkingData, normalizedNode); - normalizedNode = readData(ContentParam.ALL, DATA.path3, netconfStrategy); + normalizedNode = readData(ContentParam.ALL, PATH_3, netconfStrategy); assertEquals(checkingData, normalizedNode); } @Test public void readOrderedListDataAllTest() { - doReturn(immediateFluentFuture(Optional.of(DATA.orderedMapNode1))).when(read) - .read(LogicalDatastoreType.OPERATIONAL, DATA.path3); - doReturn(immediateFluentFuture(Optional.of(DATA.orderedMapNode2))).when(read) - .read(LogicalDatastoreType.CONFIGURATION, DATA.path3); - doReturn(immediateFluentFuture(Optional.of(DATA.orderedMapNode1))).when(netconfService).get(DATA.path3); - doReturn(immediateFluentFuture(Optional.of(DATA.orderedMapNode2))).when(netconfService) - .getConfig(DATA.path3); + doReturn(immediateFluentFuture(Optional.of(ORDERED_MAP_NODE_1))).when(read) + .read(LogicalDatastoreType.OPERATIONAL, PATH_3); + doReturn(immediateFluentFuture(Optional.of(ORDERED_MAP_NODE_2))).when(read) + .read(LogicalDatastoreType.CONFIGURATION, PATH_3); + doReturn(immediateFluentFuture(Optional.of(ORDERED_MAP_NODE_1))).when(netconfService).get(PATH_3); + doReturn(immediateFluentFuture(Optional.of(ORDERED_MAP_NODE_2))).when(netconfService) + .getConfig(PATH_3); final MapNode expectedData = Builders.orderedMapBuilder() - .withNodeIdentifier(new NodeIdentifier(DATA.listQname)) - .withChild(DATA.checkData) + .withNodeIdentifier(new NodeIdentifier(LIST_QNAME)) + .withChild(CHECK_DATA) .build(); - NormalizedNode normalizedNode = readData(ContentParam.ALL, DATA.path3, + NormalizedNode normalizedNode = readData(ContentParam.ALL, PATH_3, mdsalStrategy); assertEquals(expectedData, normalizedNode); - normalizedNode = readData(ContentParam.ALL, DATA.path3, netconfStrategy); + normalizedNode = readData(ContentParam.ALL, PATH_3, netconfStrategy); assertEquals(expectedData, normalizedNode); } @Test public void readUnkeyedListDataAllTest() { - doReturn(immediateFluentFuture(Optional.of(DATA.unkeyedListNode1))).when(read) - .read(LogicalDatastoreType.OPERATIONAL, DATA.path3); - doReturn(immediateFluentFuture(Optional.of(DATA.unkeyedListNode2))).when(read) - .read(LogicalDatastoreType.CONFIGURATION, DATA.path3); - doReturn(immediateFluentFuture(Optional.of(DATA.unkeyedListNode1))).when(netconfService).get(DATA.path3); - doReturn(immediateFluentFuture(Optional.of(DATA.unkeyedListNode2))).when(netconfService) - .getConfig(DATA.path3); + doReturn(immediateFluentFuture(Optional.of(UNKEYED_LIST_NODE_1))).when(read) + .read(LogicalDatastoreType.OPERATIONAL, PATH_3); + doReturn(immediateFluentFuture(Optional.of(UNKEYED_LIST_NODE_2))).when(read) + .read(LogicalDatastoreType.CONFIGURATION, PATH_3); + doReturn(immediateFluentFuture(Optional.of(UNKEYED_LIST_NODE_1))).when(netconfService).get(PATH_3); + doReturn(immediateFluentFuture(Optional.of(UNKEYED_LIST_NODE_2))).when(netconfService) + .getConfig(PATH_3); final UnkeyedListNode expectedData = Builders.unkeyedListBuilder() - .withNodeIdentifier(new NodeIdentifier(DATA.listQname)) + .withNodeIdentifier(new NodeIdentifier(LIST_QNAME)) .withChild(Builders.unkeyedListEntryBuilder() - .withNodeIdentifier(new NodeIdentifier(DATA.listQname)) - .withChild(DATA.unkeyedListEntryNode1.body().iterator().next()) - .withChild(DATA.unkeyedListEntryNode2.body().iterator().next()).build()).build(); - NormalizedNode normalizedNode = readData(ContentParam.ALL, DATA.path3, mdsalStrategy); + .withNodeIdentifier(new NodeIdentifier(LIST_QNAME)) + .withChild(UNKEYED_LIST_ENTRY_NODE_1.body().iterator().next()) + .withChild(UNKEYED_LIST_ENTRY_NODE_2.body().iterator().next()).build()).build(); + NormalizedNode normalizedNode = readData(ContentParam.ALL, PATH_3, mdsalStrategy); assertEquals(expectedData, normalizedNode); - normalizedNode = readData(ContentParam.ALL, DATA.path3, netconfStrategy); + normalizedNode = readData(ContentParam.ALL, PATH_3, netconfStrategy); assertEquals(expectedData, normalizedNode); } @Test public void readLeafListDataAllTest() { - doReturn(immediateFluentFuture(Optional.of(DATA.leafSetNode1))).when(read) - .read(LogicalDatastoreType.OPERATIONAL, DATA.leafSetNodePath); - doReturn(immediateFluentFuture(Optional.of(DATA.leafSetNode2))).when(read) - .read(LogicalDatastoreType.CONFIGURATION, DATA.leafSetNodePath); - doReturn(immediateFluentFuture(Optional.of(DATA.leafSetNode1))).when(netconfService) - .get(DATA.leafSetNodePath); - doReturn(immediateFluentFuture(Optional.of(DATA.leafSetNode2))).when(netconfService) - .getConfig(DATA.leafSetNodePath); + doReturn(immediateFluentFuture(Optional.of(LEAF_SET_NODE_1))).when(read) + .read(LogicalDatastoreType.OPERATIONAL, LEAF_SET_NODE_PATH); + doReturn(immediateFluentFuture(Optional.of(LEAF_SET_NODE_2))).when(read) + .read(LogicalDatastoreType.CONFIGURATION, LEAF_SET_NODE_PATH); + doReturn(immediateFluentFuture(Optional.of(LEAF_SET_NODE_1))).when(netconfService) + .get(LEAF_SET_NODE_PATH); + doReturn(immediateFluentFuture(Optional.of(LEAF_SET_NODE_2))).when(netconfService) + .getConfig(LEAF_SET_NODE_PATH); final LeafSetNode expectedData = Builders.leafSetBuilder() - .withNodeIdentifier(new NodeIdentifier(DATA.leafListQname)) + .withNodeIdentifier(new NodeIdentifier(LEAF_LIST_QNAME)) .withValue(ImmutableList.>builder() - .addAll(DATA.leafSetNode1.body()) - .addAll(DATA.leafSetNode2.body()) + .addAll(LEAF_SET_NODE_1.body()) + .addAll(LEAF_SET_NODE_2.body()) .build()) .build(); - NormalizedNode normalizedNode = readData(ContentParam.ALL, DATA.leafSetNodePath, + NormalizedNode normalizedNode = readData(ContentParam.ALL, LEAF_SET_NODE_PATH, mdsalStrategy); assertEquals(expectedData, normalizedNode); - normalizedNode = readData(ContentParam.ALL, DATA.leafSetNodePath, netconfStrategy); + normalizedNode = readData(ContentParam.ALL, LEAF_SET_NODE_PATH, netconfStrategy); assertEquals(expectedData, normalizedNode); } @Test public void readOrderedLeafListDataAllTest() { - doReturn(immediateFluentFuture(Optional.of(DATA.orderedLeafSetNode1))).when(read) - .read(LogicalDatastoreType.OPERATIONAL, DATA.leafSetNodePath); - doReturn(immediateFluentFuture(Optional.of(DATA.orderedLeafSetNode2))).when(read) - .read(LogicalDatastoreType.CONFIGURATION, DATA.leafSetNodePath); - doReturn(immediateFluentFuture(Optional.of(DATA.orderedLeafSetNode1))).when(netconfService) - .get(DATA.leafSetNodePath); - doReturn(immediateFluentFuture(Optional.of(DATA.orderedLeafSetNode2))).when(netconfService) - .getConfig(DATA.leafSetNodePath); + doReturn(immediateFluentFuture(Optional.of(ORDERED_LEAF_SET_NODE_1))).when(read) + .read(LogicalDatastoreType.OPERATIONAL, LEAF_SET_NODE_PATH); + doReturn(immediateFluentFuture(Optional.of(ORDERED_LEAF_SET_NODE_2))).when(read) + .read(LogicalDatastoreType.CONFIGURATION, LEAF_SET_NODE_PATH); + doReturn(immediateFluentFuture(Optional.of(ORDERED_LEAF_SET_NODE_1))).when(netconfService) + .get(LEAF_SET_NODE_PATH); + doReturn(immediateFluentFuture(Optional.of(ORDERED_LEAF_SET_NODE_2))).when(netconfService) + .getConfig(LEAF_SET_NODE_PATH); final LeafSetNode expectedData = Builders.orderedLeafSetBuilder() - .withNodeIdentifier(new NodeIdentifier(DATA.leafListQname)) + .withNodeIdentifier(new NodeIdentifier(LEAF_LIST_QNAME)) .withValue(ImmutableList.>builder() - .addAll(DATA.orderedLeafSetNode1.body()) - .addAll(DATA.orderedLeafSetNode2.body()) + .addAll(ORDERED_LEAF_SET_NODE_1.body()) + .addAll(ORDERED_LEAF_SET_NODE_2.body()) .build()) .build(); - NormalizedNode normalizedNode = readData(ContentParam.ALL, DATA.leafSetNodePath, + NormalizedNode normalizedNode = readData(ContentParam.ALL, LEAF_SET_NODE_PATH, mdsalStrategy); assertEquals(expectedData, normalizedNode); - normalizedNode = readData(ContentParam.ALL, DATA.leafSetNodePath, netconfStrategy); + normalizedNode = readData(ContentParam.ALL, LEAF_SET_NODE_PATH, netconfStrategy); assertEquals(expectedData, normalizedNode); } @Test public void readDataWrongPathOrNoContentTest() { doReturn(immediateFluentFuture(Optional.empty())).when(read) - .read(LogicalDatastoreType.CONFIGURATION, DATA.path2); - doReturn(immediateFluentFuture(Optional.empty())).when(netconfService).getConfig(DATA.path2); - NormalizedNode normalizedNode = readData(ContentParam.CONFIG, DATA.path2, mdsalStrategy); + .read(LogicalDatastoreType.CONFIGURATION, PATH_2); + doReturn(immediateFluentFuture(Optional.empty())).when(netconfService).getConfig(PATH_2); + NormalizedNode normalizedNode = readData(ContentParam.CONFIG, PATH_2, mdsalStrategy); assertNull(normalizedNode); - normalizedNode = readData(ContentParam.CONFIG, DATA.path2, netconfStrategy); + normalizedNode = readData(ContentParam.CONFIG, PATH_2, netconfStrategy); assertNull(normalizedNode); } diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/TestData.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/TestData.java deleted file mode 100644 index fb2d10c4ce..0000000000 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/TestData.java +++ /dev/null @@ -1,159 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.restconf.nb.rfc8040.rests.utils; - -import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; -import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; -import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; -import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; -import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode; -import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; -import org.opendaylight.yangtools.yang.data.api.schema.MapNode; -import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListEntryNode; -import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode; -import org.opendaylight.yangtools.yang.data.api.schema.UserMapNode; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; - -final class TestData { - - final YangInstanceIdentifier path; - final YangInstanceIdentifier path2; - final YangInstanceIdentifier path3; - final MapEntryNode data; - final MapEntryNode data2; - final ContainerNode data3; - final ContainerNode data4; - final MapNode listData; - final MapNode listData2; - final UserMapNode orderedMapNode1; - final UserMapNode orderedMapNode2; - final LeafNode contentLeaf; - final LeafNode contentLeaf2; - final MapEntryNode checkData; - final LeafSetNode leafSetNode1; - final LeafSetNode leafSetNode2; - final LeafSetNode orderedLeafSetNode1; - final LeafSetNode orderedLeafSetNode2; - final YangInstanceIdentifier leafSetNodePath; - final UnkeyedListNode unkeyedListNode1; - final UnkeyedListNode unkeyedListNode2; - final UnkeyedListEntryNode unkeyedListEntryNode1; - final UnkeyedListEntryNode unkeyedListEntryNode2; - - final QName base = QName.create("ns", "2016-02-28", "base"); - final QName listKeyQName = QName.create(base, "list-key"); - final QName leafListQname = QName.create(base, "leaf-list"); - final QName listQname = QName.create(base, "list"); - - // FIXME: ${DEITY}, this is fugly. All these are essentially constants for ReadDataTransactionUtilTest! - TestData() { - final NodeIdentifierWithPredicates nodeWithKey = - NodeIdentifierWithPredicates.of(listQname, listKeyQName, "keyValue"); - final NodeIdentifierWithPredicates nodeWithKey2 = - NodeIdentifierWithPredicates.of(listQname, listKeyQName, "keyValue2"); - final LeafNode content = Builders.leafBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create(base, "leaf-content"))) - .withValue("content") - .build(); - final LeafNode content2 = Builders.leafBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create(base, "leaf-content-different"))) - .withValue("content-different") - .build(); - final DataContainerChild dataContainer = Builders.leafBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create(listQname, "identifier"))) - .withValue("id") - .build(); - data = Builders.mapEntryBuilder() - .withNodeIdentifier(nodeWithKey) - .withChild(content) - .build(); - data2 = Builders.mapEntryBuilder() - .withNodeIdentifier(nodeWithKey) - .withChild(content2) - .build(); - checkData = Builders.mapEntryBuilder() - .withNodeIdentifier(nodeWithKey) - .withChild(content2) - .withChild(content) - .build(); - listData = Builders.mapBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create(listQname, "list"))) - .withChild(data) - .build(); - listData2 = Builders.mapBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create(listQname, "list"))) - .withChild(data) - .withChild(data2) - .build(); - path = YangInstanceIdentifier.builder() - .node(QName.create(base, "cont")) - .node(listQname) - .node(nodeWithKey) - .build(); - path2 = YangInstanceIdentifier.builder() - .node(QName.create(base, "cont")) - .node(listQname) - .node(nodeWithKey2) - .build(); - path3 = YangInstanceIdentifier.builder() - .node(QName.create(base, "cont")) - .node(listQname) - .build(); - contentLeaf = Builders.leafBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create(base, "content"))) - .withValue("test") - .build(); - contentLeaf2 = Builders.leafBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create(base, "content2"))) - .withValue("test2") - .build(); - data3 = Builders.containerBuilder() - .withNodeIdentifier(new NodeIdentifier(QName.create(base, "container"))) - .withChild(contentLeaf) - .build(); - data4 = Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(base, "container2"))) - .withChild(contentLeaf2) - .build(); - - leafSetNodePath = YangInstanceIdentifier.builder().node(QName.create(base, "cont")) - .node(leafListQname).build(); - leafSetNode1 = Builders.leafSetBuilder().withNodeIdentifier(new NodeIdentifier( - leafListQname)).withChildValue("one").withChildValue("two").build(); - - leafSetNode2 = Builders.leafSetBuilder().withNodeIdentifier(new NodeIdentifier( - leafListQname)).withChildValue("three").build(); - - orderedLeafSetNode1 = Builders.orderedLeafSetBuilder().withNodeIdentifier( - new NodeIdentifier(leafListQname)).withChildValue("one") - .withChildValue("two").build(); - orderedLeafSetNode2 = Builders.orderedLeafSetBuilder().withNodeIdentifier( - new NodeIdentifier(leafListQname)).withChildValue("three") - .withChildValue("four").build(); - - orderedMapNode1 = Builders.orderedMapBuilder() - .withNodeIdentifier(new NodeIdentifier(listQname)).withChild(data).build(); - - orderedMapNode2 = Builders.orderedMapBuilder() - .withNodeIdentifier(new NodeIdentifier(listQname)).withChild(data) - .withChild(data2).build(); - - unkeyedListEntryNode1 = Builders.unkeyedListEntryBuilder().withNodeIdentifier( - new NodeIdentifier(listQname)).withChild(content).build(); - unkeyedListNode1 = Builders.unkeyedListBuilder().withNodeIdentifier( - new NodeIdentifier(listQname)).withChild(unkeyedListEntryNode1).build(); - - unkeyedListEntryNode2 = Builders.unkeyedListEntryBuilder().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier(listQname)).withChild(content2).build(); - unkeyedListNode2 = Builders.unkeyedListBuilder().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier(listQname)).withChild(unkeyedListEntryNode2).build(); - } -}