X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=restconf%2Frestconf-nb%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Frestconf%2Fnb%2Frfc8040%2Futils%2Fparser%2FYangInstanceIdentifierDeserializerTest.java;h=815f01b4ac7bc8b38d0fca89507ebf2ad2ec7cb4;hb=c275eaa67b4b7fd1ea82a3cbcfc9415a19b41287;hp=a8e0b4339cad460a3ca7932652e64cc5d3331317;hpb=17234c4a086681de02eb452b8c32fd9e2d8ad6b3;p=netconf.git diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializerTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializerTest.java index a8e0b4339c..815f01b4ac 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializerTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializerTest.java @@ -32,7 +32,6 @@ import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint8; 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; @@ -621,7 +620,7 @@ public class YangInstanceIdentifierDeserializerTest { final List result = YangInstanceIdentifierDeserializer.create(SCHEMA_CONTEXT, "deserializer-test-included:augmented-list=100/deserializer-test:augmented-leaf") .path.getPathArguments(); - assertEquals(4, result.size()); + assertEquals(3, result.size()); // list final QName list = QName.create("deserializer:test:included", "2016-06-06", "augmented-list"); @@ -630,10 +629,8 @@ public class YangInstanceIdentifierDeserializerTest { result.get(1)); // augmented leaf - final QName augLeaf = QName.create("deserializer:test", "2016-06-06", "augmented-leaf"); - final QName augList = QName.create("deserializer:test", "2016-06-06", "augmenting-list"); - assertEquals(new AugmentationIdentifier(Set.of(augLeaf, augList)), result.get(2)); - assertEquals(NodeIdentifier.create(augLeaf), result.get(3)); + assertEquals(NodeIdentifier.create(QName.create("deserializer:test", "2016-06-06", "augmented-leaf")), + result.get(2)); } @Test @@ -641,7 +638,7 @@ public class YangInstanceIdentifierDeserializerTest { final List result = YangInstanceIdentifierDeserializer.create(SCHEMA_CONTEXT, "deserializer-test-included:augmented-list=100/deserializer-test:augmenting-list=0") .path.getPathArguments(); - assertEquals(5, result.size()); + assertEquals(4, result.size()); // list final QName list = QName.create("deserializer:test:included", "2016-06-06", "augmented-list"); @@ -650,11 +647,9 @@ public class YangInstanceIdentifierDeserializerTest { result.get(1)); // augmented list - final QName augLeaf = QName.create("deserializer:test", "2016-06-06", "augmented-leaf"); final QName augList = QName.create("deserializer:test", "2016-06-06", "augmenting-list"); - assertEquals(new AugmentationIdentifier(Set.of(augLeaf, augList)), result.get(2)); - assertEquals(NodeIdentifier.create(augList), result.get(3)); - assertEquals(NodeIdentifierWithPredicates.of(augList, QName.create(augList, "id"), 0), result.get(4)); + assertEquals(NodeIdentifier.create(augList), result.get(2)); + assertEquals(NodeIdentifierWithPredicates.of(augList, QName.create(augList, "id"), 0), result.get(3)); } /**