X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-clustering-commons%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Futil%2FInstanceIdentifierUtilsTest.java;h=d15f534f805ee5bc345afcfb05be903f0f9e85e0;hp=136748e3416ffa176f60d03cf489e20df0967ced;hb=85a4118a6fe51d8571a1e7bb398d954e4ceddd33;hpb=c911a187bdcd6160c1929e53466cd9de681c2098

diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/InstanceIdentifierUtilsTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/InstanceIdentifierUtilsTest.java
index 136748e341..d15f534f80 100644
--- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/InstanceIdentifierUtilsTest.java
+++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/InstanceIdentifierUtilsTest.java
@@ -10,152 +10,152 @@
 
 package org.opendaylight.controller.cluster.datastore.util;
 
+import com.google.common.collect.ImmutableSet;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opendaylight.controller.cluster.datastore.node.utils.serialization.QNameDeSerializationContext;
+import org.opendaylight.controller.cluster.datastore.node.utils.serialization.QNameDeSerializationContextImpl;
+import org.opendaylight.controller.cluster.datastore.node.utils.serialization.QNameSerializationContextImpl;
 import org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
 
 public class InstanceIdentifierUtilsTest {
 
-  private static QName TEST_QNAME =
-      QName
-          .create("(urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test?revision=2014-03-13)test");
-  private static QName NODE_WITH_VALUE_QNAME =
-      QName
-          .create("(urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test?revision=2014-03-13)value");
-  private static QName NODE_WITH_PREDICATES_QNAME =
-      QName
-          .create("(urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test?revision=2014-03-13)pred");
-  private static QName NAME_QNAME =
-      QName
-          .create("(urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test?revision=2014-03-13)name");
-
-  @Test
-  public void testSerializationOfNodeIdentifier() {
-    YangInstanceIdentifier.PathArgument p1 =
-        new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME);
-
-    List<YangInstanceIdentifier.PathArgument> arguments = new ArrayList<>();
-
-    arguments.add(p1);
+    private static QName TEST_QNAME = QName
+            .create("(urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test?revision=2014-03-13)test");
+    private static QName NODE_WITH_VALUE_QNAME = QName
+            .create("(urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test?revision=2014-03-13)value");
+    private static QName NODE_WITH_PREDICATES_QNAME = QName
+            .create("(urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test?revision=2014-03-13)pred");
+    private static QName NAME_QNAME = QName
+            .create("(urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test?revision=2014-03-13)name");
 
-    YangInstanceIdentifier expected = YangInstanceIdentifier.create(arguments);
+    @Test
+    public void testSerializationOfNodeIdentifier() {
+        YangInstanceIdentifier.PathArgument p1 = new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME);
 
-    NormalizedNodeMessages.InstanceIdentifier instanceIdentifier =
-        InstanceIdentifierUtils.toSerializable(expected);
+        List<YangInstanceIdentifier.PathArgument> arguments = new ArrayList<>();
 
-    YangInstanceIdentifier actual =
-        InstanceIdentifierUtils.fromSerializable(instanceIdentifier);
+        arguments.add(p1);
 
+        YangInstanceIdentifier expected = YangInstanceIdentifier.create(arguments);
 
-    Assert.assertEquals(expected.getLastPathArgument(),
-        actual.getLastPathArgument());
+        NormalizedNodeMessages.InstanceIdentifier instanceIdentifier =
+                InstanceIdentifierUtils.toSerializable(expected);
 
+        YangInstanceIdentifier actual = InstanceIdentifierUtils.fromSerializable(instanceIdentifier);
 
-  }
+        Assert.assertEquals(expected.getLastPathArgument(), actual.getLastPathArgument());
+    }
 
-  @Test
-  public void testSerializationOfNodeWithValue() {
+    @Test
+    public void testSerializationOfNodeWithValue() {
 
-    withValue((short) 1);
-    withValue((long) 2);
-    withValue(3);
-    withValue(true);
+        withValue((short) 1);
+        withValue((long) 2);
+        withValue(3);
+        withValue(true);
 
-  }
+    }
 
-  private void withValue(Object value) {
-    YangInstanceIdentifier.PathArgument p1 =
-        new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME);
+    private void withValue(Object value) {
+        YangInstanceIdentifier.PathArgument p1 = new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME);
 
-    YangInstanceIdentifier.PathArgument p2 =
-        new YangInstanceIdentifier.NodeWithValue(NODE_WITH_VALUE_QNAME, value);
+        YangInstanceIdentifier.PathArgument p2 =
+                new YangInstanceIdentifier.NodeWithValue(NODE_WITH_VALUE_QNAME, value);
 
+        List<YangInstanceIdentifier.PathArgument> arguments = new ArrayList<>();
 
-    List<YangInstanceIdentifier.PathArgument> arguments = new ArrayList<>();
+        arguments.add(p1);
+        arguments.add(p2);
 
-    arguments.add(p1);
-    arguments.add(p2);
+        YangInstanceIdentifier expected = YangInstanceIdentifier.create(arguments);
 
-    YangInstanceIdentifier expected = YangInstanceIdentifier.create(arguments);
+        NormalizedNodeMessages.InstanceIdentifier instanceIdentifier =
+                InstanceIdentifierUtils.toSerializable(expected);
 
-    NormalizedNodeMessages.InstanceIdentifier instanceIdentifier =
-        InstanceIdentifierUtils.toSerializable(expected);
+        YangInstanceIdentifier actual = InstanceIdentifierUtils.fromSerializable(instanceIdentifier);
 
-    YangInstanceIdentifier actual =
-        InstanceIdentifierUtils.fromSerializable(instanceIdentifier);
+        Assert.assertEquals(expected.getLastPathArgument(), actual.getLastPathArgument());
+    }
 
+    @Test
+    public void testSerializationOfNodeIdentifierWithPredicates() {
 
-    Assert.assertEquals(expected.getLastPathArgument(),
-        actual.getLastPathArgument());
-  }
+        withPredicates((short) 1);
+        withPredicates((long) 2);
+        withPredicates(3);
+        withPredicates(true);
 
+    }
 
-  @Test
-  public void testSerializationOfNodeIdentifierWithPredicates() {
+    private void withPredicates(Object value) {
+        YangInstanceIdentifier.PathArgument p1 = new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME);
 
-    withPredicates((short) 1);
-    withPredicates((long) 2);
-    withPredicates(3);
-    withPredicates(true);
+        YangInstanceIdentifier.PathArgument p2 = new YangInstanceIdentifier.NodeIdentifierWithPredicates(
+                NODE_WITH_PREDICATES_QNAME, NAME_QNAME, value);
 
-  }
+        List<YangInstanceIdentifier.PathArgument> arguments = new ArrayList<>();
 
-  private void withPredicates(Object value) {
-    YangInstanceIdentifier.PathArgument p1 =
-        new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME);
+        arguments.add(p1);
+        arguments.add(p2);
 
-    YangInstanceIdentifier.PathArgument p2 =
-        new YangInstanceIdentifier.NodeIdentifierWithPredicates(
-            NODE_WITH_PREDICATES_QNAME, NAME_QNAME, value);
+        YangInstanceIdentifier expected = YangInstanceIdentifier.create(arguments);
 
+        NormalizedNodeMessages.InstanceIdentifier instanceIdentifier =
+                InstanceIdentifierUtils.toSerializable(expected);
 
-    List<YangInstanceIdentifier.PathArgument> arguments = new ArrayList<>();
+        YangInstanceIdentifier actual = InstanceIdentifierUtils.fromSerializable(instanceIdentifier);
 
-    arguments.add(p1);
-    arguments.add(p2);
+        Assert.assertEquals(expected.getLastPathArgument(), actual.getLastPathArgument());
+    }
 
-    YangInstanceIdentifier expected = YangInstanceIdentifier.create(arguments);
+    @Test
+    public void testAugmentationIdentifier() {
+        YangInstanceIdentifier.PathArgument p1 = new YangInstanceIdentifier.AugmentationIdentifier(
+            ImmutableSet.of(TEST_QNAME));
 
-    NormalizedNodeMessages.InstanceIdentifier instanceIdentifier =
-        InstanceIdentifierUtils.toSerializable(expected);
+        List<YangInstanceIdentifier.PathArgument> arguments = new ArrayList<>();
 
-    YangInstanceIdentifier actual =
-        InstanceIdentifierUtils.fromSerializable(instanceIdentifier);
+        arguments.add(p1);
 
+        YangInstanceIdentifier expected = YangInstanceIdentifier.create(arguments);
 
-    Assert.assertEquals(expected.getLastPathArgument(),
-        actual.getLastPathArgument());
-  }
+        NormalizedNodeMessages.InstanceIdentifier instanceIdentifier =
+                InstanceIdentifierUtils.toSerializable(expected);
 
-  @Test
-  public void testAugmentationIdentifier() {
-    YangInstanceIdentifier.PathArgument p1 =
-        new YangInstanceIdentifier.AugmentationIdentifier(new HashSet(
-            Arrays.asList(TEST_QNAME)));
+        YangInstanceIdentifier actual = InstanceIdentifierUtils.fromSerializable(instanceIdentifier);
 
-    List<YangInstanceIdentifier.PathArgument> arguments = new ArrayList<>();
+        Assert.assertEquals(expected.getLastPathArgument(), actual.getLastPathArgument());
 
-    arguments.add(p1);
+    }
 
-    YangInstanceIdentifier expected = YangInstanceIdentifier.create(arguments);
+    @Test
+    public void testSerializationWithContext() {
+        List<YangInstanceIdentifier.PathArgument> arguments =
+                                                Arrays.<YangInstanceIdentifier.PathArgument>asList(
+                new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME),
+                new YangInstanceIdentifier.NodeWithValue(NODE_WITH_VALUE_QNAME, 1),
+                new YangInstanceIdentifier.NodeIdentifierWithPredicates(
+                        NODE_WITH_PREDICATES_QNAME, NAME_QNAME, 2));
 
-    NormalizedNodeMessages.InstanceIdentifier instanceIdentifier =
-        InstanceIdentifierUtils.toSerializable(expected);
+        YangInstanceIdentifier expected = YangInstanceIdentifier.create(arguments);
 
-    YangInstanceIdentifier actual =
-        InstanceIdentifierUtils.fromSerializable(instanceIdentifier);
+        QNameSerializationContextImpl serializationContext = new QNameSerializationContextImpl();
 
+        NormalizedNodeMessages.InstanceIdentifier instanceIdentifier =
+                InstanceIdentifierUtils.toSerializable(expected, serializationContext);
 
-    Assert.assertEquals(expected.getLastPathArgument(),
-        actual.getLastPathArgument());
+        QNameDeSerializationContext deserializationContext = new QNameDeSerializationContextImpl(
+                serializationContext.getCodes());
 
-  }
+        YangInstanceIdentifier actual = InstanceIdentifierUtils.fromSerializable(
+                instanceIdentifier, deserializationContext);
 
+        Assert.assertEquals(expected.getLastPathArgument(), actual.getLastPathArgument());
+    }
 }