Adjust CompositeValueCodec to BindingInstanceIdentifier

[yangtools.git] / parser / yang-parser-rfc7950 / src / test / java / org / opendaylight / yangtools / yang / stmt / EffectiveModuleTest.java

diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModuleTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModuleTest.java
index ec05aaa2531769bb305e9fa0fa1ac76d12fe97f1..9dcd33d8b024a10fc5a95721b036f4739e67fe33 100644 (file)
--- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModuleTest.java
+++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModuleTest.java
@@ -7,42 +7,31 @@
  */
 package org.opendaylight.yangtools.yang.stmt;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import java.util.Collection;
 import java.util.Optional;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified;
 import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.common.YangVersion;
-import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DeviateKind;
-import org.opendaylight.yangtools.yang.model.api.Deviation;
-import org.opendaylight.yangtools.yang.model.api.ExtensionDefinition;
-import org.opendaylight.yangtools.yang.model.api.FeatureDefinition;
-import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;
-import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.model.api.ModuleImport;
-import org.opendaylight.yangtools.yang.model.api.NotificationDefinition;
-import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
 import org.opendaylight.yangtools.yang.model.api.Status;
-import org.opendaylight.yangtools.yang.model.api.Submodule;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
 
-public class EffectiveModuleTest {
-    private static final QNameModule ROOT_MODULE_QNAME = QNameModule.create(XMLNamespace.of("root-ns"));
+class EffectiveModuleTest {
+    private static final QNameModule ROOT_MODULE_QNAME = QNameModule.of("root-ns");
     private static final QName CONT = QName.create(ROOT_MODULE_QNAME, "cont");
     private static final QName FEATURE1 = QName.create(ROOT_MODULE_QNAME, "feature1");
     private static final Revision REVISION = Revision.of("2000-01-01");
 
     @Test
-    public void effectiveBuildTest() throws Exception {
-        final Module rootModule = TestUtils.parseYangSource(
+    void effectiveBuildTest() throws Exception {
+        final var rootModule = TestUtils.parseYangSource(
             "/semantic-statement-parser/effective-module/root.yang",
             "/semantic-statement-parser/effective-module/imported.yang",
             "/semantic-statement-parser/effective-module/submod.yang")
@@ -54,57 +43,56 @@ public class EffectiveModuleTest {
         assertEquals(Optional.of("cisco"), rootModule.getOrganization());
         assertEquals(Optional.of("cisco email"), rootModule.getContact());
 
-        final ContainerSchemaNode contSchemaNode = (ContainerSchemaNode) rootModule.getDataChildByName(CONT);
+        final var contSchemaNode = (ContainerSchemaNode) rootModule.getDataChildByName(CONT);
         assertNotNull(contSchemaNode);
 
-        final Collection<? extends AugmentationSchemaNode> augmentations = rootModule.getAugmentations();
+        final var augmentations = rootModule.getAugmentations();
         assertEquals(1, augmentations.size());
         assertEquals(Absolute.of(CONT), augmentations.iterator().next().getTargetPath());
 
-        final Collection<? extends ModuleImport> imports = rootModule.getImports();
+        final var imports = rootModule.getImports();
         assertEquals(1, imports.size());
-        final ModuleImport importStmt = imports.iterator().next();
+        final var importStmt = imports.iterator().next();
         assertNotNull(importStmt);
         assertEquals(Unqualified.of("imported"), importStmt.getModuleName());
         assertEquals(Optional.of(REVISION), importStmt.getRevision());
         assertEquals("imp-pref", importStmt.getPrefix());
 
-        final Collection<? extends Submodule> submodules = rootModule.getSubmodules();
+        final var submodules = rootModule.getSubmodules();
         assertEquals(1, submodules.size());
         assertEquals("submod", submodules.iterator().next().getName());
 
-        final Collection<? extends NotificationDefinition> notifications = rootModule.getNotifications();
+        final var notifications = rootModule.getNotifications();
         assertEquals(1, notifications.size());
         assertEquals("notif1", notifications.iterator().next().getQName().getLocalName());
 
-        final Collection<? extends RpcDefinition> rpcs = rootModule.getRpcs();
+        final var rpcs = rootModule.getRpcs();
         assertEquals(1, rpcs.size());
         assertEquals("rpc1", rpcs.iterator().next().getQName().getLocalName());
 
-        final Collection<? extends Deviation> deviations = rootModule.getDeviations();
+        final var deviations = rootModule.getDeviations();
         assertEquals(1, deviations.size());
-        final Deviation deviationStmt = deviations.iterator().next();
+        final var deviationStmt = deviations.iterator().next();
         assertNotNull(deviationStmt);
-        final QNameModule importedModuleQName = QNameModule.create(XMLNamespace.of("imported"), REVISION);
-        final QName importedContQName = QName.create(importedModuleQName, "cont");
+        final var importedContQName = QName.create(QNameModule.of(XMLNamespace.of("imported"), REVISION), "cont");
         assertEquals(Absolute.of(importedContQName), deviationStmt.getTargetPath());
         assertEquals(DeviateKind.ADD, deviationStmt.getDeviates().iterator().next().getDeviateType());
         assertEquals(Optional.of("deviate reference"), deviationStmt.getReference());
 
-        final Collection<? extends IdentitySchemaNode> identities = rootModule.getIdentities();
+        final var identities = rootModule.getIdentities();
         assertEquals(1, identities.size());
         assertEquals("identity1", identities.iterator().next().getQName().getLocalName());
 
-        final Collection<? extends FeatureDefinition> features = rootModule.getFeatures();
+        final var features = rootModule.getFeatures();
         assertEquals(1, features.size());
-        final FeatureDefinition featureStmt = features.iterator().next();
+        final var featureStmt = features.iterator().next();
         assertNotNull(featureStmt);
         assertEquals(FEATURE1, featureStmt.getQName());
         assertEquals(Optional.of("feature1 description"), featureStmt.getDescription());
         assertEquals(Optional.of("feature1 reference"), featureStmt.getReference());
         assertEquals(Status.CURRENT, featureStmt.getStatus());
 
-        final Collection<? extends ExtensionDefinition> extensionSchemaNodes = rootModule.getExtensionSchemaNodes();
+        final var extensionSchemaNodes = rootModule.getExtensionSchemaNodes();
         assertEquals(1, extensionSchemaNodes.size());
         assertEquals("ext1", extensionSchemaNodes.iterator().next().getQName().getLocalName());
     }