X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yanglib%2Fmdsal-yanglib-rfc8525%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fyanglib%2Frfc8525%2FYangLibrarySupportTest.java;h=34dccc647c19cc608f394a5096dc0f087764c11c;hb=e996a1b5aa1f8986deb917e0d1d77bd1dab0b82e;hp=147acdacbbeb54446471923955b0a76cef62ffb3;hpb=578068bf0c41c9902638695d3b48ccc0e06d4c9c;p=mdsal.git

diff --git a/yanglib/mdsal-yanglib-rfc8525/src/test/java/org/opendaylight/mdsal/yanglib/rfc8525/YangLibrarySupportTest.java b/yanglib/mdsal-yanglib-rfc8525/src/test/java/org/opendaylight/mdsal/yanglib/rfc8525/YangLibrarySupportTest.java
index 147acdacbb..34dccc647c 100644
--- a/yanglib/mdsal-yanglib-rfc8525/src/test/java/org/opendaylight/mdsal/yanglib/rfc8525/YangLibrarySupportTest.java
+++ b/yanglib/mdsal-yanglib-rfc8525/src/test/java/org/opendaylight/mdsal/yanglib/rfc8525/YangLibrarySupportTest.java
@@ -7,45 +7,42 @@
  */
 package org.opendaylight.mdsal.yanglib.rfc8525;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.Map;
 import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev190104.RevisionIdentifier;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev190104.YangLibrary;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev190104.module.set.parameters.Module;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev190104.module.set.parameters.ModuleBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev190104.module.set.parameters.ModuleKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev190104.yang.library.parameters.ModuleSet;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev190104.yang.library.parameters.ModuleSetKey;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.YangIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.util.BindingMap;
-import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 
-public class YangLibrarySupportTest extends AbstractYangLibraryTest {
+class YangLibrarySupportTest extends AbstractYangLibraryTest {
     @Test
-    public void testFormatSchema() {
-        final var codec = codecTree.getDataObjectCodec(InstanceIdentifier.create(YangLibrary.class));
+    void testFormatSchema() {
+        final var codec = CODEC_TREE.getDataObjectCodec(InstanceIdentifier.create(YangLibrary.class));
 
-        final ContainerNode nonLegacyContent = yangLib.newContentBuilder()
-                .defaultContext(runtimeContext.getEffectiveModelContext()).formatYangLibraryContent();
-        final YangLibrary yangLibrary = codec.deserialize(nonLegacyContent);
+        final var nonLegacyContent = yangLib.newContentBuilder()
+                .defaultContext(RUNTIME_CONTEXT.modelContext()).formatYangLibraryContent();
+        final var yangLibrary = codec.deserialize(nonLegacyContent);
 
-        assertEquals(1, yangLibrary.nonnullModuleSet().size());
-        final ModuleSet moduleSet = yangLibrary.nonnullModuleSet().get(new ModuleSetKey("ODL_modules"));
-        assertEquals(4, moduleSet.nonnullModule().size());
-        assertEquals(moduleSet.getModule(), createControlModules());
-    }
-
-    private static Map<ModuleKey, Module> createControlModules() {
-        return BindingMap.of(
+        final var modulesSets = yangLibrary.nonnullModuleSet();
+        assertNotNull(modulesSets);
+        assertEquals(1, modulesSets.size());
+        final var moduleSet = modulesSets.get(new ModuleSetKey("ODL_modules"));
+        assertNotNull(moduleSet);
+        assertEquals(BindingMap.of(
             createModule("ietf-yang-library", "urn:ietf:params:xml:ns:yang:ietf-yang-library", "2019-01-04"),
             createModule("ietf-inet-types", "urn:ietf:params:xml:ns:yang:ietf-inet-types", "2013-07-15"),
             createModule("ietf-datastores", "urn:ietf:params:xml:ns:yang:ietf-datastores", "2018-02-14"),
-            createModule("ietf-yang-types", "urn:ietf:params:xml:ns:yang:ietf-yang-types", "2013-07-15"));
+            createModule("ietf-yang-types", "urn:ietf:params:xml:ns:yang:ietf-yang-types", "2013-07-15")),
+            moduleSet.getModule());
     }
 
     private static Module createModule(final String name, final String namespace, final String revision) {