Seal NormalizedNode hierarchy

[yangtools.git] / data / yang-data-tree-spi / src / test / java / org / opendaylight / yangtools / yang / data / tree / spi / NormalizedNodeDataTreeCandidateNodeTest.java

diff --git a/data/yang-data-tree-spi/src/test/java/org/opendaylight/yangtools/yang/data/tree/spi/NormalizedNodeDataTreeCandidateNodeTest.java b/data/yang-data-tree-spi/src/test/java/org/opendaylight/yangtools/yang/data/tree/spi/NormalizedNodeDataTreeCandidateNodeTest.java
index 632517a1f0fcee8ed45448c472253d7640c9b631..6023e98219e2b4eb073b324ea135f3d3d524be2b 100644 (file)
--- a/data/yang-data-tree-spi/src/test/java/org/opendaylight/yangtools/yang/data/tree/spi/NormalizedNodeDataTreeCandidateNodeTest.java
+++ b/data/yang-data-tree-spi/src/test/java/org/opendaylight/yangtools/yang/data/tree/spi/NormalizedNodeDataTreeCandidateNodeTest.java
@@ -7,64 +7,62 @@
  */
 package org.opendaylight.yangtools.yang.data.tree.spi;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
-import java.util.Optional;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
-import org.opendaylight.yangtools.yang.data.api.schema.DistinctNodeContainer;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidateNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
 import org.opendaylight.yangtools.yang.data.tree.api.ModificationType;
 
-public class NormalizedNodeDataTreeCandidateNodeTest {
+class NormalizedNodeDataTreeCandidateNodeTest {
     @Test
-    public void testNormalizedNodeDataTreeCandidateNode() {
-        final NormalizedNode mockedNormalizedNode = mock(NormalizedNode.class);
-        final NormalizedNodeDataTreeCandidateNode normalizedNodeDataTreeCandidateNode = new
+    void testNormalizedNodeDataTreeCandidateNode() {
+        final var mockedNormalizedNode = mock(LeafNode.class);
+        final var normalizedNodeDataTreeCandidateNode = new
                 NormalizedNodeDataTreeCandidateNode(mockedNormalizedNode);
 
         final var mockedPathArgument = new NodeIdentifier(QName.create("test", "test"));
         doReturn(mockedPathArgument).when(mockedNormalizedNode).name();
-        assertSame(mockedPathArgument, normalizedNodeDataTreeCandidateNode.getIdentifier());
+        assertSame(mockedPathArgument, normalizedNodeDataTreeCandidateNode.name());
 
-        final Collection<DataTreeCandidateNode> childNodes = normalizedNodeDataTreeCandidateNode.getChildNodes();
-        assertTrue(childNodes instanceof List);
+        final var childNodes = normalizedNodeDataTreeCandidateNode.childNodes();
+        assertInstanceOf(List.class, childNodes);
         assertTrue(childNodes.isEmpty());
 
-        assertEquals(Optional.empty(), normalizedNodeDataTreeCandidateNode.getModifiedChild(mockedPathArgument));
+        assertNull(normalizedNodeDataTreeCandidateNode.modifiedChild(mockedPathArgument));
 
-        assertEquals(ModificationType.WRITE, normalizedNodeDataTreeCandidateNode.getModificationType());
-        assertEquals(Optional.of(mockedNormalizedNode), normalizedNodeDataTreeCandidateNode.getDataAfter());
-        assertEquals(Optional.empty(), normalizedNodeDataTreeCandidateNode.getDataBefore());
+        assertEquals(ModificationType.WRITE, normalizedNodeDataTreeCandidateNode.modificationType());
+        assertEquals(mockedNormalizedNode, normalizedNodeDataTreeCandidateNode.dataAfter());
+        assertNull(normalizedNodeDataTreeCandidateNode.dataBefore());
 
-        final DistinctNodeContainer mockedNormalizedNodeContainer = mock(DistinctNodeContainer.class);
-        final NormalizedNodeDataTreeCandidateNode normalizedNodeDataTreeCandidateNode2 = new
+        final var mockedNormalizedNodeContainer = mock(ContainerNode.class);
+        final var normalizedNodeDataTreeCandidateNode2 = new
                 NormalizedNodeDataTreeCandidateNode(mockedNormalizedNodeContainer);
-        final NormalizedNode mockedChildNormNode1 = mock(NormalizedNode.class);
-        final NormalizedNode mockedChildNormNode2 = mock(NormalizedNode.class);
-        final Collection<NormalizedNode> mockedChildNodes = Arrays.asList(mockedChildNormNode1,
-                mockedChildNormNode2, null);
+        final var mockedChildNormNode1 = mock(LeafNode.class);
+        final var mockedChildNormNode2 = mock(LeafNode.class);
+        final var mockedChildNodes = Arrays.asList(mockedChildNormNode1, mockedChildNormNode2, null);
         doReturn(mockedChildNodes).when(mockedNormalizedNodeContainer).body();
-        final Collection<DataTreeCandidateNode> childNodes2 = normalizedNodeDataTreeCandidateNode2.getChildNodes();
+        final var childNodes2 = normalizedNodeDataTreeCandidateNode2.childNodes();
         assertEquals(3, childNodes2.size());
 
-        doReturn(null).when(mockedNormalizedNodeContainer).childByArg(any(PathArgument.class));
-        doCallRealMethod().when(mockedNormalizedNodeContainer).findChildByArg(any(PathArgument.class));
-        assertEquals(Optional.empty(), normalizedNodeDataTreeCandidateNode2.getModifiedChild(mockedPathArgument));
+        doReturn(null).when(mockedNormalizedNodeContainer).childByArg(any());
+        doCallRealMethod().when(mockedNormalizedNodeContainer).findChildByArg(any());
+        assertNull(normalizedNodeDataTreeCandidateNode2.modifiedChild(mockedPathArgument));
 
-        doReturn(mockedChildNormNode1).when(mockedNormalizedNodeContainer).childByArg(any(PathArgument.class));
-        assertTrue(normalizedNodeDataTreeCandidateNode2.getModifiedChild(mockedPathArgument).isPresent());
+        doReturn(mockedChildNormNode1).when(mockedNormalizedNodeContainer).childByArg(any());
+        assertNotNull(normalizedNodeDataTreeCandidateNode2.modifiedChild(mockedPathArgument));
     }
 }