Address FIXME for QueuedNotificationManager

[yangtools.git] / yang / yang-parser-impl / src / test / java / org / opendaylight / yangtools / yang / parser / impl / YangParserSimpleTest.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java
index 7eced3191ba1f877b67e5c2fa5cb952328cc3bd0..afc6de24e05bfc4b74091261201a4dcef485bc88 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java
@@ -7,9 +7,25 @@
  */
 package org.opendaylight.yangtools.yang.parser.impl;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
-import java.io.FileNotFoundException;
+import org.junit.Before;
+
+import org.junit.Test;
+import org.opendaylight.yangtools.yang.model.api.UsesNode;
+import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.MustDefinition;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
+import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode;
 import java.net.URI;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -18,24 +34,9 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
-
-import org.junit.Before;
-import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
-import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
-import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
-import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.model.api.MustDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
-import org.opendaylight.yangtools.yang.model.api.Status;
-import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
-import org.opendaylight.yangtools.yang.model.api.UsesNode;
 
 public class YangParserSimpleTest {
     private final URI snNS = URI.create("urn:opendaylight:simple-nodes");
@@ -46,9 +47,9 @@ public class YangParserSimpleTest {
     private Set<Module> modules;
 
     @Before
-    public void init() throws FileNotFoundException, ParseException {
+    public void init() throws Exception {
         snRev = simpleDateFormat.parse("2013-07-30");
-        modules = TestUtils.loadModules(getClass().getResource("/simple-test").getPath());
+        modules = TestUtils.loadModules(getClass().getResource("/simple-test").toURI());
     }
 
     @Test
@@ -60,7 +61,6 @@ public class YangParserSimpleTest {
         // test SchemaNode args
         QName qname = data.getQName();
         assertEquals("data", qname.getLocalName());
-        assertEquals(snPref, qname.getPrefix());
         assertEquals(snNS, qname.getNamespace());
         assertEquals(snRev, qname.getRevision());
         assertEquals("anyxml desc", data.getDescription());
@@ -68,7 +68,6 @@ public class YangParserSimpleTest {
         assertEquals(Status.OBSOLETE, data.getStatus());
         assertEquals(0, data.getUnknownSchemaNodes().size());
         // test DataSchemaNode args
-        assertEquals(testModule, data.getParent());
         assertFalse(data.isAugmenting());
         assertFalse(data.isConfiguration());
         ConstraintDefinition constraints = data.getConstraints();
@@ -109,7 +108,7 @@ public class YangParserSimpleTest {
 
         ContainerSchemaNode nodes = (ContainerSchemaNode) test.getDataChildByName("nodes");
         // test SchemaNode args
-        QName expectedQName = new QName(snNS, snRev, snPref, "nodes");
+        QName expectedQName = QName.create(snNS, snRev, "nodes");
         assertEquals(expectedQName, nodes.getQName());
         SchemaPath expectedPath = TestUtils.createPath(true, snNS, snRev, snPref, "nodes");
         assertEquals(expectedPath, nodes.getPath());
@@ -118,7 +117,6 @@ public class YangParserSimpleTest {
         assertEquals(Status.CURRENT, nodes.getStatus());
         assertEquals(0, nodes.getUnknownSchemaNodes().size());
         // test DataSchemaNode args
-        assertEquals(test, nodes.getParent());
         assertFalse(nodes.isAugmenting());
         assertFalse(nodes.isConfiguration());
 
@@ -158,44 +156,29 @@ public class YangParserSimpleTest {
         Set<TypeDefinition<?>> typedefs = nodes.getTypeDefinitions();
         assertEquals(1, typedefs.size());
         TypeDefinition<?> nodesType = typedefs.iterator().next();
-        QName typedefQName = new QName(snNS, snRev, snPref, "nodes-type");
+        QName typedefQName = QName.create(snNS, snRev, "nodes-type");
         assertEquals(typedefQName, nodesType.getQName());
         SchemaPath nodesTypePath = TestUtils.createPath(true, snNS, snRev, snPref, "nodes", "nodes-type");
         assertEquals(nodesTypePath, nodesType.getPath());
-        assertNull(nodesType.getDescription());
-        assertNull(nodesType.getReference());
+        assertTrue(nodesType.getDescription().isEmpty());
+        assertTrue(nodesType.getReference().isEmpty());
         assertEquals(Status.CURRENT, nodesType.getStatus());
         assertEquals(0, nodesType.getUnknownSchemaNodes().size());
 
         // child nodes
         // total size = 8: defined 6, inserted by uses 2
         assertEquals(8, nodes.getChildNodes().size());
-        AnyXmlSchemaNode text = (AnyXmlSchemaNode)nodes.getDataChildByName("text");
-        assertEquals(nodes, text.getParent());
-        ChoiceNode level = (ChoiceNode)nodes.getDataChildByName("level");
-        assertEquals(nodes, level.getParent());
-        ContainerSchemaNode node = (ContainerSchemaNode)nodes.getDataChildByName("node");
-        assertEquals(nodes, node.getParent());
-        LeafSchemaNode nodesId = (LeafSchemaNode)nodes.getDataChildByName("nodes-id");
-        assertEquals(nodes, nodesId.getParent());
         LeafListSchemaNode added = (LeafListSchemaNode)nodes.getDataChildByName("added");
-        assertEquals(nodes, added.getParent());
         assertEquals(createPath("nodes", "added"), added.getPath());
         assertEquals(createPath("mytype"), added.getType().getPath());
 
         ListSchemaNode links = (ListSchemaNode) nodes.getDataChildByName("links");
-        assertEquals(nodes, links.getParent());
         assertFalse(links.isUserOrdered());
-        LeafSchemaNode source = (LeafSchemaNode)nodes.getDataChildByName("source");
-        assertEquals(nodes, source.getParent());
-        LeafSchemaNode target = (LeafSchemaNode)nodes.getDataChildByName("target");
-        assertEquals(nodes, target.getParent());
 
         Set<GroupingDefinition> groupings = nodes.getGroupings();
         assertEquals(1, groupings.size());
         GroupingDefinition nodeGroup = groupings.iterator().next();
-        assertEquals(nodes, nodeGroup.getParent());
-        QName groupQName = new QName(snNS, snRev, snPref, "node-group");
+        QName groupQName = QName.create(snNS, snRev, "node-group");
         assertEquals(groupQName, nodeGroup.getQName());
         SchemaPath nodeGroupPath = TestUtils.createPath(true, snNS, snRev, snPref, "nodes", "node-group");
         assertEquals(nodeGroupPath, nodeGroup.getPath());
@@ -203,7 +186,6 @@ public class YangParserSimpleTest {
         Set<UsesNode> uses = nodes.getUses();
         assertEquals(1, uses.size());
         UsesNode use = uses.iterator().next();
-        assertEquals(nodes, use.getParent());
         assertEquals(nodeGroupPath, use.getGroupingPath());
     }
 
@@ -212,7 +194,7 @@ public class YangParserSimpleTest {
     private Date rev;
     private final String prefix = "sn";
 
-    private SchemaPath createPath(String... names) {
+    private SchemaPath createPath(final String... names) {
         try {
             rev = new SimpleDateFormat("yyyy-MM-dd").parse("2013-07-30");
         } catch (ParseException e) {
@@ -221,9 +203,9 @@ public class YangParserSimpleTest {
 
         List<QName> path = new ArrayList<>();
         for (String name : names) {
-            path.add(new QName(ns, rev, prefix, name));
+            path.add(QName.create(ns, rev, name));
         }
-        return new SchemaPath(path, true);
+        return SchemaPath.create(path, true);
     }
 
 }