X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fsal-clustering-commons%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fnode%2Futils%2Fserialization%2FPathArgumentSerializerTest.java;h=922bc1bfa6828120c219f4609ffcd08d7870349d;hb=38fa2a64bd6e206b2d8a6b153154104347854408;hp=0990cdd4aa5265bcdaff278fd194b4e659eeaa82;hpb=7ca766e911670b348d68c191ba16a903f1bdc245;p=controller.git

diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/PathArgumentSerializerTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/PathArgumentSerializerTest.java
index 0990cdd4aa..922bc1bfa6 100644
--- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/PathArgumentSerializerTest.java
+++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/PathArgumentSerializerTest.java
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2014, 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 package org.opendaylight.controller.cluster.datastore.node.utils.serialization;
 
 import com.google.common.collect.ImmutableMap;
@@ -8,8 +16,11 @@ import org.junit.rules.ExpectedException;
 import org.opendaylight.controller.cluster.datastore.util.TestModel;
 import org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
+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;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import java.net.URI;
 import java.util.Date;
 import java.util.HashMap;
@@ -31,8 +42,7 @@ public class PathArgumentSerializerTest{
         expectedException.expect(NullPointerException.class);
         expectedException.expectMessage("context should not be null");
 
-        PathArgumentSerializer.serialize(null, mock(
-            YangInstanceIdentifier.PathArgument.class));
+        PathArgumentSerializer.serialize(null, mock(PathArgument.class));
     }
 
     @Test
@@ -72,7 +82,7 @@ public class PathArgumentSerializerTest{
 
         NormalizedNodeMessages.PathArgument actual = PathArgumentSerializer
             .serialize(serializationContext,
-                new YangInstanceIdentifier.NodeIdentifier(
+                new NodeIdentifier(
                     TestModel.TEST_QNAME));
 
         assertEquals(PathArgumentType.NODE_IDENTIFIER.ordinal(), actual.getIntType());
@@ -93,7 +103,7 @@ public class PathArgumentSerializerTest{
 
         NormalizedNodeMessages.PathArgument actual = PathArgumentSerializer
             .serialize(serializationContext,
-                new YangInstanceIdentifier.NodeWithValue(
+                new NodeWithValue<>(
                     TestModel.TEST_QNAME, "foo"));
 
         assertEquals(PathArgumentType.NODE_IDENTIFIER_WITH_VALUE.ordinal(), actual.getIntType());
@@ -126,8 +136,7 @@ public class PathArgumentSerializerTest{
 
         NormalizedNodeMessages.PathArgument actual = PathArgumentSerializer
             .serialize(serializationContext,
-                new YangInstanceIdentifier.NodeIdentifierWithPredicates(
-                    TestModel.TEST_QNAME, predicates));
+                new NodeIdentifierWithPredicates(TestModel.TEST_QNAME, predicates));
 
         assertEquals(PathArgumentType.NODE_IDENTIFIER_WITH_PREDICATES.ordinal(), actual.getIntType());
         assertEquals(5, actual.getNodeType().getLocalName());
@@ -153,8 +162,7 @@ public class PathArgumentSerializerTest{
 
         NormalizedNodeMessages.PathArgument actual = PathArgumentSerializer
             .serialize(serializationContext,
-                new YangInstanceIdentifier.AugmentationIdentifier(
-                    ImmutableSet.of(TestModel.TEST_QNAME)));
+                new AugmentationIdentifier(ImmutableSet.of(TestModel.TEST_QNAME)));
 
         assertEquals(PathArgumentType.AUGMENTATION_IDENTIFIER.ordinal(), actual.getIntType());
 
@@ -182,11 +190,9 @@ public class PathArgumentSerializerTest{
         nodeBuilder.addCode(TestModel.TEST_QNAME.getFormattedRevision());
         nodeBuilder.addCode(TestModel.TEST_QNAME.getLocalName());
 
-        YangInstanceIdentifier.PathArgument pathArgument =
-            NormalizedNodeSerializer
-                .deSerialize(nodeBuilder.build(), pathBuilder.build());
+        PathArgument pathArgument = NormalizedNodeSerializer.deSerialize(nodeBuilder.build(), pathBuilder.build());
 
-        assertEquals(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME), pathArgument);
+        assertEquals(new NodeIdentifier(TestModel.TEST_QNAME), pathArgument);
 
     }
 
@@ -210,11 +216,9 @@ public class PathArgumentSerializerTest{
         nodeBuilder.addCode(TestModel.TEST_QNAME.getFormattedRevision());
         nodeBuilder.addCode(TestModel.TEST_QNAME.getLocalName());
 
-        YangInstanceIdentifier.PathArgument pathArgument =
-            NormalizedNodeSerializer
-                .deSerialize(nodeBuilder.build(), pathBuilder.build());
+        PathArgument pathArgument = NormalizedNodeSerializer.deSerialize(nodeBuilder.build(), pathBuilder.build());
 
-        assertEquals(new YangInstanceIdentifier.NodeWithValue(TestModel.TEST_QNAME, "foo"), pathArgument);
+        assertEquals(new NodeWithValue<>(TestModel.TEST_QNAME, "foo"), pathArgument);
 
     }
     @Test
@@ -236,11 +240,9 @@ public class PathArgumentSerializerTest{
         nodeBuilder.addCode(TestModel.TEST_QNAME.getFormattedRevision());
         nodeBuilder.addCode(TestModel.TEST_QNAME.getLocalName());
 
-        YangInstanceIdentifier.PathArgument pathArgument =
-            NormalizedNodeSerializer
-                .deSerialize(nodeBuilder.build(), pathBuilder.build());
+        PathArgument pathArgument = NormalizedNodeSerializer.deSerialize(nodeBuilder.build(), pathBuilder.build());
 
-        assertEquals(new YangInstanceIdentifier.NodeIdentifierWithPredicates(TestModel.TEST_QNAME,
+        assertEquals(new NodeIdentifierWithPredicates(TestModel.TEST_QNAME,
             ImmutableMap.<QName, Object>of(TestModel.TEST_QNAME, "foo")), pathArgument);
 
     }
@@ -261,14 +263,8 @@ public class PathArgumentSerializerTest{
         nodeBuilder.addCode(TestModel.TEST_QNAME.getFormattedRevision());
         nodeBuilder.addCode(TestModel.TEST_QNAME.getLocalName());
 
-        YangInstanceIdentifier.PathArgument pathArgument =
-            NormalizedNodeSerializer
-                .deSerialize(nodeBuilder.build(), pathBuilder.build());
-
-        assertEquals(new YangInstanceIdentifier.AugmentationIdentifier(ImmutableSet.of(TestModel.TEST_QNAME)), pathArgument);
+        PathArgument pathArgument = NormalizedNodeSerializer.deSerialize(nodeBuilder.build(), pathBuilder.build());
 
+        assertEquals(new AugmentationIdentifier(ImmutableSet.of(TestModel.TEST_QNAME)), pathArgument);
     }
-
-
-
 }