X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=restconf%2Frestconf-nb-rfc8040%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Frestconf%2Fnb%2Frfc8040%2Fjersey%2Fproviders%2FParameterAwareNormalizedNodeWriterDepthTest.java;h=5b7aee438f45542636262102bfe8b5b1ce4de019;hb=refs%2Fchanges%2F13%2F101713%2F1;hp=a3e1f635cceb1d502141cba92b0c35767c42a6de;hpb=959d0adb82d69e18b4507a9010167c59c9b6cd46;p=netconf.git diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterDepthTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterDepthTest.java index a3e1f635cc..5b7aee438f 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterDepthTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterDepthTest.java @@ -13,10 +13,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import com.google.common.collect.Sets; import java.util.Collection; -import java.util.Collections; +import java.util.List; import java.util.Optional; +import java.util.Set; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -24,8 +24,8 @@ import org.junit.runner.RunWith; import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.opendaylight.restconf.nb.rfc8040.DepthParam; 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.YangInstanceIdentifier.NodeWithValue; @@ -36,6 +36,8 @@ 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; /** @@ -43,17 +45,16 @@ import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStre */ @RunWith(MockitoJUnitRunner.StrictStubs.class) public class ParameterAwareNormalizedNodeWriterDepthTest { - @Mock private NormalizedNodeStreamWriter writer; @Mock private ContainerNode containerNodeData; @Mock - private MapNode mapNodeData; + private SystemMapNode mapNodeData; @Mock private MapEntryNode mapEntryNodeData; @Mock - private LeafSetNode leafSetNodeData; + private SystemLeafSetNode leafSetNodeData; @Mock private LeafSetEntryNode leafSetEntryNodeData; @Mock @@ -65,13 +66,13 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { private NodeIdentifier mapNodeIdentifier; private NodeIdentifierWithPredicates mapEntryNodeIdentifier; private NodeIdentifier leafSetNodeIdentifier; - private NodeWithValue leafSetEntryNodeIdentifier; + private NodeWithValue leafSetEntryNodeIdentifier; private NodeIdentifier keyLeafNodeIdentifier; private NodeIdentifier anotherLeafNodeIdentifier; - private Collection> containerNodeValue; + private Collection containerNodeValue; private Collection mapNodeValue; - private Collection> mapEntryNodeValue; + private Collection mapEntryNodeValue; private Collection> leafSetNodeValue; private String leafSetEntryNodeValue; private String keyLeafNodeValue; @@ -82,7 +83,6 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { // identifiers containerNodeIdentifier = NodeIdentifier.create(QName.create("namespace", "container")); when(containerNodeData.getIdentifier()).thenReturn(containerNodeIdentifier); - when(containerNodeData.getNodeType()).thenReturn(containerNodeIdentifier.getNodeType()); mapNodeIdentifier = NodeIdentifier.create(QName.create("namespace", "list")); when(mapNodeData.getIdentifier()).thenReturn(mapNodeIdentifier); @@ -99,34 +99,34 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { keyLeafNodeIdentifier = NodeIdentifier.create(mapEntryNodeKey); keyLeafNodeValue = "key-value"; - mapEntryNodeIdentifier = new YangInstanceIdentifier.NodeIdentifierWithPredicates( - QName.create("namespace", "list-entry"), Collections.singletonMap(mapEntryNodeKey, keyLeafNodeValue)); + mapEntryNodeIdentifier = NodeIdentifierWithPredicates.of( + QName.create("namespace", "list-entry"), mapEntryNodeKey, keyLeafNodeValue); when(mapEntryNodeData.getIdentifier()).thenReturn(mapEntryNodeIdentifier); - when(mapEntryNodeData.getChild(keyLeafNodeIdentifier)).thenReturn(Optional.of(keyLeafNodeData)); + when(mapEntryNodeData.findChildByArg(keyLeafNodeIdentifier)).thenReturn(Optional.of(keyLeafNodeData)); - when(keyLeafNodeData.getValue()).thenReturn(keyLeafNodeValue); + when(keyLeafNodeData.body()).thenReturn(keyLeafNodeValue); when(keyLeafNodeData.getIdentifier()).thenReturn(keyLeafNodeIdentifier); anotherLeafNodeIdentifier = NodeIdentifier.create(QName.create("namespace", "another-field")); anotherLeafNodeValue = "another-value"; - when(anotherLeafNodeData.getValue()).thenReturn(anotherLeafNodeValue); + when(anotherLeafNodeData.body()).thenReturn(anotherLeafNodeValue); when(anotherLeafNodeData.getIdentifier()).thenReturn(anotherLeafNodeIdentifier); // values - when(leafSetEntryNodeData.getValue()).thenReturn(leafSetEntryNodeValue); + when(leafSetEntryNodeData.body()).thenReturn(leafSetEntryNodeValue); - leafSetNodeValue = Collections.singletonList(leafSetEntryNodeData); - when(leafSetNodeData.getValue()).thenReturn(leafSetNodeValue); + leafSetNodeValue = List.of(leafSetEntryNodeData); + when(leafSetNodeData.body()).thenReturn(leafSetNodeValue); - containerNodeValue = Collections.singleton(leafSetNodeData); - when(containerNodeData.getValue()).thenReturn(containerNodeValue); + containerNodeValue = Set.of(leafSetNodeData); + when(containerNodeData.body()).thenReturn(containerNodeValue); - mapEntryNodeValue = Sets.newHashSet(keyLeafNodeData, anotherLeafNodeData); - when(mapEntryNodeData.getValue()).thenReturn(mapEntryNodeValue); + mapEntryNodeValue = Set.of(keyLeafNodeData, anotherLeafNodeData); + when(mapEntryNodeData.body()).thenReturn(mapEntryNodeValue); - mapNodeValue = Collections.singleton(mapEntryNodeData); - when(mapNodeData.getValue()).thenReturn(mapNodeValue); + mapNodeValue = Set.of(mapEntryNodeData); + when(mapNodeData.body()).thenReturn(mapNodeValue); } /** @@ -135,8 +135,8 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { */ @Test public void writeContainerWithoutChildrenDepthTest() throws Exception { - final ParameterAwareNormalizedNodeWriter parameterWriter = ParameterAwareNormalizedNodeWriter - .forStreamWriter(writer, 1, null); + final ParameterAwareNormalizedNodeWriter parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter( + writer, DepthParam.min(), null); parameterWriter.write(containerNodeData); @@ -153,7 +153,7 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { @Test public void writeContainerWithChildrenDepthTest() throws Exception { final ParameterAwareNormalizedNodeWriter parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter( - writer, Integer.MAX_VALUE, null); + writer, DepthParam.max(), null); parameterWriter.write(containerNodeData); @@ -172,8 +172,8 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { */ @Test public void writeMapNodeWithoutChildrenDepthTest() throws Exception { - final ParameterAwareNormalizedNodeWriter parameterWriter = ParameterAwareNormalizedNodeWriter - .forStreamWriter(writer, 1, null); + final ParameterAwareNormalizedNodeWriter parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter( + writer, DepthParam.min(), null); parameterWriter.write(mapNodeData); @@ -195,7 +195,7 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { @Test public void writeMapNodeWithChildrenDepthTest() throws Exception { final ParameterAwareNormalizedNodeWriter parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter( - writer, Integer.MAX_VALUE, null); + writer, DepthParam.max(), null); parameterWriter.write(mapNodeData); @@ -222,7 +222,7 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { @Test public void writeLeafSetNodeWithoutChildrenDepthTest() throws Exception { final ParameterAwareNormalizedNodeWriter parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter( - writer, 1, null); + writer, DepthParam.min(), null); parameterWriter.write(leafSetNodeData); @@ -239,7 +239,7 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { @Test public void writeLeafSetNodeWithChildrenDepthTest() throws Exception { final ParameterAwareNormalizedNodeWriter parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter( - writer, Integer.MAX_VALUE, null); + writer, DepthParam.max(), null); parameterWriter.write(leafSetNodeData); @@ -258,7 +258,7 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { @Test public void writeLeafSetEntryNodeDepthTest() throws Exception { final ParameterAwareNormalizedNodeWriter parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter( - writer, Integer.MAX_VALUE, null); + writer, DepthParam.max(), null); parameterWriter.write(leafSetEntryNodeData); @@ -276,7 +276,7 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { @Test public void writeMapEntryNodeUnorderedOnlyKeysDepthTest() throws Exception { final ParameterAwareNormalizedNodeWriter parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter( - writer, false, 1, null); + writer, false, DepthParam.min(), null); parameterWriter.write(mapEntryNodeData); @@ -296,7 +296,7 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { @Test public void writeMapEntryNodeUnorderedDepthTest() throws Exception { final ParameterAwareNormalizedNodeWriter parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter( - writer, false, Integer.MAX_VALUE, null); + writer, false, DepthParam.max(), null); parameterWriter.write(mapEntryNodeData); @@ -317,7 +317,7 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { @Test public void writeMapEntryNodeOrderedWithoutChildrenTest() throws Exception { final ParameterAwareNormalizedNodeWriter parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter( - writer, true, 1, null); + writer, true, DepthParam.min(), null); parameterWriter.write(mapEntryNodeData); @@ -338,7 +338,7 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { @Test public void writeMapEntryNodeOrderedTest() throws Exception { final ParameterAwareNormalizedNodeWriter parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter( - writer, true, Integer.MAX_VALUE, null); + writer, true, DepthParam.max(), null); parameterWriter.write(mapEntryNodeData);