Bump to odlparent-9.0.0/yangtools-7.0.1-SNAPSHOT

[mdsal.git] / binding / mdsal-binding-dom-adapter / src / test / java / org / opendaylight / mdsal / binding / dom / adapter / CurrentAdapterSerializerTest.java

diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/CurrentAdapterSerializerTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/CurrentAdapterSerializerTest.java
index 1c4467710dc8012ff35d589cb56c9596da54a338..0d1d2b78f1a146f573596368dc284ddc3271861e 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/CurrentAdapterSerializerTest.java
+++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/CurrentAdapterSerializerTest.java
@@ -29,13 +29,10 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
-import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
-import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
 import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
@@ -54,7 +51,7 @@ public class CurrentAdapterSerializerTest {
     @Test
     public void fromNormalizedNodeTest() throws Exception {
         final EffectiveModelContext schemaCtx = YangParserTestUtils.parseYangResource("/test.yang");
-        final NormalizedNode<?, ?> data = prepareData(schemaCtx, Uint16.valueOf(42));
+        final NormalizedNode data = prepareData(schemaCtx, Uint16.valueOf(42));
         final Entry<InstanceIdentifier<?>, DataObject> fromNormalizedNode = fromNormalizedNode(data, schemaCtx);
 
         final DataObject value = fromNormalizedNode.getValue();
@@ -85,7 +82,7 @@ public class CurrentAdapterSerializerTest {
     @Test
     public void fromNormalizedNodeWithAnotherInputDataTest() throws Exception {
         final EffectiveModelContext schemaCtx = YangParserTestUtils.parseYangResource("/test.yang");
-        final NormalizedNode<?, ?> data = prepareData(schemaCtx, "42");
+        final NormalizedNode data = prepareData(schemaCtx, "42");
 
         final Entry<InstanceIdentifier<?>, DataObject> fromNormalizedNode = fromNormalizedNode(data, schemaCtx);
         final DataObject value = fromNormalizedNode.getValue();
@@ -99,19 +96,16 @@ public class CurrentAdapterSerializerTest {
         assertThat(ex.getCause(), instanceOf(IllegalArgumentException.class));
     }
 
-    private static NormalizedNode<?, ?> prepareData(final EffectiveModelContext schemaCtx, final Object value) {
-        final DataSchemaNode dataChildByName =
-                schemaCtx.getDataChildByName(QName.create("urn:test", "2017-01-01", "cont"));
-        final DataSchemaNode leaf = ((ContainerSchemaNode) dataChildByName)
-                .getDataChildByName(QName.create("urn:test", "2017-01-01", "vlan-id"));
-
-        final DataContainerChild<?, ?> child = Builders.leafBuilder((LeafSchemaNode) leaf).withValue(value).build();
-        final NormalizedNode<?, ?> data =
-                Builders.containerBuilder((ContainerSchemaNode) dataChildByName).withChild(child).build();
-        return data;
+    private static ContainerNode prepareData(final EffectiveModelContext schemaCtx, final Object value) {
+        return Builders.containerBuilder()
+            .withNodeIdentifier(new NodeIdentifier(QName.create("urn:test", "2017-01-01", "cont")))
+            .withChild(Builders.leafBuilder()
+                .withNodeIdentifier(new NodeIdentifier(QName.create("urn:test", "2017-01-01", "vlan-id")))
+                .withValue(value).build())
+            .build();
     }
 
-    private static Entry<InstanceIdentifier<?>, DataObject> fromNormalizedNode(final NormalizedNode<?, ?> data,
+    private static Entry<InstanceIdentifier<?>, DataObject> fromNormalizedNode(final NormalizedNode data,
             final EffectiveModelContext schemaCtx) {
         final CurrentAdapterSerializer codec = new CurrentAdapterSerializer(new BindingCodecContext(
             new DefaultBindingRuntimeContext(new DefaultBindingRuntimeGenerator().generateTypeMapping(schemaCtx),
@@ -135,13 +129,13 @@ public class CurrentAdapterSerializerTest {
         }
 
         @Override
-        public ListenableFuture<? extends YangTextSchemaSource> getSource(SourceIdentifier sourceIdentifier) {
+        public ListenableFuture<? extends YangTextSchemaSource> getSource(final SourceIdentifier sourceIdentifier) {
             throw new UnsupportedOperationException();
         }
 
         @Override
         @SuppressWarnings("unchecked")
-        public <T> Class<T> loadClass(String fullyQualifiedName) throws ClassNotFoundException {
+        public <T> Class<T> loadClass(final String fullyQualifiedName) throws ClassNotFoundException {
             return (Class<T>) Class.forName(fullyQualifiedName);
         }
     }