Rework NormalizedNode type hierarchy

[yangtools.git] / yang / yang-data-impl / src / test / java / org / opendaylight / yangtools / yang / data / impl / schema / tree / Bug5968Test.java

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug5968Test.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug5968Test.java
index 9aa7311054cca0308b41f7f12ac56d5eff64a322..7772cf2ad2397116ec3a73f74e953f0a964a08b9 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug5968Test.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug5968Test.java
@@ -20,7 +20,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
-import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
+import org.opendaylight.yangtools.yang.data.api.schema.SystemMapNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration;
@@ -29,10 +29,10 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailed
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 
 public class Bug5968Test {
-    private static final String NS = "foo";
+    private static final String NS = "bug5968";
     private static final String REV = "2016-07-28";
     private static final QName ROOT = QName.create(NS, REV, "root");
     private static final QName MY_LIST = QName.create(NS, REV, "my-list");
@@ -40,11 +40,11 @@ public class Bug5968Test {
     private static final QName MANDATORY_LEAF = QName.create(NS, REV, "mandatory-leaf");
     private static final QName COMMON_LEAF = QName.create(NS, REV, "common-leaf");
 
-    private static SchemaContext SCHEMA_CONTEXT;
+    private static EffectiveModelContext SCHEMA_CONTEXT;
 
     @BeforeClass
     public static void beforeClass() {
-        SCHEMA_CONTEXT = TestModel.createTestContext("/bug5968/foo.yang");
+        SCHEMA_CONTEXT = TestModel.createTestContext("/bug5968.yang");
     }
 
     @AfterClass
@@ -52,7 +52,7 @@ public class Bug5968Test {
         SCHEMA_CONTEXT = null;
     }
 
-    private static DataTree initDataTree(final SchemaContext schemaContext, final boolean withMapNode)
+    private static DataTree initDataTree(final EffectiveModelContext schemaContext, final boolean withMapNode)
             throws DataValidationFailedException {
         final DataTree inMemoryDataTree = new InMemoryDataTreeFactory().create(
                 DataTreeConfiguration.DEFAULT_CONFIGURATION, schemaContext);
@@ -74,7 +74,7 @@ public class Bug5968Test {
         return inMemoryDataTree;
     }
 
-    private static DataTree emptyDataTree(final SchemaContext schemaContext)
+    private static DataTree emptyDataTree(final EffectiveModelContext schemaContext)
             throws DataValidationFailedException {
         return new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_CONFIGURATION, schemaContext);
     }
@@ -83,7 +83,7 @@ public class Bug5968Test {
     public void writeInvalidContainerTest() throws DataValidationFailedException {
         final DataTree inMemoryDataTree = emptyDataTree(SCHEMA_CONTEXT);
 
-        final MapNode myList = createMap(true);
+        final SystemMapNode myList = createMap(true);
         final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> root = Builders.containerBuilder()
                 .withNodeIdentifier(new NodeIdentifier(ROOT)).withChild(myList);
 
@@ -97,9 +97,8 @@ public class Bug5968Test {
             inMemoryDataTree.commit(prepare);
             fail("Should fail due to missing mandatory leaf.");
         } catch (final IllegalArgumentException e) {
-            assertEquals(
-                    "Node (foo?revision=2016-07-28)my-list[{(foo?revision=2016-07-28)list-id=1}] is missing mandatory "
-                            + "descendant /(foo?revision=2016-07-28)mandatory-leaf", e.getMessage());
+            assertEquals("Node (bug5968?revision=2016-07-28)my-list[{(bug5968?revision=2016-07-28)list-id=1}] is "
+                + "missing mandatory descendant /(bug5968?revision=2016-07-28)mandatory-leaf", e.getMessage());
         }
     }
 
@@ -116,9 +115,8 @@ public class Bug5968Test {
             inMemoryDataTree.commit(prepare);
             fail("Should fail due to missing mandatory leaf.");
         } catch (final IllegalArgumentException e) {
-            assertEquals(
-                    "Node (foo?revision=2016-07-28)my-list[{(foo?revision=2016-07-28)list-id=1}] is missing mandatory "
-                            + "descendant /(foo?revision=2016-07-28)mandatory-leaf", e.getMessage());
+            assertEquals("Node (bug5968?revision=2016-07-28)my-list[{(bug5968?revision=2016-07-28)list-id=1}] is "
+                + "missing mandatory descendant /(bug5968?revision=2016-07-28)mandatory-leaf", e.getMessage());
         }
     }
 
@@ -136,24 +134,21 @@ public class Bug5968Test {
             inMemoryDataTree.commit(prepare);
             fail("Should fail due to missing mandatory leaf.");
         } catch (final IllegalArgumentException e) {
-            assertEquals(
-                    "Node (foo?revision=2016-07-28)my-list[{(foo?revision=2016-07-28)list-id=1}] is missing mandatory "
-                            + "descendant /(foo?revision=2016-07-28)mandatory-leaf", e.getMessage());
+            assertEquals("Node (bug5968?revision=2016-07-28)my-list[{(bug5968?revision=2016-07-28)list-id=1}] is "
+                + "missing mandatory descendant /(bug5968?revision=2016-07-28)mandatory-leaf", e.getMessage());
         }
     }
 
     private static void writeMap(final DataTreeModification modificationTree, final boolean mandatoryDataMissing) {
-        final MapNode myList = createMap(mandatoryDataMissing);
-        modificationTree.write(YangInstanceIdentifier.of(ROOT).node(MY_LIST), myList);
+        modificationTree.write(YangInstanceIdentifier.of(ROOT).node(MY_LIST), createMap(mandatoryDataMissing));
     }
 
-    private static MapNode createMap(final boolean mandatoryDataMissing) {
-        return Builders
-                .mapBuilder()
-                .withNodeIdentifier(new NodeIdentifier(MY_LIST))
-                .withChild(
-                        mandatoryDataMissing ? createMapEntry("1", "common-value") : createMapEntry("1",
-                                "mandatory-value", "common-value")).build();
+    private static SystemMapNode createMap(final boolean mandatoryDataMissing) {
+        return Builders.mapBuilder()
+            .withNodeIdentifier(new NodeIdentifier(MY_LIST))
+            .withChild(mandatoryDataMissing ? createMapEntry("1", "common-value")
+                : createMapEntry("1", "mandatory-value", "common-value"))
+            .build();
     }
 
     private static void writeMapEntry(final DataTreeModification modificationTree, final Object listIdValue,
@@ -187,7 +182,7 @@ public class Bug5968Test {
     public void writeValidContainerTest() throws DataValidationFailedException {
         final DataTree inMemoryDataTree = emptyDataTree(SCHEMA_CONTEXT);
 
-        final MapNode myList = createMap(false);
+        final SystemMapNode myList = createMap(false);
         final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> root = Builders.containerBuilder()
                 .withNodeIdentifier(new NodeIdentifier(ROOT)).withChild(myList);