Bug 7433 - Remove use of YangSchemaSourceImpl from restconf tests

[netconf.git] / restconf / sal-rest-connector / src / test / java / org / opendaylight / netconf / sal / restconf / impl / InstanceIdentifierCodecImplTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/netconf/sal/restconf/impl/InstanceIdentifierCodecImplTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/netconf/sal/restconf/impl/InstanceIdentifierCodecImplTest.java
index de9e1f54581a987b2fd2a851054b6da91bd329ad..207dac862ad2193bd29fe245f6b63101fb7d4309 100644 (file)
--- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/netconf/sal/restconf/impl/InstanceIdentifierCodecImplTest.java
+++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/netconf/sal/restconf/impl/InstanceIdentifierCodecImplTest.java
@@ -10,15 +10,16 @@ package org.opendaylight.netconf.sal.restconf.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.opendaylight.netconf.sal.restconf.impl.RestCodec.InstanceIdentifierCodecImpl;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.md.sal.rest.common.TestRestconfUtils;
+import org.opendaylight.netconf.sal.restconf.impl.RestCodec.InstanceIdentifierCodecImpl;
 import org.opendaylight.yangtools.concepts.Codec;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class InstanceIdentifierCodecImplTest {
 
@@ -30,26 +31,27 @@ public class InstanceIdentifierCodecImplTest {
 
     @Before
     public void setUp() throws Exception {
-        schemaContext = TestRestconfUtils.loadSchemaContext("/restconf/parser/deserializer");
-        instanceIdentifierDTO = new InstanceIdentifierCodecImpl(null);
-        ControllerContext.getInstance().setGlobalSchema(schemaContext);
+        this.schemaContext =
+                YangParserTestUtils.parseYangSources(TestRestconfUtils.loadFiles("/restconf/parser/deserializer"));
+        this.instanceIdentifierDTO = new InstanceIdentifierCodecImpl(null);
+        ControllerContext.getInstance().setGlobalSchema(this.schemaContext);
 
         final QName baseQName = QName.create("deserializer:test", "2016-06-06", "deserializer-test");
         final QName contA = QName.create(baseQName, "contA");
         final QName leafList = QName.create(baseQName, "leaf-list-A");
 
-        instanceIdentifierOKLeafList = YangInstanceIdentifier.builder()
+        this.instanceIdentifierOKLeafList = YangInstanceIdentifier.builder()
                 .node(contA)
                 .node(new YangInstanceIdentifier.NodeWithValue<>(leafList, "instance"))
                 .build();
 
-        instanceIdentifierOKList = YangInstanceIdentifier.builder()
+        this.instanceIdentifierOKList = YangInstanceIdentifier.builder()
                 .node(new YangInstanceIdentifier.NodeIdentifierWithPredicates(
                         QName.create(baseQName, "list-one-key"),
                         QName.create(QName.create(baseQName, "list-one-key"), "name"), "value"))
                 .build();
 
-        instanceIdentifierBadNamespace = YangInstanceIdentifier.builder()
+        this.instanceIdentifierBadNamespace = YangInstanceIdentifier.builder()
                 .nodeWithKey(QName.create("nonexistent:module", "2016-10-17", "nonexistent-1"),
                         QName.create("nonexistent:module", "2016-10-17", "nonexistent"),
                         "value")
@@ -59,32 +61,32 @@ public class InstanceIdentifierCodecImplTest {
     @Test
     public void testSerializeDeserializeList() throws Exception {
         final IdentityValuesDTO valuesDTO =
-                instanceIdentifierDTO.serialize(instanceIdentifierOKList);
+                this.instanceIdentifierDTO.serialize(this.instanceIdentifierOKList);
 
         final YangInstanceIdentifier deserializedIdentifier =
-                instanceIdentifierDTO.deserialize(valuesDTO);
-        assertEquals(instanceIdentifierOKList, deserializedIdentifier);
+                this.instanceIdentifierDTO.deserialize(valuesDTO);
+        assertEquals(this.instanceIdentifierOKList, deserializedIdentifier);
     }
 
     @Test
     public void testSerializeDeserializeLeafList() throws Exception {
         final IdentityValuesDTO valuesDTO =
-                instanceIdentifierDTO.serialize(instanceIdentifierOKLeafList);
+                this.instanceIdentifierDTO.serialize(this.instanceIdentifierOKLeafList);
 
         final YangInstanceIdentifier deserializedIdentifier =
-                instanceIdentifierDTO.deserialize(valuesDTO);
-        assertEquals(instanceIdentifierOKLeafList, deserializedIdentifier);
+                this.instanceIdentifierDTO.deserialize(valuesDTO);
+        assertEquals(this.instanceIdentifierOKLeafList, deserializedIdentifier);
     }
 
     @Test
     public void testSerializeDeserializeBadModuleNamespace() throws Exception {
         final IdentityValuesDTO valuesDTO =
-                instanceIdentifierDTO.serialize(instanceIdentifierBadNamespace);
+                this.instanceIdentifierDTO.serialize(this.instanceIdentifierBadNamespace);
         assertEquals("nonexistent-1", valuesDTO.getValuesWithNamespaces().get(0).getValue());
         assertEquals("nonexistent:module", valuesDTO.getValuesWithNamespaces().get(0).getNamespace());
 
         final YangInstanceIdentifier deserializedIdentifier =
-                instanceIdentifierDTO.deserialize(valuesDTO);
+                this.instanceIdentifierDTO.deserialize(valuesDTO);
         assertNull(deserializedIdentifier);
     }
 }
\ No newline at end of file