Improve BindingNormalizedNodeSerializer API

[mdsal.git] / binding / mdsal-binding-dom-codec / src / test / java / org / opendaylight / mdsal / binding / dom / codec / impl / TypedefTest.java

diff --git a/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/TypedefTest.java b/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/TypedefTest.java
index fb4946a24dcabbd99d0edf6c5b0930d378d2649c..efe975230fdc8b40e21263e5b3d2e7834ad03dc2 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/TypedefTest.java
+++ b/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/TypedefTest.java
@@ -9,7 +9,6 @@ package org.opendaylight.mdsal.binding.dom.codec.impl;
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.Map.Entry;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.bug8903.rev170829.DefaultPolicy;
 import org.opendaylight.yang.gen.v1.bug8903.rev170829.DefaultPolicyBuilder;
@@ -17,15 +16,10 @@ import org.opendaylight.yang.gen.v1.bug8903.rev170829.PolicyLoggingFlag;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.typedef.empty.rev170829.TestCont;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.typedef.empty.rev170829.TestContBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.typedef.empty.rev170829.TypedefEmpty;
-import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.Empty;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-
 
 public class TypedefTest extends AbstractBindingCodecTest {
-
     private static final InstanceIdentifier<DefaultPolicy> BA_DEFAULT_POLICY =
             InstanceIdentifier.builder(DefaultPolicy.class).build();
     private static final InstanceIdentifier<TestCont> BA_TEST_CONT =
@@ -38,28 +32,22 @@ public class TypedefTest extends AbstractBindingCodecTest {
                 .setAction2(new PolicyLoggingFlag(false))
                 .setAction3(true)
                 .build();
-        final Entry<YangInstanceIdentifier, NormalizedNode<?, ?>> dom =
-                codecContext.toNormalizedNode(BA_DEFAULT_POLICY, binding);
-        final Entry<InstanceIdentifier<?>, DataObject> readed =
-                codecContext.fromNormalizedNode(dom.getKey(),dom.getValue());
-
-        assertEquals(binding,readed.getValue());
+        final var dom = codecContext.toNormalizedDataObject(BA_DEFAULT_POLICY, binding);
+        final var readed = codecContext.fromNormalizedNode(dom.path(),dom.node());
 
+        assertEquals(binding, readed.getValue());
     }
 
     @Test
     public void testTypedefEmptyType() {
         TestCont binding = new TestContBuilder()
-                .setEmptyLeaf(Empty.getInstance())
-                .setEmptyLeaf2(new TypedefEmpty(Empty.getInstance()))
-                .setEmptyLeaf3(Empty.getInstance())
+                .setEmptyLeaf(Empty.value())
+                .setEmptyLeaf2(new TypedefEmpty(Empty.value()))
+                .setEmptyLeaf3(Empty.value())
                 .build();
-        final Entry<YangInstanceIdentifier, NormalizedNode<?, ?>> dom =
-                codecContext.toNormalizedNode(BA_TEST_CONT, binding);
-        final Entry<InstanceIdentifier<?>, DataObject> readed =
-                codecContext.fromNormalizedNode(dom.getKey(),dom.getValue());
-
-        assertEquals(binding,readed.getValue());
+        final var dom = codecContext.toNormalizedDataObject(BA_TEST_CONT, binding);
+        final var readed = codecContext.fromNormalizedNode(dom.path(),dom.node());
 
+        assertEquals(binding, readed.getValue());
     }
 }