Eliminate NormalizedNodePayload

[netconf.git] / restconf / restconf-nb / src / test / java / org / opendaylight / restconf / nb / rfc8040 / AbstractInstanceIdentifierTest.java

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/AbstractInstanceIdentifierTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/AbstractInstanceIdentifierTest.java
index d85c70d87014495e6b72599960b24c3ae1f5d450..1aef225e80669fc575415c72a29e89297752ecb4 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/AbstractInstanceIdentifierTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/AbstractInstanceIdentifierTest.java
@@ -10,13 +10,22 @@ package org.opendaylight.restconf.nb.rfc8040;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public abstract class AbstractInstanceIdentifierTest {
+    protected static final QNameModule INSTANCE_IDENTIFIER_MODULE_QNAME =
+        QNameModule.ofRevision("instance:identifier:module", "2014-01-17");
+
+    protected static final QName CONT_QNAME = QName.create(INSTANCE_IDENTIFIER_MODULE_QNAME, "cont");
+    protected static final QName CONT1_QNAME = QName.create(CONT_QNAME, "cont1");
+    protected static final QName RESET_QNAME = QName.create(CONT_QNAME, "reset");
+    protected static final QName DELAY_QNAME = QName.create(CONT_QNAME, "delay");
+
     protected static final QName CASE_LEAF1_QNAME = QName.create("choice:ns", "case-leaf1");
     protected static final QName CHOICE_CONT_QNAME = QName.create("choice:ns", "case-cont1");
 
@@ -40,17 +49,9 @@ public abstract class AbstractInstanceIdentifierTest {
     protected static final QName MY_LEAF11_QNAME = QName.create(PATCH_CONT_QNAME, "my-leaf11");
     protected static final QName MY_LEAF12_QNAME = QName.create(PATCH_CONT_QNAME, "my-leaf12");
 
-    protected static EffectiveModelContext IID_SCHEMA;
-
-    @BeforeClass
-    public static final void beforeClass() {
-        IID_SCHEMA = YangParserTestUtils.parseYangResourceDirectory("/instanceidentifier/yang");
-    }
-
-    @AfterClass
-    public static final void afterClass() {
-        IID_SCHEMA = null;
-    }
+    protected static final @NonNull EffectiveModelContext IID_SCHEMA =
+        YangParserTestUtils.parseYangResourceDirectory("/instanceidentifier/yang");
+    protected static final @NonNull DatabindContext IID_DATABIND = DatabindContext.ofModel(IID_SCHEMA);
 
     protected static final InputStream stringInputStream(final String str) {
         return new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8));