Clean up NormalizedNodeWriter tests 64/111364/1
authorRobert Varga <robert.varga@pantheon.tech>
Fri, 12 Apr 2024 07:56:32 +0000 (09:56 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Fri, 12 Apr 2024 08:17:27 +0000 (10:17 +0200)
We have a bit of duplication with data, collect that into a common
superclass.

While we are at it, migrate to JUnit5, which allows us to remove the use
of verifyNoMoreInteractions().

Change-Id: I0599e400665e36b5005eab5cbe2ab08fbf72f1a1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/AbstractNormalizedNodeWriterTest.java [new file with mode: 0644]
restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriterDepthTest.java [new file with mode: 0644]
restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriterFieldsTest.java [new file with mode: 0644]
restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriterParametersTest.java [new file with mode: 0644]
restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/RestconfNormalizedNodeWriterDepthTest.java [deleted file]
restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/RestconfNormalizedNodeWriterFieldsTest.java [deleted file]
restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/RestconfNormalizedNodeWriterParametersTest.java [deleted file]

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/AbstractNormalizedNodeWriterTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/AbstractNormalizedNodeWriterTest.java
new file mode 100644 (file)
index 0000000..9d55779
--- /dev/null
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2024 PANTHEON.tech, s.r.o. 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.server.spi;
+
+import org.opendaylight.yangtools.yang.common.QName;
+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.YangInstanceIdentifier.NodeWithValue;
+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.SystemLeafSetNode;
+import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes;
+
+abstract class AbstractNormalizedNodeWriterTest {
+    static final NodeIdentifier CONTAINER_NID = NodeIdentifier.create(QName.create("namespace", "container"));
+    static final NodeIdentifier KEY_FIELD_NID = NodeIdentifier.create(QName.create("namespace", "key-field"));
+    static final NodeIdentifier LIST_NID = NodeIdentifier.create(QName.create("namespace", "list"));
+    static final NodeIdentifier LEAF_SET_NID = NodeIdentifier.create(QName.create("namespace", "leaf-set"));
+
+    // FIXME: make these proper constants
+    final String leafSetEntryNodeValue = "leaf-set-value";
+    final String keyLeafNodeValue = "key-value";
+
+    final NodeIdentifierWithPredicates mapEntryNodeIdentifier = NodeIdentifierWithPredicates.of(
+        QName.create("namespace", "list-entry"), KEY_FIELD_NID.getNodeType(), keyLeafNodeValue);
+    final NodeWithValue<String> leafSetEntryNodeIdentifier = new NodeWithValue<>(
+        QName.create("namespace", "leaf-set-entry"), leafSetEntryNodeValue);
+
+    final LeafNode<String> keyLeafNodeData = ImmutableNodes.leafNode(KEY_FIELD_NID, keyLeafNodeValue);
+    final LeafSetEntryNode<String> leafSetEntryNodeData = ImmutableNodes.<String>newLeafSetEntryBuilder()
+        .withNodeIdentifier(leafSetEntryNodeIdentifier)
+        .withValue(leafSetEntryNodeValue)
+        .build();
+    final SystemLeafSetNode<String> leafSetNodeData = ImmutableNodes.<String>newSystemLeafSetBuilder()
+        .withNodeIdentifier(LEAF_SET_NID)
+        .withChild(leafSetEntryNodeData)
+        .build();
+    final ContainerNode containerNodeData = ImmutableNodes.newContainerBuilder()
+        .withNodeIdentifier(CONTAINER_NID)
+        .withChild(leafSetNodeData)
+        .build();
+}
diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriterDepthTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriterDepthTest.java
new file mode 100644 (file)
index 0000000..63d9e0e
--- /dev/null
@@ -0,0 +1,252 @@
+/*
+ * 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.server.spi;
+
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opendaylight.restconf.api.query.DepthParam;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+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.SystemMapNode;
+import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
+import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes;
+
+/**
+ * Unit test for {@link NormalizedNodeWriter} used with depth parameter.
+ */
+@ExtendWith(MockitoExtension.class)
+class NormalizedNodeWriterDepthTest extends AbstractNormalizedNodeWriterTest {
+    private final String anotherLeafNodeValue = "another-value";
+    private final NodeIdentifier anotherLeafNodeIdentifier =
+        NodeIdentifier.create(QName.create("namespace", "another-field"));
+
+    private final MapEntryNode mapEntryNodeData = ImmutableNodes.newMapEntryBuilder()
+        .withNodeIdentifier(mapEntryNodeIdentifier)
+        .withChild(keyLeafNodeData)
+        .withChild(ImmutableNodes.leafNode(anotherLeafNodeIdentifier, anotherLeafNodeValue))
+        .build();
+    private final SystemMapNode mapNodeData = ImmutableNodes.newSystemMapBuilder()
+        .withNodeIdentifier(LIST_NID)
+        .withChild(mapEntryNodeData)
+        .build();
+
+    @Mock
+    private NormalizedNodeStreamWriter writer;
+
+    /**
+     * Test write {@link ContainerNode} with children but write data only to depth 1 (children will not be written).
+     * Depth parameter is limited to 1.
+     */
+    @Test
+    void writeContainerWithoutChildrenDepthTest() throws Exception {
+        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.min());
+
+        parameterWriter.write(containerNodeData);
+
+        final var inOrder = inOrder(writer);
+        inOrder.verify(writer).startContainerNode(CONTAINER_NID, 1);
+        inOrder.verify(writer).endNode();
+    }
+
+    /**
+     * Test write {@link ContainerNode} with children and write also all its children.
+     * Depth parameter has higher value than maximal children depth.
+     */
+    @Test
+    void writeContainerWithChildrenDepthTest() throws Exception {
+        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.max());
+
+        parameterWriter.write(containerNodeData);
+
+        final var inOrder = inOrder(writer);
+        inOrder.verify(writer).startContainerNode(CONTAINER_NID, 1);
+        inOrder.verify(writer).startLeafSet(LEAF_SET_NID, 1);
+        inOrder.verify(writer).startLeafSetEntryNode(leafSetEntryNodeIdentifier);
+        inOrder.verify(writer).scalarValue(leafSetEntryNodeValue);
+        inOrder.verify(writer, times(3)).endNode();
+    }
+
+    /**
+     * Test write with {@link MapNode} with children but write data only to depth 1 (children will not be written).
+     * Depth parameter limits depth to 1.
+     */
+    @Test
+    void writeMapNodeWithoutChildrenDepthTest() throws Exception {
+        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.min());
+
+        parameterWriter.write(mapNodeData);
+
+        final var inOrder = inOrder(writer);
+        inOrder.verify(writer).startMapNode(LIST_NID, 1);
+        inOrder.verify(writer).startMapEntryNode(mapEntryNodeIdentifier, 2);
+        inOrder.verify(writer, times(2)).endNode();
+    }
+
+    /**
+     * Test write {@link MapNode} with children and write also all its children.
+     * Depth parameter has higher value than maximal children depth.
+     */
+    @Test
+    @Disabled("FIXME: Although ordered writer is used leaves are not written in expected order")
+    void writeMapNodeWithChildrenDepthTest() throws Exception {
+        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.max());
+
+        parameterWriter.write(mapNodeData);
+
+        final var inOrder = inOrder(writer);
+        inOrder.verify(writer).startMapNode(LIST_NID, 1);
+        inOrder.verify(writer).startMapEntryNode(mapEntryNodeIdentifier, 2);
+        inOrder.verify(writer, times(2)).startLeafNode(KEY_FIELD_NID);
+        inOrder.verify(writer).scalarValue(keyLeafNodeValue);
+        inOrder.verify(writer).endNode();
+        inOrder.verify(writer, times(2)).startLeafNode(KEY_FIELD_NID);
+        inOrder.verify(writer, times(2)).scalarValue(keyLeafNodeValue);
+        inOrder.verify(writer, times(2)).endNode();
+        // FIXME this assertion is not working because leaves are not written in expected order
+        inOrder.verify(writer).startLeafNode(anotherLeafNodeIdentifier);
+        inOrder.verify(writer).scalarValue(anotherLeafNodeValue);
+        inOrder.verify(writer, times(3)).endNode();
+    }
+
+    /**
+     * Test write with {@link LeafSetNode} with depth 1 (children will not be written).
+     * Depth parameter limits depth to 1.
+     */
+    @Test
+    void writeLeafSetNodeWithoutChildrenDepthTest() throws Exception {
+        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.min());
+
+        parameterWriter.write(leafSetNodeData);
+
+        final var inOrder = inOrder(writer);
+        inOrder.verify(writer).startLeafSet(LEAF_SET_NID, 1);
+        inOrder.verify(writer).endNode();
+    }
+
+    /**
+     * Test write with {@link LeafSetNode} when all its children will be written.
+     * Depth parameter has higher value than maximal children depth.
+     */
+    @Test
+    void writeLeafSetNodeWithChildrenDepthTest() throws Exception {
+        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.max());
+
+        parameterWriter.write(leafSetNodeData);
+
+        final var inOrder = inOrder(writer);
+        inOrder.verify(writer).startLeafSet(LEAF_SET_NID, 1);
+        inOrder.verify(writer).startLeafSetEntryNode(leafSetEntryNodeIdentifier);
+        inOrder.verify(writer).scalarValue(leafSetEntryNodeValue);
+        inOrder.verify(writer, times(2)).endNode();
+    }
+
+    /**
+     * Test write with {@link LeafSetEntryNode}.
+     * Depth parameter has higher value than maximal children depth.
+     */
+    @Test
+    void writeLeafSetEntryNodeDepthTest() throws Exception {
+        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.max());
+
+        parameterWriter.write(leafSetEntryNodeData);
+
+        final var inOrder = inOrder(writer);
+        inOrder.verify(writer).startLeafSetEntryNode(leafSetEntryNodeIdentifier);
+        inOrder.verify(writer).scalarValue(leafSetEntryNodeValue);
+        inOrder.verify(writer).endNode();
+    }
+
+    /**
+     * Test write with {@link MapEntryNode} unordered to depth 1 to write only keys.
+     * Depth parameter limits depth to 1.
+     */
+    @Test
+    void writeMapEntryNodeUnorderedOnlyKeysDepthTest() throws Exception {
+        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, false, DepthParam.min(), null);
+
+        parameterWriter.write(mapEntryNodeData);
+
+        final var inOrder = inOrder(writer);
+        inOrder.verify(writer).startMapEntryNode(mapEntryNodeIdentifier, 2);
+        // write only the key
+        inOrder.verify(writer).startLeafNode(KEY_FIELD_NID);
+        inOrder.verify(writer).scalarValue(keyLeafNodeValue);
+        inOrder.verify(writer, times(2)).endNode();
+    }
+
+    /**
+     * Test write with {@link MapEntryNode} unordered with full depth.
+     * Depth parameter has higher value than maximal children depth.
+     */
+    @Test
+    void writeMapEntryNodeUnorderedDepthTest() throws Exception {
+        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, false, DepthParam.max(), null);
+
+        parameterWriter.write(mapEntryNodeData);
+
+        // unordered
+        verify(writer).startMapEntryNode(mapEntryNodeIdentifier, 2);
+        verify(writer).startLeafNode(KEY_FIELD_NID);
+        verify(writer).scalarValue(keyLeafNodeValue);
+        verify(writer).startLeafNode(anotherLeafNodeIdentifier);
+        verify(writer).scalarValue(anotherLeafNodeValue);
+        verify(writer, times(3)).endNode();
+    }
+
+    /**
+     * Test write with {@link MapEntryNode} ordered with depth 1 (children will not be written).
+     * Depth parameter limits depth to 1.
+     */
+    @Test
+    void writeMapEntryNodeOrderedWithoutChildrenTest() throws Exception {
+        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.min());
+
+        parameterWriter.write(mapEntryNodeData);
+
+        final var inOrder = inOrder(writer);
+        inOrder.verify(writer).startMapEntryNode(mapEntryNodeIdentifier, 2);
+        inOrder.verify(writer).endNode();
+    }
+
+    /**
+     * Test write with {@link MapEntryNode} ordered and write also all its children.
+     * Depth parameter has higher value than maximal children depth.
+     */
+    @Test
+    @Disabled("FIXME: Although ordered writer is used leaves are not written in expected order")
+    void writeMapEntryNodeOrderedTest() throws Exception {
+        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.max());
+
+        parameterWriter.write(mapEntryNodeData);
+
+        final var inOrder = inOrder(writer);
+        inOrder.verify(writer).startMapEntryNode(mapEntryNodeIdentifier, 2);
+        inOrder.verify(writer).startLeafNode(KEY_FIELD_NID);
+        inOrder.verify(writer).scalarValue(keyLeafNodeValue);
+        inOrder.verify(writer).endNode();
+        inOrder.verify(writer).startLeafNode(KEY_FIELD_NID);
+        inOrder.verify(writer).scalarValue(keyLeafNodeValue);
+        inOrder.verify(writer).endNode();
+        // FIXME this assertion is not working because leaves are not written in expected order
+        inOrder.verify(writer).startLeafNode(anotherLeafNodeIdentifier);
+        inOrder.verify(writer).scalarValue(anotherLeafNodeValue);
+        inOrder.verify(writer, times(2)).endNode();
+    }
+}
\ No newline at end of file
diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriterFieldsTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriterFieldsTest.java
new file mode 100644 (file)
index 0000000..aa61317
--- /dev/null
@@ -0,0 +1,110 @@
+/*
+ * 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.server.spi;
+
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.times;
+
+import java.util.List;
+import java.util.Set;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+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.SystemMapNode;
+import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
+import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes;
+
+/**
+ * Unit test for {@link NormalizedNodeWriter} used with fields parameter.
+ */
+@ExtendWith(MockitoExtension.class)
+class NormalizedNodeWriterFieldsTest extends AbstractNormalizedNodeWriterTest {
+    private final SystemMapNode mapNodeData = ImmutableNodes.newSystemMapBuilder()
+        .withNodeIdentifier(LIST_NID)
+        .withChild(ImmutableNodes.newMapEntryBuilder()
+            .withNodeIdentifier(mapEntryNodeIdentifier)
+            .withChild(keyLeafNodeData)
+            .build())
+        .build();
+
+    @Mock
+    private NormalizedNodeStreamWriter writer;
+
+    /**
+     * Test write {@link ContainerNode} when children which will be written are limited.
+     * Fields parameter selects 0/1 of container children to be written.
+     */
+    @Test
+    void writeContainerWithLimitedFieldsTest() throws Exception {
+        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, null, List.of(Set.of()));
+
+        parameterWriter.write(containerNodeData);
+
+        final var inOrder = inOrder(writer);
+        inOrder.verify(writer).startContainerNode(CONTAINER_NID, 1);
+        inOrder.verify(writer).endNode();
+    }
+
+    /**
+     * Test write {@link ContainerNode} when all its children are selected to be written.
+     * Fields parameter selects 1/1 of container children to be written.
+     */
+    @Test
+    void writeContainerAllFieldsTest() throws Exception {
+        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, null,
+            List.of(Set.of(LEAF_SET_NID.getNodeType())));
+
+        parameterWriter.write(containerNodeData);
+
+        final var inOrder = inOrder(writer);
+        inOrder.verify(writer).startContainerNode(CONTAINER_NID, 1);
+        inOrder.verify(writer).startLeafSet(LEAF_SET_NID, 1);
+        inOrder.verify(writer).startLeafSetEntryNode(leafSetEntryNodeIdentifier);
+        inOrder.verify(writer).scalarValue(leafSetEntryNodeValue);
+        inOrder.verify(writer, times(3)).endNode();
+    }
+
+    /**
+     * Test write {@link MapEntryNode} as child of {@link MapNode} when children which will be written are limited.
+     * Fields parameter selects 0/1 of map entry node children to be written.
+     */
+    @Test
+    void writeMapEntryNodeWithLimitedFieldsTest() throws Exception {
+        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, null, List.of(Set.of()));
+
+        parameterWriter.write(mapNodeData);
+
+        final var inOrder = inOrder(writer);
+        inOrder.verify(writer).startMapNode(LIST_NID, 1);
+        inOrder.verify(writer).startMapEntryNode(mapEntryNodeIdentifier, 1);
+        inOrder.verify(writer, times(2)).endNode();
+    }
+
+    /**
+     * Test write {@link MapEntryNode} as child of {@link MapNode} when all its children will be written.
+     * Fields parameter selects 1/1 of map entry node children to be written.
+     */
+    @Test
+    void writeMapNodeAllFieldsTest() throws Exception {
+        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, null,
+            List.of(Set.of(keyLeafNodeData.name().getNodeType())));
+
+        parameterWriter.write(mapNodeData);
+
+        final var inOrder = inOrder(writer);
+        inOrder.verify(writer).startMapNode(LIST_NID, 1);
+        inOrder.verify(writer).startMapEntryNode(mapEntryNodeIdentifier, 1);
+        inOrder.verify(writer).startLeafNode(KEY_FIELD_NID);
+        inOrder.verify(writer).scalarValue(keyLeafNodeValue);
+        inOrder.verify(writer, times(3)).endNode();
+    }
+}
\ No newline at end of file
diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriterParametersTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriterParametersTest.java
new file mode 100644 (file)
index 0000000..9e7be36
--- /dev/null
@@ -0,0 +1,88 @@
+/*
+ * 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.server.spi;
+
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.times;
+
+import java.util.List;
+import java.util.Set;
+import org.junit.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opendaylight.restconf.api.query.DepthParam;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
+import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+
+/**
+ * Unit test for {@link NormalizedNodeWriter} used with all parameters.
+ */
+@ExtendWith(MockitoExtension.class)
+class NormalizedNodeWriterParametersTest extends AbstractNormalizedNodeWriterTest {
+    @Mock
+    private NormalizedNodeStreamWriter writer;
+
+    /**
+     * Test write {@link ContainerNode} when all its children are selected to be written by fields parameter.
+     * Depth parameter is also used and limits output to depth 1.
+     * Fields parameter has effect limiting depth parameter in the way that selected nodes and its ancestors are
+     * written regardless of their depth (some of container children have depth > 1).
+     * Fields parameter selects all container children to be written and also all children of those children.
+     */
+    @Test
+    void writeContainerParameterPrioritiesTest() throws Exception {
+        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.min(),
+            List.of(
+                Set.of(LEAF_SET_NID.getNodeType()),
+                Set.of(leafSetEntryNodeIdentifier.getNodeType())));
+
+        parameterWriter.write(containerNodeData);
+
+        final var inOrder = inOrder(writer);
+        inOrder.verify(writer).startContainerNode(CONTAINER_NID, 1);
+        inOrder.verify(writer).startLeafSet(LEAF_SET_NID, 1);
+        inOrder.verify(writer).startLeafSetEntryNode(leafSetEntryNodeIdentifier);
+        inOrder.verify(writer).scalarValue(leafSetEntryNodeValue);
+        inOrder.verify(writer, times(3)).endNode();
+    }
+
+    /**
+     * Test write {@link ContainerNode} which represents data at restconf/data root.
+     * No parameters are used.
+     */
+    @Test
+    void writeRootDataTest() throws Exception {
+        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, null);
+
+        parameterWriter.write(ImmutableNodes.newContainerBuilder()
+            .withNodeIdentifier(NodeIdentifier.create(
+                QName.create("urn:ietf:params:xml:ns:netconf:base:1.0", "data")))
+            .withChild(leafSetNodeData)
+            .build());
+
+        final var inOrder = inOrder(writer);
+        inOrder.verify(writer).startLeafSet(LEAF_SET_NID, 1);
+        inOrder.verify(writer).startLeafSetEntryNode(leafSetEntryNodeIdentifier);
+        inOrder.verify(writer).scalarValue(leafSetEntryNodeValue);
+        inOrder.verify(writer, times(2)).endNode();
+    }
+
+    @Test
+    void writeEmptyRootContainerTest() throws Exception {
+        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, null);
+
+        parameterWriter.write(ImmutableNodes.newContainerBuilder()
+            .withNodeIdentifier(new NodeIdentifier(SchemaContext.NAME))
+            .build());
+    }
+}
diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/RestconfNormalizedNodeWriterDepthTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/RestconfNormalizedNodeWriterDepthTest.java
deleted file mode 100644 (file)
index 9ef7f34..0000000
+++ /dev/null
@@ -1,303 +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.server.spi;
-
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.opendaylight.restconf.api.query.DepthParam;
-import org.opendaylight.yangtools.yang.common.QName;
-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.YangInstanceIdentifier.NodeWithValue;
-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.SystemLeafSetNode;
-import org.opendaylight.yangtools.yang.data.api.schema.SystemMapNode;
-import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
-import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes;
-
-/**
- * Unit test for {@link NormalizedNodeWriter} used with depth parameter.
- */
-@RunWith(MockitoJUnitRunner.StrictStubs.class)
-public class RestconfNormalizedNodeWriterDepthTest {
-    private final String leafSetEntryNodeValue = "leaf-set-value";
-    private final String keyLeafNodeValue = "key-value";
-    private final String anotherLeafNodeValue = "another-value";
-
-    private final NodeIdentifier containerNodeIdentifier =
-        NodeIdentifier.create(QName.create("namespace", "container"));
-    private final NodeIdentifier mapNodeIdentifier = NodeIdentifier.create(QName.create("namespace", "list"));
-    private final NodeIdentifier keyLeafNodeIdentifier = NodeIdentifier.create(QName.create("namespace", "key-field"));
-    private final NodeWithValue<String> leafSetEntryNodeIdentifier =
-        new NodeWithValue<>(QName.create("namespace", "leaf-set-entry"), leafSetEntryNodeValue);
-    private final NodeIdentifier leafSetNodeIdentifier = NodeIdentifier.create(QName.create("namespace", "leaf-set"));
-    private final NodeIdentifierWithPredicates mapEntryNodeIdentifier = NodeIdentifierWithPredicates.of(
-        QName.create("namespace", "list-entry"), keyLeafNodeIdentifier.getNodeType(), keyLeafNodeValue);
-    private final NodeIdentifier anotherLeafNodeIdentifier =
-        NodeIdentifier.create(QName.create("namespace", "another-field"));
-
-    private final LeafNode<String> keyLeafNodeData = ImmutableNodes.leafNode(keyLeafNodeIdentifier, keyLeafNodeValue);
-    private final LeafNode<String> anotherLeafNodeData =
-        ImmutableNodes.leafNode(anotherLeafNodeIdentifier, anotherLeafNodeValue);
-    private final LeafSetEntryNode<String> leafSetEntryNodeData = ImmutableNodes.<String>newLeafSetEntryBuilder()
-        .withNodeIdentifier(leafSetEntryNodeIdentifier)
-        .withValue(leafSetEntryNodeValue)
-        .build();
-    private final SystemLeafSetNode<String> leafSetNodeData = ImmutableNodes.<String>newSystemLeafSetBuilder()
-        .withNodeIdentifier(leafSetNodeIdentifier)
-        .withChild(leafSetEntryNodeData)
-        .build();
-    private final MapEntryNode mapEntryNodeData = ImmutableNodes.newMapEntryBuilder()
-        .withNodeIdentifier(mapEntryNodeIdentifier)
-        .withChild(keyLeafNodeData)
-        .withChild(anotherLeafNodeData)
-        .build();
-    private final SystemMapNode mapNodeData = ImmutableNodes.newSystemMapBuilder()
-        .withNodeIdentifier(mapNodeIdentifier)
-        .withChild(mapEntryNodeData)
-        .build();
-    private final ContainerNode containerNodeData = ImmutableNodes.newContainerBuilder()
-        .withNodeIdentifier(containerNodeIdentifier)
-        .withChild(leafSetNodeData)
-        .build();
-
-    @Mock
-    private NormalizedNodeStreamWriter writer;
-
-    /**
-     * Test write {@link ContainerNode} with children but write data only to depth 1 (children will not be written).
-     * Depth parameter is limited to 1.
-     */
-    @Test
-    public void writeContainerWithoutChildrenDepthTest() throws Exception {
-        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.min());
-
-        parameterWriter.write(containerNodeData);
-
-        final var inOrder = inOrder(writer);
-        inOrder.verify(writer, times(1)).startContainerNode(containerNodeIdentifier, 1);
-        inOrder.verify(writer, times(1)).endNode();
-        verifyNoMoreInteractions(writer);
-    }
-
-    /**
-     * Test write {@link ContainerNode} with children and write also all its children.
-     * Depth parameter has higher value than maximal children depth.
-     */
-    @Test
-    public void writeContainerWithChildrenDepthTest() throws Exception {
-        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.max());
-
-        parameterWriter.write(containerNodeData);
-
-        final var inOrder = inOrder(writer);
-        inOrder.verify(writer, times(1)).startContainerNode(containerNodeIdentifier, 1);
-        inOrder.verify(writer, times(1)).startLeafSet(leafSetNodeIdentifier, 1);
-        inOrder.verify(writer, times(1)).startLeafSetEntryNode(leafSetEntryNodeIdentifier);
-        inOrder.verify(writer, times(1)).scalarValue(leafSetEntryNodeValue);
-        inOrder.verify(writer, times(3)).endNode();
-        verifyNoMoreInteractions(writer);
-    }
-
-    /**
-     * Test write with {@link MapNode} with children but write data only to depth 1 (children will not be written).
-     * Depth parameter limits depth to 1.
-     */
-    @Test
-    public void writeMapNodeWithoutChildrenDepthTest() throws Exception {
-        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.min());
-
-        parameterWriter.write(mapNodeData);
-
-        final var inOrder = inOrder(writer);
-        inOrder.verify(writer, times(1)).startMapNode(mapNodeIdentifier, 1);
-        inOrder.verify(writer, times(1)).startMapEntryNode(mapEntryNodeIdentifier, 2);
-        inOrder.verify(writer, times(2)).endNode();
-        verifyNoMoreInteractions(writer);
-    }
-
-    /**
-     * Test write {@link MapNode} with children and write also all its children.
-     * Depth parameter has higher value than maximal children depth.
-     * FIXME
-     * Although ordered writer is used leaves are not written in expected order.
-     *
-     */
-    @Ignore
-    @Test
-    public void writeMapNodeWithChildrenDepthTest() throws Exception {
-        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.max());
-
-        parameterWriter.write(mapNodeData);
-
-        final var inOrder = inOrder(writer);
-        inOrder.verify(writer, times(1)).startMapNode(mapNodeIdentifier, 1);
-        inOrder.verify(writer, times(1)).startMapEntryNode(mapEntryNodeIdentifier, 2);
-        inOrder.verify(writer, times(2)).startLeafNode(keyLeafNodeIdentifier);
-        inOrder.verify(writer, times(1)).scalarValue(keyLeafNodeValue);
-        inOrder.verify(writer, times(1)).endNode();
-        inOrder.verify(writer, times(2)).startLeafNode(keyLeafNodeIdentifier);
-        inOrder.verify(writer, times(2)).scalarValue(keyLeafNodeValue);
-        inOrder.verify(writer, times(2)).endNode();
-        // FIXME this assertion is not working because leaves are not written in expected order
-        inOrder.verify(writer, times(1)).startLeafNode(anotherLeafNodeIdentifier);
-        inOrder.verify(writer, times(1)).scalarValue(anotherLeafNodeValue);
-        inOrder.verify(writer, times(3)).endNode();
-        verifyNoMoreInteractions(writer);
-    }
-
-    /**
-     * Test write with {@link LeafSetNode} with depth 1 (children will not be written).
-     * Depth parameter limits depth to 1.
-     */
-    @Test
-    public void writeLeafSetNodeWithoutChildrenDepthTest() throws Exception {
-        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.min());
-
-        parameterWriter.write(leafSetNodeData);
-
-        final var inOrder = inOrder(writer);
-        inOrder.verify(writer, times(1)).startLeafSet(leafSetNodeIdentifier, 1);
-        inOrder.verify(writer, times(1)).endNode();
-        verifyNoMoreInteractions(writer);
-    }
-
-    /**
-     * Test write with {@link LeafSetNode} when all its children will be written.
-     * Depth parameter has higher value than maximal children depth.
-     */
-    @Test
-    public void writeLeafSetNodeWithChildrenDepthTest() throws Exception {
-        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.max());
-
-        parameterWriter.write(leafSetNodeData);
-
-        final var inOrder = inOrder(writer);
-        inOrder.verify(writer, times(1)).startLeafSet(leafSetNodeIdentifier, 1);
-        inOrder.verify(writer, times(1)).startLeafSetEntryNode(leafSetEntryNodeIdentifier);
-        inOrder.verify(writer, times(1)).scalarValue(leafSetEntryNodeValue);
-        inOrder.verify(writer, times(2)).endNode();
-        verifyNoMoreInteractions(writer);
-    }
-
-    /**
-     * Test write with {@link LeafSetEntryNode}.
-     * Depth parameter has higher value than maximal children depth.
-     */
-    @Test
-    public void writeLeafSetEntryNodeDepthTest() throws Exception {
-        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.max());
-
-        parameterWriter.write(leafSetEntryNodeData);
-
-        final var inOrder = inOrder(writer);
-        inOrder.verify(writer, times(1)).startLeafSetEntryNode(leafSetEntryNodeIdentifier);
-        inOrder.verify(writer, times(1)).scalarValue(leafSetEntryNodeValue);
-        inOrder.verify(writer, times(1)).endNode();
-        verifyNoMoreInteractions(writer);
-    }
-
-    /**
-     * Test write with {@link MapEntryNode} unordered to depth 1 to write only keys.
-     * Depth parameter limits depth to 1.
-     */
-    @Test
-    public void writeMapEntryNodeUnorderedOnlyKeysDepthTest() throws Exception {
-        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, false, DepthParam.min(),
-            null);
-
-        parameterWriter.write(mapEntryNodeData);
-
-        final var inOrder = inOrder(writer);
-        inOrder.verify(writer, times(1)).startMapEntryNode(mapEntryNodeIdentifier, 2);
-        // write only the key
-        inOrder.verify(writer, times(1)).startLeafNode(keyLeafNodeIdentifier);
-        inOrder.verify(writer, times(1)).scalarValue(keyLeafNodeValue);
-        inOrder.verify(writer, times(2)).endNode();
-        verifyNoMoreInteractions(writer);
-    }
-
-    /**
-     * Test write with {@link MapEntryNode} unordered with full depth.
-     * Depth parameter has higher value than maximal children depth.
-     */
-    @Test
-    public void writeMapEntryNodeUnorderedDepthTest() throws Exception {
-        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, false, DepthParam.max(),
-            null);
-
-        parameterWriter.write(mapEntryNodeData);
-
-        // unordered
-        verify(writer, times(1)).startMapEntryNode(mapEntryNodeIdentifier, 2);
-        verify(writer, times(1)).startLeafNode(keyLeafNodeIdentifier);
-        verify(writer, times(1)).scalarValue(keyLeafNodeValue);
-        verify(writer, times(1)).startLeafNode(anotherLeafNodeIdentifier);
-        verify(writer, times(1)).scalarValue(anotherLeafNodeValue);
-        verify(writer, times(3)).endNode();
-        verifyNoMoreInteractions(writer);
-    }
-
-    /**
-     * Test write with {@link MapEntryNode} ordered with depth 1 (children will not be written).
-     * Depth parameter limits depth to 1.
-     */
-    @Test
-    public void writeMapEntryNodeOrderedWithoutChildrenTest() throws Exception {
-        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.min());
-
-        parameterWriter.write(mapEntryNodeData);
-
-        final var inOrder = inOrder(writer);
-        inOrder.verify(writer, times(1)).startMapEntryNode(mapEntryNodeIdentifier, 2);
-        inOrder.verify(writer, times(1)).endNode();
-        verifyNoMoreInteractions(writer);
-    }
-
-    /**
-     * Test write with {@link MapEntryNode} ordered and write also all its children.
-     * Depth parameter has higher value than maximal children depth.
-     * FIXME
-     * Although ordered writer is used leaves are not written in expected order.
-     *
-     */
-    @Ignore
-    @Test
-    public void writeMapEntryNodeOrderedTest() throws Exception {
-        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.max());
-
-        parameterWriter.write(mapEntryNodeData);
-
-        final var inOrder = inOrder(writer);
-        inOrder.verify(writer, times(1)).startMapEntryNode(mapEntryNodeIdentifier, 2);
-        inOrder.verify(writer, times(1)).startLeafNode(keyLeafNodeIdentifier);
-        inOrder.verify(writer, times(1)).scalarValue(keyLeafNodeValue);
-        inOrder.verify(writer, times(1)).endNode();
-        inOrder.verify(writer, times(1)).startLeafNode(keyLeafNodeIdentifier);
-        inOrder.verify(writer, times(1)).scalarValue(keyLeafNodeValue);
-        inOrder.verify(writer, times(1)).endNode();
-        // FIXME this assertion is not working because leaves are not written in expected order
-        inOrder.verify(writer, times(1)).startLeafNode(anotherLeafNodeIdentifier);
-        inOrder.verify(writer, times(1)).scalarValue(anotherLeafNodeValue);
-        inOrder.verify(writer, times(2)).endNode();
-        verifyNoMoreInteractions(writer);
-    }
-}
\ No newline at end of file
diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/RestconfNormalizedNodeWriterFieldsTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/RestconfNormalizedNodeWriterFieldsTest.java
deleted file mode 100644 (file)
index 0f6b377..0000000
+++ /dev/null
@@ -1,148 +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.server.spi;
-
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-
-import java.util.List;
-import java.util.Set;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.opendaylight.yangtools.yang.common.QName;
-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.YangInstanceIdentifier.NodeWithValue;
-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.MapEntryNode;
-import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
-import org.opendaylight.yangtools.yang.data.api.schema.SystemLeafSetNode;
-import org.opendaylight.yangtools.yang.data.api.schema.SystemMapNode;
-import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
-import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes;
-
-/**
- * Unit test for {@link NormalizedNodeWriter} used with fields parameter.
- */
-@RunWith(MockitoJUnitRunner.StrictStubs.class)
-public class RestconfNormalizedNodeWriterFieldsTest {
-    private final String leafSetEntryNodeValue = "leaf-set-value";
-    private final String keyLeafNodeValue = "key-value";
-    private final NodeIdentifier containerNodeIdentifier =
-        NodeIdentifier.create(QName.create("namespace", "container"));
-    private final NodeIdentifier mapNodeIdentifier = NodeIdentifier.create(QName.create("namespace", "list"));
-    private final NodeIdentifier leafSetNodeIdentifier = NodeIdentifier.create(QName.create("namespace", "leaf-set"));
-    private final NodeWithValue<String> leafSetEntryNodeIdentifier =
-        new NodeWithValue<>(QName.create("namespace", "leaf-set-entry"), leafSetEntryNodeValue);
-    private final NodeIdentifier keyLeafNodeIdentifier = NodeIdentifier.create(QName.create("namespace", "key-field"));
-    private final NodeIdentifierWithPredicates mapEntryNodeIdentifier = NodeIdentifierWithPredicates.of(
-        QName.create("namespace", "list-entry"), keyLeafNodeIdentifier.getNodeType(), keyLeafNodeValue);
-
-    private final LeafSetEntryNode<String> leafSetEntryNodeData = ImmutableNodes.<String>newLeafSetEntryBuilder()
-        .withNodeIdentifier(leafSetEntryNodeIdentifier)
-        .withValue(leafSetEntryNodeValue)
-        .build();
-    private final SystemLeafSetNode<String> leafSetNodeData = ImmutableNodes.<String>newSystemLeafSetBuilder()
-        .withNodeIdentifier(leafSetNodeIdentifier)
-        .withChild(leafSetEntryNodeData)
-        .build();
-    private final ContainerNode containerNodeData = ImmutableNodes.newContainerBuilder()
-        .withNodeIdentifier(containerNodeIdentifier)
-        .withChild(leafSetNodeData)
-        .build();
-    private final LeafNode<String> keyLeafNodeData = ImmutableNodes.leafNode(keyLeafNodeIdentifier, keyLeafNodeValue);
-    private final MapEntryNode mapEntryNodeData = ImmutableNodes.newMapEntryBuilder()
-        .withNodeIdentifier(mapEntryNodeIdentifier)
-        .withChild(keyLeafNodeData)
-        .build();
-    private final SystemMapNode mapNodeData = ImmutableNodes.newSystemMapBuilder()
-        .withNodeIdentifier(mapNodeIdentifier)
-        .withChild(mapEntryNodeData)
-        .build();
-
-    @Mock
-    private NormalizedNodeStreamWriter writer;
-
-    /**
-     * Test write {@link ContainerNode} when children which will be written are limited.
-     * Fields parameter selects 0/1 of container children to be written.
-     */
-    @Test
-    public void writeContainerWithLimitedFieldsTest() throws Exception {
-        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, null, List.of(Set.of()));
-
-        parameterWriter.write(containerNodeData);
-
-        final var inOrder = inOrder(writer);
-        inOrder.verify(writer, times(1)).startContainerNode(containerNodeIdentifier, 1);
-        inOrder.verify(writer, times(1)).endNode();
-        verifyNoMoreInteractions(writer);
-    }
-
-    /**
-     * Test write {@link ContainerNode} when all its children are selected to be written.
-     * Fields parameter selects 1/1 of container children to be written.
-     */
-    @Test
-    public void writeContainerAllFieldsTest() throws Exception {
-        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(
-                writer, null, List.of(Set.of(leafSetNodeIdentifier.getNodeType())));
-
-        parameterWriter.write(containerNodeData);
-
-        final var inOrder = inOrder(writer);
-        inOrder.verify(writer, times(1)).startContainerNode(containerNodeIdentifier, 1);
-        inOrder.verify(writer, times(1)).startLeafSet(leafSetNodeIdentifier, 1);
-        inOrder.verify(writer, times(1)).startLeafSetEntryNode(leafSetEntryNodeIdentifier);
-        inOrder.verify(writer, times(1)).scalarValue(leafSetEntryNodeValue);
-        inOrder.verify(writer, times(3)).endNode();
-        verifyNoMoreInteractions(writer);
-    }
-
-    /**
-     * Test write {@link MapEntryNode} as child of {@link MapNode} when children which will be written are limited.
-     * Fields parameter selects 0/1 of map entry node children to be written.
-     */
-    @Test
-    public void writeMapEntryNodeWithLimitedFieldsTest() throws Exception {
-        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, null, List.of(Set.of()));
-
-        parameterWriter.write(mapNodeData);
-
-        final var inOrder = inOrder(writer);
-        inOrder.verify(writer, times(1)).startMapNode(mapNodeIdentifier, 1);
-        inOrder.verify(writer, times(1)).startMapEntryNode(mapEntryNodeIdentifier, 1);
-        inOrder.verify(writer, times(2)).endNode();
-        verifyNoMoreInteractions(writer);
-    }
-
-    /**
-     * Test write {@link MapEntryNode} as child of {@link MapNode} when all its children will be written.
-     * Fields parameter selects 1/1 of map entry node children to be written.
-     */
-    @Test
-    public void writeMapNodeAllFieldsTest() throws Exception {
-        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, null,
-            List.of(Set.of(keyLeafNodeData.name().getNodeType())));
-
-        parameterWriter.write(mapNodeData);
-
-        final var inOrder = inOrder(writer);
-        inOrder.verify(writer, times(1)).startMapNode(mapNodeIdentifier, 1);
-        inOrder.verify(writer, times(1)).startMapEntryNode(mapEntryNodeIdentifier, 1);
-        inOrder.verify(writer, times(1)).startLeafNode(keyLeafNodeIdentifier);
-        inOrder.verify(writer, times(1)).scalarValue(keyLeafNodeValue);
-        inOrder.verify(writer, times(3)).endNode();
-        verifyNoMoreInteractions(writer);
-    }
-}
\ No newline at end of file
diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/RestconfNormalizedNodeWriterParametersTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/RestconfNormalizedNodeWriterParametersTest.java
deleted file mode 100644 (file)
index 4448464..0000000
+++ /dev/null
@@ -1,115 +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.server.spi;
-
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-
-import java.util.List;
-import java.util.Set;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.opendaylight.restconf.api.query.DepthParam;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;
-import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
-import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
-import org.opendaylight.yangtools.yang.data.api.schema.SystemLeafSetNode;
-import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
-import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-
-/**
- * Unit test for {@link NormalizedNodeWriter} used with all parameters.
- */
-@RunWith(MockitoJUnitRunner.StrictStubs.class)
-public class RestconfNormalizedNodeWriterParametersTest {
-    private final String leafSetEntryNodeValue = "leaf-set-value";
-    private final NodeIdentifier containerNodeIdentifier =
-        NodeIdentifier.create(QName.create("namespace", "container"));
-    private final NodeIdentifier leafSetNodeIdentifier = NodeIdentifier.create(QName.create("namespace", "leaf-set"));
-    private final NodeWithValue<String> leafSetEntryNodeIdentifier =
-        new NodeWithValue<>(QName.create("namespace", "leaf-set-entry"), leafSetEntryNodeValue);
-
-    private final LeafSetEntryNode<String> leafSetEntryNodeData = ImmutableNodes.<String>newLeafSetEntryBuilder()
-        .withNodeIdentifier(leafSetEntryNodeIdentifier)
-        .withValue(leafSetEntryNodeValue)
-        .build();
-    private final SystemLeafSetNode<String> leafSetNodeData = ImmutableNodes.<String>newSystemLeafSetBuilder()
-        .withNodeIdentifier(leafSetNodeIdentifier)
-        .withChild(leafSetEntryNodeData)
-        .build();
-    private final ContainerNode containerNodeData = ImmutableNodes.newContainerBuilder()
-        .withNodeIdentifier(containerNodeIdentifier)
-        .withChild(leafSetNodeData)
-        .build();
-    private final ContainerNode rootDataContainerData = ImmutableNodes.newContainerBuilder()
-        .withNodeIdentifier(NodeIdentifier.create(
-            QName.create("urn:ietf:params:xml:ns:netconf:base:1.0", "data")))
-        .withChild(leafSetNodeData)
-        .build();
-
-    @Mock
-    private NormalizedNodeStreamWriter writer;
-
-    /**
-     * Test write {@link ContainerNode} when all its children are selected to be written by fields parameter.
-     * Depth parameter is also used and limits output to depth 1.
-     * Fields parameter has effect limiting depth parameter in the way that selected nodes and its ancestors are
-     * written regardless of their depth (some of container children have depth > 1).
-     * Fields parameter selects all container children to be written and also all children of those children.
-     */
-    @Test
-    public void writeContainerParameterPrioritiesTest() throws Exception {
-        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.min(),
-            List.of(
-                Set.of(leafSetNodeIdentifier.getNodeType()),
-                Set.of(leafSetEntryNodeIdentifier.getNodeType())));
-
-        parameterWriter.write(containerNodeData);
-
-        final var inOrder = inOrder(writer);
-        inOrder.verify(writer, times(1)).startContainerNode(containerNodeIdentifier, 1);
-        inOrder.verify(writer, times(1)).startLeafSet(leafSetNodeIdentifier, 1);
-        inOrder.verify(writer, times(1)).startLeafSetEntryNode(leafSetEntryNodeIdentifier);
-        inOrder.verify(writer, times(1)).scalarValue(leafSetEntryNodeValue);
-        inOrder.verify(writer, times(3)).endNode();
-        verifyNoMoreInteractions(writer);
-    }
-
-    /**
-     * Test write {@link ContainerNode} which represents data at restconf/data root.
-     * No parameters are used.
-     */
-    @Test
-    public void writeRootDataTest() throws Exception {
-        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, null);
-
-        parameterWriter.write(rootDataContainerData);
-
-        final var inOrder = inOrder(writer);
-        inOrder.verify(writer, times(1)).startLeafSet(leafSetNodeIdentifier, 1);
-        inOrder.verify(writer, times(1)).startLeafSetEntryNode(leafSetEntryNodeIdentifier);
-        inOrder.verify(writer, times(1)).scalarValue(leafSetEntryNodeValue);
-        inOrder.verify(writer, times(2)).endNode();
-        verifyNoMoreInteractions(writer);
-    }
-
-    @Test
-    public void writeEmptyRootContainerTest() throws Exception {
-        final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, null);
-
-        parameterWriter.write(ImmutableNodes.newContainerBuilder()
-            .withNodeIdentifier(new NodeIdentifier(SchemaContext.NAME))
-            .build());
-    }
-}