Migrate YANG inputs for yang-data-tree-ri 37/106037/7
authormatus.matok <matus.matok@pantheon.tech>
Thu, 18 May 2023 14:02:00 +0000 (16:02 +0200)
committerRobert Varga <nite@hq.sk>
Sun, 4 Jun 2023 18:45:12 +0000 (18:45 +0000)
Migrated all YANG testfiles counting 50 lines or less.

JIRA: YANGTOOLS-1506
Change-Id: I0751e51387291aab9afc3c2963e1b7302e180316
Signed-off-by: matus.matok <matus.matok@pantheon.tech>
36 files changed:
data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/impl/Bug4295Test.java
data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/impl/Bug4454Test.java
data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/impl/Bug5830Test.java
data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/impl/Bug5968MergeTest.java
data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/impl/Bug5968Test.java
data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/impl/Bug8291Test.java
data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/impl/CaseAugmentTest.java
data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/impl/ListConstraintsValidation.java
data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/impl/OrderedListTest.java
data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/impl/YT1104Test.java
data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/impl/YT776Test.java
data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/leafref/Bug7844Test.java
data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/leafref/Bug8713Test.java
data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/leafref/YT821Test.java
data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/leafref/YT891Test.java
data/yang-data-tree-ri/src/test/resources/bug-4295/foo.yang [deleted file]
data/yang-data-tree-ri/src/test/resources/bug-4454-test.yang [deleted file]
data/yang-data-tree-ri/src/test/resources/bug-5830/foo-multiple.yang [deleted file]
data/yang-data-tree-ri/src/test/resources/bug-5830/foo-non-presence.yang [deleted file]
data/yang-data-tree-ri/src/test/resources/bug-5830/foo-presence.yang [deleted file]
data/yang-data-tree-ri/src/test/resources/bug5968.yang [deleted file]
data/yang-data-tree-ri/src/test/resources/bug7844/bar.yang [deleted file]
data/yang-data-tree-ri/src/test/resources/bug7844/baz.yang [deleted file]
data/yang-data-tree-ri/src/test/resources/bug7844/foo.yang [deleted file]
data/yang-data-tree-ri/src/test/resources/bug8291.yang [deleted file]
data/yang-data-tree-ri/src/test/resources/bug8713/bar.yang [deleted file]
data/yang-data-tree-ri/src/test/resources/bug8713/foo.yang [deleted file]
data/yang-data-tree-ri/src/test/resources/case-augment-test.yang [deleted file]
data/yang-data-tree-ri/src/test/resources/list-constraints-validation-test-model.yang [deleted file]
data/yang-data-tree-ri/src/test/resources/ordered-list-modification-test.yang [deleted file]
data/yang-data-tree-ri/src/test/resources/yt1104.yang [deleted file]
data/yang-data-tree-ri/src/test/resources/yt776.yang [deleted file]
data/yang-data-tree-ri/src/test/resources/yt821.yang [deleted file]
data/yang-data-tree-ri/src/test/resources/yt891/bar.yang [deleted file]
data/yang-data-tree-ri/src/test/resources/yt891/baz.yang [deleted file]
data/yang-data-tree-ri/src/test/resources/yt891/foo.yang [deleted file]

index 77c48751d5ee7b3a316c245a2741b8fc14b7549d..a02c512b0a6e2e76544173b50e8fb8f8e2112b13 100644 (file)
@@ -54,7 +54,34 @@ public class Bug4295Test {
         oleaf = QName.create(foo, "o");
         ileaf = QName.create(foo, "i");
         inMemoryDataTree = new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_OPERATIONAL,
-            YangParserTestUtils.parseYangResource("/bug-4295/foo.yang"));
+            YangParserTestUtils.parseYang("""
+                module foo {
+                  namespace "foo";
+                  prefix foo;
+
+                  container root {
+                    container sub-root {
+                      list outer-list {
+                        key "o-id";
+                        leaf o-id {
+                          type string;
+                        }
+                        list inner-list {
+                          key "i-id";
+                          leaf i-id {
+                            type string;
+                          }
+                          leaf i {
+                            type string;
+                          }
+                        }
+                        leaf o {
+                          type string;
+                        }
+                      }
+                    }
+                  }
+                }"""));
     }
 
     @Test
index 2f70a59b056b0df1907abbd5f667b7050f280676..cb01da433fa3ad02210ea227f02d9e2c3c1d0295 100644 (file)
@@ -107,7 +107,58 @@ public class Bug4454Test {
 
     @BeforeClass
     public static void beforeClass() {
-        schemaContext = YangParserTestUtils.parseYangResource("/bug-4454-test.yang");
+        schemaContext = YangParserTestUtils.parseYang("""
+            module Bug4454Test {
+              yang-version 1;
+              namespace "urn:opendaylight:params:xml:ns:yang:list-constraints-validation-test-model";
+              prefix "list-constraints-validation";
+
+              revision "2015-02-02" {
+                description "Initial revision.";
+              }
+
+              container master-container {
+                list min-max-list {
+                  min-elements 1;
+                  max-elements 3;
+                  key "min-max-key-leaf";
+                  leaf min-max-key-leaf {
+                    type string;
+                  }
+                  leaf min-max-value-leaf {
+                    type string;
+                  }
+                }
+
+                list min-max-list-no-minmax {
+                  key "min-max-key-leaf";
+                  leaf min-max-key-leaf {
+                    type string;
+                  }
+                }
+
+                leaf-list min-max-leaf-list {
+                  min-elements 0;
+                  max-elements 10;
+                  type string;
+                }
+              }
+
+              container presence {
+                presence "anchor point";
+
+                list min-max-list {
+                  min-elements 2;
+                  max-elements 3;
+
+                  key "min-max-key-leaf";
+
+                  leaf min-max-key-leaf {
+                    type string;
+                  }
+                }
+              }
+            }""");
     }
 
     @AfterClass
index 3f0c4777b4ca35eddb452fc0f7b786350e17a103..5ac2356117e575eda4f1dcad7a16000fb36231fa 100644 (file)
@@ -32,6 +32,7 @@ import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification;
 import org.opendaylight.yangtools.yang.data.tree.api.DataValidationFailedException;
 import org.opendaylight.yangtools.yang.data.tree.impl.di.InMemoryDataTreeFactory;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
+import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class Bug5830Test {
     private static final String NS = "foo";
@@ -72,7 +73,40 @@ public class Bug5830Test {
     }
 
     private static void testPresenceContainer() throws DataValidationFailedException {
-        final EffectiveModelContext schemaContext = TestModel.createTestContext("/bug-5830/foo-presence.yang");
+        final EffectiveModelContext schemaContext = YangParserTestUtils.parseYang("""
+            module foo-presence {
+              yang-version 1;
+              namespace "foo";
+              prefix foo;
+
+              revision 2016-05-17 {
+                description "test";
+              }
+
+              container task-container {
+                list task {
+                  key "task-id";
+                  leaf task-id {
+                    type string;
+                  }
+                  leaf task-mandatory-leaf {
+                    type string;
+                    mandatory true;
+                  }
+
+                  container task-data {
+                    presence "Task data";
+                    leaf mandatory-data {
+                      type string;
+                      mandatory true;
+                    }
+                    leaf other-data {
+                      type string;
+                    }
+                  }
+                }
+              }
+            }""");
         assertNotNull("Schema context must not be null.", schemaContext);
 
         testContainerIsNotPresent(schemaContext);
@@ -84,7 +118,40 @@ public class Bug5830Test {
     }
 
     private static void testNonPresenceContainer() throws DataValidationFailedException {
-        final EffectiveModelContext schemaContext = TestModel.createTestContext("/bug-5830/foo-non-presence.yang");
+        final EffectiveModelContext schemaContext = YangParserTestUtils.parseYang("""
+            module foo-non-presence {
+              yang-version 1;
+              namespace "foo";
+              prefix foo;
+
+              revision 2016-05-17 {
+                description "test";
+              }
+
+              container task-container {
+                list task {
+                  key "task-id";
+
+                  leaf task-id {
+                    type string;
+                  }
+                  leaf task-mandatory-leaf {
+                    type string;
+                    mandatory true;
+                  }
+
+                  container task-data {
+                    leaf mandatory-data {
+                      type string;
+                      mandatory true;
+                    }
+                    leaf other-data {
+                      type string;
+                    }
+                  }
+                }
+              }
+            }""");
         assertNotNull("Schema context must not be null.", schemaContext);
 
         try {
@@ -108,7 +175,70 @@ public class Bug5830Test {
     }
 
     private static void testMultipleContainers() throws DataValidationFailedException {
-        final EffectiveModelContext schemaContext = TestModel.createTestContext("/bug-5830/foo-multiple.yang");
+        final EffectiveModelContext schemaContext = YangParserTestUtils.parseYang("""
+            module foo-multiple {
+              yang-version 1;
+              namespace "foo";
+              prefix foo;
+
+              revision 2016-05-17 {
+                description "test";
+              }
+
+              container task-container {
+                list task {
+                  key "task-id";
+
+                  leaf task-id {
+                    type string;
+                  }
+                  leaf task-mandatory-leaf {
+                    type string;
+                    mandatory true;
+                  }
+
+                  container task-data {
+                    presence "Task data";
+
+                    leaf mandatory-data {
+                      type string;
+                      mandatory true;
+                    }
+                    leaf other-data {
+                      type string;
+                    }
+
+                    container non-presence-container {
+
+                      container presence-container {
+                        presence "presence container";
+
+                        leaf mandatory-leaf {
+                          mandatory true;
+                          type string;
+                        }
+                      }
+
+                      container non-presence-container-2 {
+                        leaf mandatory-leaf-2 {
+                          mandatory true;
+                          type string;
+                        }
+                      }
+
+                      container presence-container-2 {
+                        presence "presence container";
+
+                        leaf mandatory-leaf-3 {
+                          mandatory true;
+                          type string;
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }""");
         assertNotNull("Schema context must not be null.", schemaContext);
 
         testContainerIsNotPresent(schemaContext);
index 59c0519d5aece687dfa7296a010a0ddea8eef503..2782cafaad183661bca374b2bb997221b0673fb2 100644 (file)
@@ -32,6 +32,7 @@ import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification;
 import org.opendaylight.yangtools.yang.data.tree.api.DataValidationFailedException;
 import org.opendaylight.yangtools.yang.data.tree.impl.di.InMemoryDataTreeFactory;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
+import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class Bug5968MergeTest {
     private static final String NS = "bug5968";
@@ -45,7 +46,32 @@ public class Bug5968MergeTest {
 
     @BeforeClass
     public static void beforeClass() {
-        SCHEMA_CONTEXT = TestModel.createTestContext("/bug5968.yang");
+        SCHEMA_CONTEXT = YangParserTestUtils.parseYang("""
+            module bug5968 {
+              yang-version 1;
+              namespace bug5968;
+              prefix bug5968;
+
+              revision 2016-07-28 {
+                description "test";
+              }
+
+              container root {
+                list my-list {
+                  key "list-id";
+                  leaf list-id {
+                    type string;
+                  }
+                  leaf mandatory-leaf {
+                    type string;
+                    mandatory true;
+                  }
+                  leaf common-leaf {
+                    type string;
+                  }
+                }
+              }
+            }""");
     }
 
     @AfterClass
index 686bfaaf86f19c6e9ef4750cc08fa90961011014..d3187bb4aab2507c1fa362f4eb27a4eab33b9e40 100644 (file)
@@ -31,6 +31,7 @@ import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification;
 import org.opendaylight.yangtools.yang.data.tree.api.DataValidationFailedException;
 import org.opendaylight.yangtools.yang.data.tree.impl.di.InMemoryDataTreeFactory;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
+import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class Bug5968Test {
     private static final String NS = "bug5968";
@@ -45,7 +46,32 @@ public class Bug5968Test {
 
     @BeforeClass
     public static void beforeClass() {
-        SCHEMA_CONTEXT = TestModel.createTestContext("/bug5968.yang");
+        SCHEMA_CONTEXT = YangParserTestUtils.parseYang("""
+            module bug5968 {
+              yang-version 1;
+              namespace bug5968;
+              prefix bug5968;
+
+              revision 2016-07-28 {
+                description "test";
+              }
+
+              container root {
+                list my-list {
+                  key "list-id";
+                  leaf list-id {
+                    type string;
+                  }
+                  leaf mandatory-leaf {
+                    type string;
+                    mandatory true;
+                  }
+                  leaf common-leaf {
+                    type string;
+                  }
+                }
+              }
+            }""");
     }
 
     @AfterClass
index 7ec7241b51b52a4f8e306f73f2fb5d6201d2a81c..0dc9d96e95d3a6f030ca0fd3ead2f14252a6d57e 100644 (file)
@@ -26,6 +26,7 @@ import org.opendaylight.yangtools.yang.data.tree.api.DataValidationFailedExcepti
 import org.opendaylight.yangtools.yang.data.tree.api.TreeType;
 import org.opendaylight.yangtools.yang.data.tree.impl.di.InMemoryDataTreeFactory;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
+import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class Bug8291Test {
     private static final String NS = "bug8291";
@@ -38,7 +39,31 @@ public class Bug8291Test {
 
     @Before
     public void init() {
-        schemaContext = TestModel.createTestContext("/bug8291.yang");
+        schemaContext = YangParserTestUtils.parseYang("""
+            module bug8291 {
+              yang-version 1;
+              namespace bug8291;
+              prefix bug8291;
+
+              container root {
+                list outer-list {
+                  key "id";
+                  leaf id {
+                    type uint16;
+                  }
+
+                  list inner-list {
+                    key name;
+                    leaf name {
+                      type string;
+                    }
+                    leaf value {
+                      type string;
+                    }
+                  }
+                }
+              }
+            }""");
         assertNotNull("Schema context must not be null.", schemaContext);
     }
 
index 30d1eb41b21de1bc29fc0954438ee30f44e27744..331bb39d2a6ecc502db98281454e019b9e4c08ff 100644 (file)
@@ -26,6 +26,7 @@ import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification;
 import org.opendaylight.yangtools.yang.data.tree.api.DataValidationFailedException;
 import org.opendaylight.yangtools.yang.data.tree.impl.di.InMemoryDataTreeFactory;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
+import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class CaseAugmentTest {
     private static final QName CHOICE1_QNAME = QName.create(TestModel.TEST_QNAME, "choice1");
@@ -37,7 +38,40 @@ public class CaseAugmentTest {
 
     @BeforeClass
     public static void beforeClass() {
-        SCHEMA_CONTEXT = TestModel.createTestContext("/case-augment-test.yang");
+        SCHEMA_CONTEXT = YangParserTestUtils.parseYang("""
+            module case-augment-test {
+              yang-version 1;
+              namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test";
+              prefix "store-test";
+
+              revision "2014-03-13" {
+                description "Initial revision.";
+              }
+
+              container test {
+                choice choice1 {
+                  case case1 {
+                    leaf case1-leaf1 {
+                      type string;
+                    }
+                  }
+                  case case2 {
+                    leaf case2-leaf1 {
+                      type string;
+                    }
+                  }
+                }
+              }
+
+              augment "/test/choice1/case1" {
+                leaf case1-leaf2 {
+                  type string;
+                }
+                leaf case1-leaf3 {
+                  type string;
+                }
+              }
+            }""");
     }
 
     @AfterClass
index 7a9d43aec8e6050856470019748f3ad258c39d05..07e535285e15b68cb3bcced89c57825599024eea 100644 (file)
@@ -79,7 +79,51 @@ public class ListConstraintsValidation {
 
     @BeforeClass
     public static void beforeClass() {
-        schemaContext = YangParserTestUtils.parseYangResource("/list-constraints-validation-test-model.yang");
+        schemaContext = YangParserTestUtils.parseYang("""
+            module list-constraints-validation-test-model  {
+              yang-version 1;
+              namespace "urn:opendaylight:params:xml:ns:yang:list-constraints-validation-test-model";
+              prefix "list-constraints-validation";
+
+              revision "2015-02-02" {
+                description "Initial revision.";
+              }
+
+              container master-container {
+                list min-max-list {
+                  min-elements 2;
+                  max-elements 3;
+                  key "min-max-key-leaf";
+                  leaf min-max-key-leaf {
+                    type string;
+                  }
+                }
+
+                list unbounded-list {
+                  key "unbounded-key-leaf";
+                  leaf unbounded-key-leaf {
+                    type int8;
+                  }
+                }
+
+                leaf-list min-max-leaf-list {
+                  min-elements 1;
+                  max-elements 3;
+                  type string;
+                }
+
+                leaf-list unbounded-leaf-list {
+                  type string;
+                }
+
+                list unkeyed-list {
+                  max-elements 1;
+                  leaf unkeyed-leaf {
+                    type string;
+                  }
+                }
+              }
+            }""");
     }
 
     @AfterClass
index ba33cc44f64b02783767b560bf55948d63a8a4cf..d0ca71bbcbf4b772b981d745f9a1593c6fe179c3 100644 (file)
@@ -64,7 +64,39 @@ public class OrderedListTest {
         parentOrdinaryLeaf = QName.create(testModule, "parent-ordinary-leaf");
         childOrdinaryLeaf = QName.create(testModule, "child-ordinary-leaf");
         inMemoryDataTree = new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_OPERATIONAL,
-            YangParserTestUtils.parseYangResource("/ordered-list-modification-test.yang"));
+            YangParserTestUtils.parseYang("""
+                module ordered-list-modification-test {
+                  namespace "ordered-list-modification-test";
+                  prefix "olmt";
+
+                  container parent-container {
+                    container child-container {
+                      list parent-ordered-list {
+                        ordered-by user;
+                        key "parent-key-leaf";
+
+                        leaf parent-key-leaf {
+                          type string;
+                        }
+                        leaf parent-ordinary-leaf {
+                          type string;
+                        }
+
+                        list child-ordered-list {
+                          ordered-by user;
+                          key "child-key-leaf";
+
+                          leaf child-key-leaf {
+                            type string;
+                          }
+                          leaf child-ordinary-leaf {
+                            type string;
+                          }
+                        }
+                      }
+                    }
+                  }
+                }"""));
     }
 
     @Test
index 20d8591f626aeb63c4de615580b51e6f60821d4f..befcac66918e4a8d665f6fef9cc44cc9551e0709 100644 (file)
@@ -26,6 +26,7 @@ import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification;
 import org.opendaylight.yangtools.yang.data.tree.api.DataValidationFailedException;
 import org.opendaylight.yangtools.yang.data.tree.impl.di.InMemoryDataTreeFactory;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
+import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class YT1104Test {
     private static final QName MODULE = QName.create("yt1104", "yt1104");
@@ -39,7 +40,17 @@ public class YT1104Test {
 
     @BeforeClass
     public static void beforeClass() {
-        SCHEMA_CONTEXT = TestModel.createTestContext("/yt1104.yang");
+        SCHEMA_CONTEXT = YangParserTestUtils.parseYang("""
+            module yt1104 {
+              yang-version 1.1;
+              namespace yt1104;
+              prefix yt1104;
+
+              choice foo {
+                anydata bar;
+                anyxml baz;
+              }
+            }""");
     }
 
     @AfterClass
index 375de0fce77a89d413f9111e0941544e90a029f4..62a955050517afc0d418efe18634d8a7d08348d7 100644 (file)
@@ -35,6 +35,7 @@ import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification;
 import org.opendaylight.yangtools.yang.data.tree.api.DataValidationFailedException;
 import org.opendaylight.yangtools.yang.data.tree.impl.di.InMemoryDataTreeFactory;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
+import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class YT776Test {
     private static final QName MODULE = QName.create("yt776", "yt776");
@@ -67,7 +68,49 @@ public class YT776Test {
 
     @BeforeClass
     public static void beforeClass() {
-        SCHEMA_CONTEXT = TestModel.createTestContext("/yt776.yang");
+        SCHEMA_CONTEXT = YangParserTestUtils.parseYang("""
+            module yt776 {
+              namespace yt776;
+              prefix yt776;
+
+              container box {
+                list object {
+                  key object-id;
+
+                  leaf object-id {
+                    type string;
+                  }
+
+                  leaf-list attributes {
+                    type string;
+                    min-elements 1;
+                    max-elements 2;
+                  }
+
+                  list nested {
+                    key nested-attribute;
+                    max-elements 1;
+                    leaf nested-attribute {
+                      type string;
+                    }
+                  }
+                }
+
+                choice any-of {
+                  leaf some-leaf {
+                    type string;
+                  }
+                  list some-list {
+                    key some-leaf;
+                    min-elements 1;
+
+                    leaf some-leaf {
+                      type string;
+                    }
+                  }
+                }
+              }
+            }""");
     }
 
     @AfterClass
index 820b2f1d9dde29162229953cc88d49413a6a336b..c1b3473d415fe21e8c802dc0d38c24e0aaa14546 100644 (file)
@@ -28,7 +28,93 @@ public class Bug7844Test {
 
     @Test
     public void test() {
-        final EffectiveModelContext context = YangParserTestUtils.parseYangResourceDirectory("/bug7844");
+        final EffectiveModelContext context = YangParserTestUtils.parseYang("""
+            module bar {
+              namespace bar;
+              prefix bar-mod;
+
+              import baz { prefix baz-imp; }
+
+              typedef bar-leafref {
+                type baz-imp:my-leafref;
+                description "bar-leafref";
+              }
+
+              typedef bar-base-leafref {
+                type leafref {
+                  path "/baz-imp:root/baz-imp:target";
+                }
+              }
+
+              leaf my-leafref-in-bar {
+                type bar-base-leafref;
+              }
+
+              leaf my-leafref-in-bar-2 {
+                type bar-base-leafref;
+                description "bar-base-leafref-2";
+              }
+
+              leaf bar-target {
+                type string;
+              }
+            }""", """
+            module baz {
+              namespace baz;
+              prefix baz-mod;
+
+              typedef my-leafref {
+                type leafref {
+                  path "/baz-mod:root/baz-mod:target";
+                }
+                description "baz-leafref";
+              }
+
+              container root {
+                leaf target {
+                  type string;
+                }
+              }
+            }""", """
+            module foo {
+              namespace foo;
+              prefix foo-mod;
+
+              import bar { prefix bar-imp; }
+
+              leaf my-leaf {
+                type foo-leafref;
+              }
+
+              typedef foo-leafref {
+                type bar-imp:bar-leafref;
+                description "foo-leafref";
+              }
+
+              leaf my-leaf-2 {
+                type foo-leafref-2;
+              }
+
+              typedef foo-leafref-2 {
+                type bar-imp:bar-base-leafref;
+                description "foo-leaf-ref-2";
+              }
+
+              leaf bar-base-leafref {
+                type bar-imp:bar-base-leafref;
+              }
+
+              leaf bar-base-leafref-2 {
+                type bar-imp:bar-base-leafref;
+                description "bar-base-leafref-2";
+              }
+
+              leaf direct-leafref {
+                type leafref {
+                  path "/bar-imp:bar-target";
+                }
+              }
+            }""");
         assertNotNull(context);
 
         final LeafRefContext leafRefContext = LeafRefContext.create(context);
index c3dc69bbfe2d6558096bc4ca0fb4fedf3cc32f81..5a09cf6d3be75699ba2158cd6534031369de8dff 100644 (file)
@@ -29,7 +29,33 @@ public class Bug8713Test {
 
     @Test
     public void dataTreeCanditateValidationTest() throws Exception {
-        final EffectiveModelContext context = YangParserTestUtils.parseYangResourceDirectory("/bug8713/");
+        final EffectiveModelContext context = YangParserTestUtils.parseYang("""
+            module bar {
+              namespace bar;
+              prefix bar;
+
+              import foo { prefix foo; revision-date 2017-09-06; }
+              revision 2017-09-06;
+
+              augment "/foo:root" {
+                leaf ref {
+                  type leafref {
+                    path "../target" ;
+                  }
+                }
+                leaf target {
+                  type string;
+                }
+              }
+            }""", """
+            module foo {
+              namespace foo;
+              prefix foo;
+              revision 2017-09-06;
+
+              container root {
+              }
+            }""");
         final LeafRefContext rootLeafRefContext = LeafRefContext.create(context);
         final DataTree inMemoryDataTree = new InMemoryDataTreeFactory().create(
             DataTreeConfiguration.DEFAULT_OPERATIONAL, context);
index 5edf9018ea2e95a6046e159d2cd464ccbb797c22..890dcae5e71605b80635527bc4c8c952c2ef7e08 100644 (file)
@@ -44,7 +44,49 @@ public class YT821Test {
 
     @BeforeClass
     public static void beforeClass() {
-        schemaContext = YangParserTestUtils.parseYangResource("/yt821.yang");
+        schemaContext = YangParserTestUtils.parseYang("""
+            module yt821 {
+              namespace "urn:opendaylight:params:xml:ns:yang:foo";
+              prefix foo;
+              revision 2018-07-18;
+
+              container root {
+                list foo {
+                  key name;
+                  leaf name {
+                    type string;
+                  }
+                }
+
+                list bar {
+                  key name;
+                  leaf name {
+                    type string;
+                  }
+
+                  container container-in-list {
+                  }
+                }
+              }
+
+              augment /root/bar/container-in-list {
+                leaf ref-from-aug {
+                  type leafref {
+                    path "/root/foo/name";
+                  }
+                }
+              }
+
+              augment /root/bar/ {
+                container container-from-aug {
+                  leaf ref-in-container {
+                    type leafref {
+                      path "/root/foo/name";
+                    }
+                  }
+                }
+              }
+            }""");
         leafRefContext = LeafRefContext.create(schemaContext);
     }
 
index 0929cde48a2e617cb5a410501af5ef74d9d8053c..24d3cd3ffe0e5e76fd20770a2d30fbff75d02060 100644 (file)
@@ -52,7 +52,69 @@ public class YT891Test {
 
     @BeforeClass
     public static void beforeClass() {
-        schemaContext = YangParserTestUtils.parseYangResourceDirectory("/yt891");
+        schemaContext = YangParserTestUtils.parseYang("""
+            module bar {
+              namespace "urn:opendaylight:params:xml:ns:yang:bar";
+              prefix bar;
+              revision 2018-07-27;
+
+              grouping grouping-with-list {
+                list list-in-grouping {
+                  key "name";
+                  leaf name {
+                    type leafref {
+                      path "../container-in-list/name";
+                    }
+                  }
+                  container container-in-list {
+                    leaf name {
+                      type string;
+                    }
+                  }
+                }
+              }
+            }""", """
+            module baz {
+              namespace "urn:opendaylight:params:xml:ns:yang:baz";
+              prefix baz;
+              revision 2018-07-27;
+
+              grouping grouping-with-leafref {
+                leaf ref {
+                  type leafref {
+                    path "/baz-top/list-in-container/name";
+                  }
+                }
+              }
+
+              container baz-top {
+                list list-in-container {
+                  key "name";
+                  leaf name {
+                    type string;
+                  }
+                }
+              }
+            }""", """
+            module foo {
+              namespace "urn:opendaylight:params:xml:ns:yang:foo";
+              prefix foo;
+
+              import bar {
+                prefix bar;
+              }
+
+              import baz {
+                prefix baz;
+              }
+
+              revision 2018-07-27;
+
+              container foo-top {
+                uses bar:grouping-with-list;
+                uses baz:grouping-with-leafref;
+              }
+            }""");
         leafRefContext = LeafRefContext.create(schemaContext);
     }
 
diff --git a/data/yang-data-tree-ri/src/test/resources/bug-4295/foo.yang b/data/yang-data-tree-ri/src/test/resources/bug-4295/foo.yang
deleted file mode 100644 (file)
index be6abf3..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-module foo {
-    namespace "foo";
-    prefix foo;
-
-    container root {
-        container sub-root {
-            list outer-list {
-                key "o-id";
-                leaf o-id {
-                    type string;
-                }
-                list inner-list {
-                    key "i-id";
-                    leaf i-id {
-                        type string;
-                    }
-                    leaf i {
-                        type string;
-                    }
-                }
-                leaf o {
-                    type string;
-                }
-            }
-        }
-    }
-}
diff --git a/data/yang-data-tree-ri/src/test/resources/bug-4454-test.yang b/data/yang-data-tree-ri/src/test/resources/bug-4454-test.yang
deleted file mode 100644 (file)
index 8db5e73..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-module Bug4454Test {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:list-constraints-validation-test-model";
-    prefix "list-constraints-validation";
-
-    revision "2015-02-02" {
-        description "Initial revision.";
-    }
-
-    container master-container {
-        list min-max-list {
-            min-elements 1;
-            max-elements 3;
-
-            key "min-max-key-leaf";
-
-            leaf min-max-key-leaf {
-                type string;
-            }
-            leaf min-max-value-leaf {
-                type string;
-            }
-        }
-
-        list min-max-list-no-minmax {
-            key "min-max-key-leaf";
-
-            leaf min-max-key-leaf {
-                type string;
-            }
-        }
-
-        leaf-list min-max-leaf-list {
-            min-elements 0;
-            max-elements 10;
-            type string;
-        }
-    }
-
-    container presence {
-        presence "anchor point";
-
-        list min-max-list {
-            min-elements 2;
-            max-elements 3;
-
-            key "min-max-key-leaf";
-
-            leaf min-max-key-leaf {
-                type string;
-            }
-        }
-    }
-}
diff --git a/data/yang-data-tree-ri/src/test/resources/bug-5830/foo-multiple.yang b/data/yang-data-tree-ri/src/test/resources/bug-5830/foo-multiple.yang
deleted file mode 100644 (file)
index 7947fae..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-module foo-multiple {
-    yang-version 1;
-    namespace "foo";
-    prefix foo;
-
-    revision 2016-05-17 {
-        description "test";
-    }
-
-    container task-container {
-        list task {
-            key "task-id";
-
-            leaf task-id {
-                type string;
-            }
-            leaf task-mandatory-leaf {
-                type string;
-                mandatory true;
-            }
-
-            container task-data {
-                presence "Task data";
-                leaf mandatory-data {
-                    type string;
-                    mandatory true;
-                }
-                leaf other-data {
-                    type string;
-                }
-                container non-presence-container {
-                    container presence-container {
-                        presence "presence container";
-                        leaf mandatory-leaf {
-                            mandatory true;
-                            type string;
-                        }
-                    }
-                    container non-presence-container-2 {
-                        leaf mandatory-leaf-2 {
-                            mandatory true;
-                            type string;
-                        }
-                    }
-                    container presence-container-2 {
-                        presence "presence container";
-                        leaf mandatory-leaf-3 {
-                            mandatory true;
-                            type string;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/data/yang-data-tree-ri/src/test/resources/bug-5830/foo-non-presence.yang b/data/yang-data-tree-ri/src/test/resources/bug-5830/foo-non-presence.yang
deleted file mode 100644 (file)
index 3fc1a72..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-module foo-non-presence {
-    yang-version 1;
-    namespace "foo";
-    prefix foo;
-
-    revision 2016-05-17 {
-        description "test";
-    }
-
-    container task-container {
-        list task {
-            key "task-id";
-
-            leaf task-id {
-                type string;
-            }
-            leaf task-mandatory-leaf {
-                type string;
-                mandatory true;
-            }
-
-            container task-data {
-                leaf mandatory-data {
-                    type string;
-                    mandatory true;
-                }
-                leaf other-data {
-                    type string;
-                }
-            }
-        }
-    }
-}
diff --git a/data/yang-data-tree-ri/src/test/resources/bug-5830/foo-presence.yang b/data/yang-data-tree-ri/src/test/resources/bug-5830/foo-presence.yang
deleted file mode 100644 (file)
index af03827..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-module foo-presence {
-    yang-version 1;
-    namespace "foo";
-    prefix foo;
-
-    revision 2016-05-17 {
-        description "test";
-    }
-
-    container task-container {
-        list task {
-            key "task-id";
-
-            leaf task-id {
-                type string;
-            }
-            leaf task-mandatory-leaf {
-                type string;
-                mandatory true;
-            }
-
-            container task-data {
-                presence "Task data";
-                leaf mandatory-data {
-                    type string;
-                    mandatory true;
-                }
-                leaf other-data {
-                    type string;
-                }
-            }
-        }
-    }
-}
diff --git a/data/yang-data-tree-ri/src/test/resources/bug5968.yang b/data/yang-data-tree-ri/src/test/resources/bug5968.yang
deleted file mode 100644 (file)
index 538f950..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-module bug5968 {
-    yang-version 1;
-    namespace bug5968;
-    prefix bug5968;
-
-    revision 2016-07-28 {
-        description "test";
-    }
-
-    container root {
-        list my-list {
-            key "list-id";
-            leaf list-id {
-                type string;
-            }
-            leaf mandatory-leaf {
-                type string;
-                mandatory true;
-            }
-            leaf common-leaf {
-                type string;
-            }
-        }
-    }
-}
diff --git a/data/yang-data-tree-ri/src/test/resources/bug7844/bar.yang b/data/yang-data-tree-ri/src/test/resources/bug7844/bar.yang
deleted file mode 100644 (file)
index 42dab93..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-module bar {
-    namespace bar;
-    prefix bar-mod;
-
-    import baz { prefix baz-imp; }
-
-    typedef bar-leafref {
-        type baz-imp:my-leafref;
-        description "bar-leafref";
-    }
-
-    typedef bar-base-leafref {
-        type leafref {
-            path "/baz-imp:root/baz-imp:target";
-        }
-    }
-
-    leaf my-leafref-in-bar {
-        type bar-base-leafref;
-    }
-
-    leaf my-leafref-in-bar-2 {
-        type bar-base-leafref;
-        description "bar-base-leafref-2";
-    }
-
-    leaf bar-target {
-        type string;
-    }
-}
diff --git a/data/yang-data-tree-ri/src/test/resources/bug7844/baz.yang b/data/yang-data-tree-ri/src/test/resources/bug7844/baz.yang
deleted file mode 100644 (file)
index 7b746b6..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-module baz {
-    namespace baz;
-    prefix baz-mod;
-
-    typedef my-leafref {
-        type leafref {
-            path "/baz-mod:root/baz-mod:target";
-        }
-        description "baz-leafref";
-    }
-
-    container root {
-        leaf target {
-            type string;
-        }
-    }
-}
diff --git a/data/yang-data-tree-ri/src/test/resources/bug7844/foo.yang b/data/yang-data-tree-ri/src/test/resources/bug7844/foo.yang
deleted file mode 100644 (file)
index 6a50b73..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-module foo {
-    namespace foo;
-    prefix foo-mod;
-
-    import bar { prefix bar-imp; }
-
-    leaf my-leaf {
-        type foo-leafref;
-    }
-
-    typedef foo-leafref {
-        type bar-imp:bar-leafref;
-        description "foo-leafref";
-    }
-
-    leaf my-leaf-2 {
-        type foo-leafref-2;
-    }
-
-    typedef foo-leafref-2 {
-        type bar-imp:bar-base-leafref;
-        description "foo-leaf-ref-2";
-    }
-
-    leaf bar-base-leafref {
-        type bar-imp:bar-base-leafref;
-    }
-
-    leaf bar-base-leafref-2 {
-        type bar-imp:bar-base-leafref;
-        description "bar-base-leafref-2";
-    }
-
-    leaf direct-leafref {
-        type leafref {
-            path "/bar-imp:bar-target";
-        }
-    }
-}
diff --git a/data/yang-data-tree-ri/src/test/resources/bug8291.yang b/data/yang-data-tree-ri/src/test/resources/bug8291.yang
deleted file mode 100644 (file)
index c13ec3a..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-module bug8291 {
-    yang-version 1;
-    namespace bug8291;
-    prefix bug8291;
-
-    container root {
-        list outer-list {
-            key "id";
-            leaf id {
-                type uint16;
-            }
-           list inner-list {
-                key name;
-                leaf name {
-                    type string;
-                }
-                leaf value {
-                    type string;
-                }
-            }
-        }
-    }
-}
diff --git a/data/yang-data-tree-ri/src/test/resources/bug8713/bar.yang b/data/yang-data-tree-ri/src/test/resources/bug8713/bar.yang
deleted file mode 100644 (file)
index 883ad63..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-module bar {
-    namespace bar;
-    prefix bar;
-
-    import foo { prefix foo; revision-date 2017-09-06; }
-
-    revision 2017-09-06;
-
-    augment "/foo:root" {
-        leaf ref {
-            type leafref {
-                path "../target" ;
-            }
-        }
-        leaf target {
-            type string;
-        }
-    }
-}
diff --git a/data/yang-data-tree-ri/src/test/resources/bug8713/foo.yang b/data/yang-data-tree-ri/src/test/resources/bug8713/foo.yang
deleted file mode 100644 (file)
index bb65c44..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-module foo {
-    namespace foo;
-    prefix foo;
-
-    revision 2017-09-06;
-
-    container root {
-    }
-}
diff --git a/data/yang-data-tree-ri/src/test/resources/case-augment-test.yang b/data/yang-data-tree-ri/src/test/resources/case-augment-test.yang
deleted file mode 100644 (file)
index 4ee9820..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-module case-augment-test {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test";
-    prefix "store-test";
-
-    revision "2014-03-13" {
-        description "Initial revision.";
-    }
-
-    container test {
-        choice choice1 {
-            case case1 {
-                leaf case1-leaf1 {
-                    type string;
-                }
-            }
-            case case2 {
-                leaf case2-leaf1 {
-                    type string;
-                }
-            }
-        }
-    }
-
-    augment "/test/choice1/case1" {
-        leaf case1-leaf2 {
-            type string;
-        }
-        leaf case1-leaf3 {
-            type string;
-        }
-    }
-}
diff --git a/data/yang-data-tree-ri/src/test/resources/list-constraints-validation-test-model.yang b/data/yang-data-tree-ri/src/test/resources/list-constraints-validation-test-model.yang
deleted file mode 100644 (file)
index f7b2a40..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-module list-constraints-validation-test-model  {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:list-constraints-validation-test-model";
-    prefix "list-constraints-validation";
-
-    revision "2015-02-02" {
-        description "Initial revision.";
-    }
-
-    container master-container {
-        list min-max-list {
-            min-elements 2;
-            max-elements 3;
-
-            key "min-max-key-leaf";
-
-            leaf min-max-key-leaf {
-                type string;
-            }
-        }
-
-        list unbounded-list {
-            key "unbounded-key-leaf";
-
-            leaf unbounded-key-leaf {
-                type int8;
-            }
-        }
-
-        leaf-list min-max-leaf-list {
-            min-elements 1;
-            max-elements 3;
-            type string;
-        }
-
-        leaf-list unbounded-leaf-list {
-            type string;
-        }
-
-        list unkeyed-list {
-            max-elements 1;
-            leaf unkeyed-leaf {
-                type string;
-            }
-        }
-    }
-}
diff --git a/data/yang-data-tree-ri/src/test/resources/ordered-list-modification-test.yang b/data/yang-data-tree-ri/src/test/resources/ordered-list-modification-test.yang
deleted file mode 100644 (file)
index 272ef5c..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-module ordered-list-modification-test {
-    namespace "ordered-list-modification-test";
-    prefix "olmt";
-
-    container parent-container {
-        container child-container {
-            list parent-ordered-list {
-                ordered-by user;
-
-                key "parent-key-leaf";
-
-                leaf parent-key-leaf {
-                    type string;
-                }
-
-                leaf parent-ordinary-leaf {
-                    type string;
-                }
-
-                list child-ordered-list {
-                    ordered-by user;
-
-                    key "child-key-leaf";
-
-                    leaf child-key-leaf {
-                        type string;
-                    }
-
-                    leaf child-ordinary-leaf {
-                        type string;
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/data/yang-data-tree-ri/src/test/resources/yt1104.yang b/data/yang-data-tree-ri/src/test/resources/yt1104.yang
deleted file mode 100644 (file)
index ed71c0d..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-module yt1104 {
-  yang-version 1.1;
-  namespace yt1104;
-  prefix yt1104;
-
-  choice foo {
-    anydata bar;
-    anyxml baz;
-  }
-}
-
diff --git a/data/yang-data-tree-ri/src/test/resources/yt776.yang b/data/yang-data-tree-ri/src/test/resources/yt776.yang
deleted file mode 100644 (file)
index 5a42177..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-module yt776 {
-    namespace yt776;
-    prefix yt776;
-
-    container box {
-        list object {
-            key object-id;
-
-            leaf object-id {
-                type string;
-            }
-
-            leaf-list attributes {
-                type string;
-                min-elements 1;
-                max-elements 2;
-            }
-
-            list nested {
-                key nested-attribute;
-                max-elements 1;
-
-                leaf nested-attribute {
-                    type string;
-                }
-            }
-        }
-
-        choice any-of {
-            leaf some-leaf {
-                type string;
-            }
-            list some-list {
-                key some-leaf;
-                min-elements 1;
-
-                leaf some-leaf {
-                    type string;
-                }
-            }
-        }
-    }
-}
-
diff --git a/data/yang-data-tree-ri/src/test/resources/yt821.yang b/data/yang-data-tree-ri/src/test/resources/yt821.yang
deleted file mode 100644 (file)
index e97694b..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-module yt821 {
-    namespace "urn:opendaylight:params:xml:ns:yang:foo";
-    prefix foo;
-
-    revision 2018-07-18;
-
-    container root {
-        list foo {
-            key name;
-            leaf name {
-                type string;
-            }
-        }
-        list bar {
-            key name;
-            leaf name {
-                type string;
-            }
-            container container-in-list {
-            }
-        }
-    }
-
-    augment /root/bar/container-in-list {
-        leaf ref-from-aug {
-            type leafref {
-                path "/root/foo/name";
-            }
-        }
-    }
-
-    augment /root/bar/ {
-        container container-from-aug {
-            leaf ref-in-container {
-                type leafref {
-                    path "/root/foo/name";
-                }
-            }
-        }
-    }
-}
diff --git a/data/yang-data-tree-ri/src/test/resources/yt891/bar.yang b/data/yang-data-tree-ri/src/test/resources/yt891/bar.yang
deleted file mode 100644 (file)
index 2dac68e..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-module bar {
-    namespace "urn:opendaylight:params:xml:ns:yang:bar";
-    prefix bar;
-
-    revision 2018-07-27;
-
-    grouping grouping-with-list {
-        list list-in-grouping {
-            key "name";
-            leaf name {
-                type leafref {
-                    path "../container-in-list/name";
-                }
-            }
-            container container-in-list {
-                leaf name {
-                    type string;
-                }
-            }
-        }
-    }
-}
diff --git a/data/yang-data-tree-ri/src/test/resources/yt891/baz.yang b/data/yang-data-tree-ri/src/test/resources/yt891/baz.yang
deleted file mode 100644 (file)
index 8ee5d00..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-module baz {
-    namespace "urn:opendaylight:params:xml:ns:yang:baz";
-    prefix baz;
-
-    revision 2018-07-27;
-
-    grouping grouping-with-leafref {
-        leaf ref {
-            type leafref {
-                path "/baz-top/list-in-container/name";
-            }
-        }
-    }
-
-    container baz-top {
-        list list-in-container {
-            key "name";
-            leaf name {
-                type string;
-            }
-        }
-    }
-}
diff --git a/data/yang-data-tree-ri/src/test/resources/yt891/foo.yang b/data/yang-data-tree-ri/src/test/resources/yt891/foo.yang
deleted file mode 100644 (file)
index 35207e5..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-module foo {
-    namespace "urn:opendaylight:params:xml:ns:yang:foo";
-    prefix foo;
-
-    import bar {
-        prefix bar;
-    }
-    import baz {
-        prefix baz;
-    }
-
-    revision 2018-07-27;
-
-    container foo-top {
-        uses bar:grouping-with-list;
-        uses baz:grouping-with-leafref;
-    }
-}