Migrate YANG inputs for yang-data-codec-gson 31/106031/7
authormatus.matok <matus.matok@pantheon.tech>
Thu, 18 May 2023 12:56:57 +0000 (14:56 +0200)
committerRobert Varga <nite@hq.sk>
Sun, 4 Jun 2023 18:48:35 +0000 (18:48 +0000)
Migrated all YANG testfiles counting 50 lines or less.

JIRA: YANGTOOLS-1506
Change-Id: I2ed3beef91692cd93c5bb8f81e5798d2d6557803
Signed-off-by: matus.matok <matus.matok@pantheon.tech>
24 files changed:
codec/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/AbstractYT1027Test.java
codec/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug4501Test.java
codec/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug4969Test.java
codec/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java
codec/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug6112Test.java
codec/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug7246Test.java
codec/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug8083Test.java
codec/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/YT1473Test.java
codec/yang-data-codec-gson/src/test/resources/bug-4501/yang/foo.yang [deleted file]
codec/yang-data-codec-gson/src/test/resources/bug-4969/yang/bar.yang [deleted file]
codec/yang-data-codec-gson/src/test/resources/bug-4969/yang/foo.yang [deleted file]
codec/yang-data-codec-gson/src/test/resources/bug-6112/yang/union-with-identityref.yang [deleted file]
codec/yang-data-codec-gson/src/test/resources/bug5446/foo.yang [deleted file]
codec/yang-data-codec-gson/src/test/resources/bug7246/yang/rpc-test.yang [deleted file]
codec/yang-data-codec-gson/src/test/resources/bug8083/yang/bar.yang [deleted file]
codec/yang-data-codec-gson/src/test/resources/bug8083/yang/baz.yang [deleted file]
codec/yang-data-codec-gson/src/test/resources/bug8083/yang/foo.yang [deleted file]
codec/yang-data-codec-gson/src/test/resources/bug8083/yang/foobar.yang [deleted file]
codec/yang-data-codec-gson/src/test/resources/bug8083/yang/zab.yang [deleted file]
codec/yang-data-codec-gson/src/test/resources/leafref/yang/augment-leafref-module.yang [deleted file]
codec/yang-data-codec-gson/src/test/resources/leafref/yang/leafref-module.yang [deleted file]
codec/yang-data-codec-gson/src/test/resources/yt1027/yt1027.yang [deleted file]
codec/yang-data-codec-gson/src/test/resources/yt1473/bar.yang [deleted file]
codec/yang-data-codec-gson/src/test/resources/yt1473/foo.yang [deleted file]

index 4807e3852aae07dac5775b4d0b897d6a2b3f0170..cf7461a7007c9f68e7d5f9b2432ce528da9d5eae 100644 (file)
@@ -68,7 +68,25 @@ public abstract class AbstractYT1027Test {
 
     @BeforeClass
     public static void beforeClass() {
-        SCHEMA_CONTEXT = YangParserTestUtils.parseYangResourceDirectory("/yt1027");
+        SCHEMA_CONTEXT = YangParserTestUtils.parseYang("""
+            module yt1027 {
+              namespace "yt1027.test";
+              prefix tst;
+
+              leaf uint64 {
+                type uint64;
+              }
+
+              leaf int64 {
+                type int64;
+              }
+
+              leaf decimal {
+                type decimal64 {
+                  fraction-digits 1;
+                }
+              }
+            }""");
         DECIMAL_TYPE = (DecimalTypeDefinition) getTypeDefinition(DECIMAL);
         INT64_TYPE = (Int64TypeDefinition) getTypeDefinition(INT64);
         UINT64_TYPE = (Uint64TypeDefinition) getTypeDefinition(UINT64);
index 3d0f67ecf0a30091bdf707467950b5f0ec15c20d..a3ee2635a26c8373e67d8ae7ae03f9fac44429c6 100644 (file)
@@ -35,7 +35,32 @@ public class Bug4501Test {
 
     @BeforeClass
     public static void initialization() {
-        schemaContext = YangParserTestUtils.parseYangResourceDirectory("/bug-4501/yang");
+        schemaContext = YangParserTestUtils.parseYang("""
+            module foo {
+              namespace "foo";
+              prefix foo;
+              yang-version 1;
+
+              list hop {
+                leaf address {
+                  type string;
+                }
+                leaf lrs-bits {
+                  type bits {
+                    bit lookup {
+                      description "Lookup bit.";
+                    }
+                    bit rloc-probe {
+                      description "RLOC-probe bit.";
+                    }
+                    bit strict {
+                      description "Strict bit.";
+                    }
+                  }
+                  description "Flag bits per hop.";
+                }
+              }
+            }""");
     }
 
     @AfterClass
index 77624c67c52c89c667702330a1c359b12f59b76d..ccec67f77d0782e408fc20c23db0f23389280236 100644 (file)
@@ -30,7 +30,95 @@ public class Bug4969Test {
 
     @Test
     public void newParserLeafRefTest() throws IOException, URISyntaxException {
-        EffectiveModelContext context = YangParserTestUtils.parseYangResourceDirectory("/bug-4969/yang");
+        EffectiveModelContext context = YangParserTestUtils.parseYang("""
+            module bar {
+              namespace "bar";
+              prefix bar;
+
+              revision "2016-01-22" {
+                description "Initial version";
+              }
+
+              typedef ref1 {
+                type ref1-2;
+              }
+
+              typedef ref2 {
+                type ref2-2;
+              }
+
+              typedef ref3 {
+                type ref3-2;
+              }
+
+              typedef ref1-2 {
+                type leafref {
+                  path "/bar:root/bar:l1";
+                }
+              }
+
+              typedef ref2-2 {
+                type leafref {
+                  path "/bar:root/bar:l2";
+                }
+              }
+
+              typedef ref3-2 {
+                type leafref {
+                  path "/bar:root/bar:l3";
+                }
+              }
+
+              container root {
+                leaf l1 {
+                  type bits {
+                    bit a;
+                    bit b;
+                    bit c;
+                    bit d;
+                  }
+                }
+                leaf l2 {
+                  type leafref {
+                    path "/root/l1";
+                  }
+                }
+                leaf l3 {
+                  type leafref {
+                    path "../l1";
+                  }
+                }
+              }
+            }""", """
+            module foo {
+              namespace "foo";
+              prefix foo;
+
+              import bar {
+                prefix bar; revision-date 2016-01-22;
+              }
+
+              revision "2016-01-22" {
+                description "Initial version";
+              }
+
+              container root {
+                leaf ref1 {
+                  type bar:ref1;
+                }
+                leaf ref2 {
+                  type bar:ref2;
+                }
+                leaf ref3 {
+                  type bar:ref3;
+                }
+                leaf ref4 {
+                  type leafref {
+                    path "/bar:root/bar:l1";
+                  }
+                }
+              }
+            }""");
         assertNotNull(context);
 
         verifyNormalizedNodeResult(context);
@@ -90,7 +178,43 @@ public class Bug4969Test {
 
     @Test
     public void newParserLeafRefTest2() throws URISyntaxException, IOException {
-        EffectiveModelContext context = YangParserTestUtils.parseYangResourceDirectory("/leafref/yang");
+        EffectiveModelContext context = YangParserTestUtils.parseYang("""
+            module augment-leafref-module {
+              namespace "augment:leafref:module";
+              prefix "auglfrfmo";
+              revision 2014-12-16 {
+              }
+              typedef leafreftype {
+                type leafref {
+                  path "/auglfrfmo:cont/auglfrfmo:lf3";
+                }
+              }
+              container cont {
+                leaf lf3 {
+                  type string;
+                }
+              }
+            }""", """
+            module leafref-module {
+              namespace "leafref:module";
+              prefix "lfrfmo";
+              import augment-leafref-module { prefix augleafref; revision-date 2014-12-16; }
+              revision 2013-11-18 {
+              }
+              container cont {
+                leaf lf1 {
+                  type int32;
+                }
+                leaf lf2 {
+                  type leafref {
+                    path "/cont/lf1";
+                  }
+                }
+                leaf lf4 {
+                  type augleafref:leafreftype;
+                }
+              }
+            }""");
         assertNotNull(context);
 
         parseJsonToNormalizedNodes(context);
index 7c9a8878452d7e45afe1a0d59d0f74d6dcc3094d..d0c86bf2cd9ee35a8bd90c26dccdf97a88122d89 100644 (file)
@@ -37,7 +37,40 @@ public class Bug5446Test {
 
     @Before
     public void init() {
-        schemaContext = YangParserTestUtils.parseYangResourceDirectory("/bug5446");
+        schemaContext = YangParserTestUtils.parseYang("""
+            module foo {
+              yang-version 1;
+              namespace "foo";
+              prefix "foo";
+
+              revision "2015-11-05" {
+              }
+
+              typedef ipv4-address-binary {
+                type binary {
+                  length "4";
+                }
+              }
+
+              typedef ipv6-address-binary {
+                type binary {
+                  length "16";
+                }
+              }
+
+              typedef ip-address-binary {
+                type union {
+                  type ipv4-address-binary;
+                  type ipv6-address-binary;
+                }
+              }
+
+              container root {
+                leaf ip-address {
+                  type ip-address-binary;
+                }
+              }
+            }""");
     }
 
     @Test
index 60831244d351e47aabf9995284ed1b6685ee70e8..fef678561421daf8a4e74d77c14b6fa33dc27a66 100644 (file)
@@ -35,7 +35,35 @@ public class Bug6112Test {
 
     @BeforeClass
     public static void initialization() {
-        schemaContext = YangParserTestUtils.parseYangResourceDirectory("/bug-6112/yang");
+        schemaContext = YangParserTestUtils.parseYang("""
+            module union-with-identityref {
+              yang-version 1;
+              namespace "union:identityref:test";
+              prefix "unionidentityreftest";
+              description "test union with identityref";
+              revision "2016-07-12";
+
+              identity ident-base;
+
+              identity ident-one {
+                base ident-base;
+              }
+
+              typedef union-type {
+                type union {
+                  type uint8;
+                  type identityref {
+                    base ident-base;
+                  }
+                }
+              }
+
+              container root {
+                leaf leaf-value {
+                  type union-type;
+                }
+              }
+            }""");
     }
 
     @AfterClass
index d938e60d713276ab72e6b6e6bf54b6a41771abd8..c80cbb1b112d07b6c8a69434db85b7c35e7640dc 100644 (file)
@@ -32,7 +32,41 @@ public class Bug7246Test {
 
     @Test
     public void test() throws Exception {
-        final var schemaContext = YangParserTestUtils.parseYangResource("/bug7246/yang/rpc-test.yang");
+        final var schemaContext = YangParserTestUtils.parseYang("""
+            module rpc-test {
+              namespace my-namespace;
+              prefix p;
+              feature my-name;
+              identity my-name;
+              extension my-name;
+
+              typedef my-name {
+                type string;
+              }
+
+              grouping my-name {
+                leaf my-name {
+                  type my-name;
+                }
+              }
+
+              rpc my-name {
+                input {
+                  container my-name {
+                    leaf my-name {
+                      type my-name;
+                    }
+                  }
+                }
+                output {
+                  container my-name {
+                    leaf my-name {
+                      type my-name;
+                    }
+                  }
+                }
+              }
+            }""");
         final var inputStructure = Builders.containerBuilder()
             .withNodeIdentifier(new NodeIdentifier(qN("my-name")))
             .withChild(ImmutableNodes.leafNode(new NodeIdentifier(qN("my-name")), "my-value"))
index 4ecb2cf93e91600960eeea7d3504222901ab8c82..4f6ceea2ec30182f57591cd3119bd107b133ec41 100644 (file)
@@ -62,12 +62,108 @@ public class Bug8083Test {
             .node(BARCONTAINER_QNAME)
             .node(QName.create(BARMOD, "bar-leaf"))
             .build();
+    private static final String BAZ_YANG = """
+        module baz {
+          namespace baz-ns;
+          prefix baz-prefix;
+
+          container top-cont {
+            list keyed-list {
+              key empty-key-leaf;
+              leaf empty-key-leaf {
+                type empty;
+              }
+              leaf regular-leaf {
+                type int32;
+              }
+            }
+            leaf iid-leaf {
+              type instance-identifier;
+            }
+          }
+        }""";
+    private static final String FOOBAR_YANG = """
+        module foobar {
+          namespace foobar-ns;
+          prefix foobar-prefix;
+          container top-cont {
+            list keyed-list {
+              key iid-key-leaf;
+              leaf iid-key-leaf {
+                type instance-identifier;
+              }
+              leaf regular-leaf {
+                type int32;
+              }
+            }
+            leaf iid-leaf {
+              type instance-identifier;
+            }
+            leaf leaf-b {
+              type int32;
+            }
+          }
+        }""";
+    private static final String ZAB_YANG = """
+        module zab {
+          namespace zab-ns;
+          prefix zab-prefix;
+          identity base-id;
+          identity derived-id {
+            base base-id;
+          }
+          container top-cont {
+            list keyed-list {
+              key identityref-key-leaf;
+              leaf identityref-key-leaf {
+                type identityref {
+                  base base-id;
+                }
+              }
+              leaf regular-leaf {
+                type int32;
+              }
+            }
+            leaf iid-leaf {
+              type instance-identifier;
+            }
+          }
+        }""";
 
     private static EffectiveModelContext FULL_SCHEMA_CONTEXT;
 
     @BeforeClass
     public static void init() {
-        FULL_SCHEMA_CONTEXT = YangParserTestUtils.parseYangResourceDirectory("/bug8083/yang/");
+        FULL_SCHEMA_CONTEXT = YangParserTestUtils.parseYang("""
+            module example-barmod {
+              namespace "http://example.com/barmod";
+              prefix "barmod";
+              import example-foomod {
+                prefix "foomod";
+              }
+              augment "/foomod:top/foomod:foo-list" {
+                container bar-container {
+                  leaf bar-leaf {
+                    type string;
+                  }
+                }
+              }
+            }""", BAZ_YANG, """
+            module example-foomod {
+              namespace "http://example.com/foomod";
+              prefix "foomod";
+              container top {
+                leaf foo {
+                  type instance-identifier;
+                }
+                list foo-list {
+                  key name;
+                  leaf name {
+                    type string;
+                  }
+                }
+              }
+            }""", FOOBAR_YANG, ZAB_YANG);
     }
 
     @AfterClass
@@ -109,7 +205,7 @@ public class Bug8083Test {
 
     @Test
     public void testInstanceIdentifierPathWithEmptyListKey() throws IOException, URISyntaxException {
-        final var schemaContext = YangParserTestUtils.parseYangResource("/bug8083/yang/baz.yang");
+        final var schemaContext = YangParserTestUtils.parseYang(BAZ_YANG);
         final String inputJson = loadTextFile("/bug8083/json/baz.json");
 
         // deserialization
@@ -124,7 +220,7 @@ public class Bug8083Test {
 
     @Test
     public void testInstanceIdentifierPathWithIdentityrefListKey() throws IOException, URISyntaxException {
-        final var schemaContext = YangParserTestUtils.parseYangResource("/bug8083/yang/zab.yang");
+        final var schemaContext = YangParserTestUtils.parseYang(ZAB_YANG);
         final String inputJson = loadTextFile("/bug8083/json/zab.json");
 
         // deserialization
@@ -139,7 +235,7 @@ public class Bug8083Test {
 
     @Test
     public void testInstanceIdentifierPathWithInstanceIdentifierListKey() throws IOException, URISyntaxException {
-        final EffectiveModelContext schemaContext = YangParserTestUtils.parseYangResource("/bug8083/yang/foobar.yang");
+        final EffectiveModelContext schemaContext = YangParserTestUtils.parseYang(FOOBAR_YANG);
         final String inputJson = loadTextFile("/bug8083/json/foobar.json");
 
         // deserialization
index c1d500ae487a84926015aa91824f22d19786a432..e2f6cacf287e6590d6a0ad3cec1aeae6f07808fc 100644 (file)
@@ -53,7 +53,81 @@ class YT1473Test {
 
     @BeforeAll
     static void beforeAll() {
-        final var modelContext = YangParserTestUtils.parseYangResourceDirectory("/yt1473");
+        final var modelContext = YangParserTestUtils.parseYang("""
+            module bar {
+              namespace barns;
+              prefix bar;
+              import foo { prefix foo; }
+
+              identity two {
+                base foo:one;
+              }
+
+              leaf-list str {
+                type string;
+              }
+
+              leaf-list foo {
+                type identityref {
+                  base foo:one;
+                }
+              }
+
+              leaf-list bar {
+                type instance-identifier;
+              }
+
+              leaf-list bee {
+                type foo:bitz;
+              }
+
+              leaf baz {
+                type instance-identifier;
+              }
+            }""", """
+            module foo {
+              namespace foons;
+              prefix foo;
+              identity one;
+
+              typedef bitz {
+                type bits {
+                  bit one;
+                  bit two;
+                  bit three;
+                }
+              }
+
+              list foo {
+                key str;
+                leaf str {
+                  type string;
+                }
+              }
+
+              list bar {
+                key qname;
+                leaf qname {
+                  type identityref {
+                    base one;
+                  }
+                }
+              }
+
+              list baz {
+                key id;
+                leaf id {
+                  type instance-identifier;
+                }
+              }
+
+              list bee {
+                key bts;
+                leaf bts {
+                  type bitz;
+                }
+              }
+            }""");
         final var baz = assertInstanceOf(ListSchemaNode.class, modelContext.getDataChildByName(FOO_BAZ));
         final var id = assertInstanceOf(LeafSchemaNode.class, baz.getDataChildByName(FOO_ID));
         final var type = assertInstanceOf(InstanceIdentifierTypeDefinition.class, id.getType());
diff --git a/codec/yang-data-codec-gson/src/test/resources/bug-4501/yang/foo.yang b/codec/yang-data-codec-gson/src/test/resources/bug-4501/yang/foo.yang
deleted file mode 100644 (file)
index 8a1d060..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-module foo {
-    namespace "foo";
-    prefix foo;
-    yang-version 1;
-
-    list hop {
-        leaf address {
-            type string;
-        }
-
-        leaf lrs-bits {
-            type bits {
-                bit lookup {
-                    description
-                                        "Lookup bit.";
-                }
-                bit rloc-probe {
-                    description
-                                        "RLOC-probe bit.";
-                }
-                bit strict {
-                    description
-                                        "Strict bit.";
-                }
-            }
-            description
-                        "Flag bits per hop.";
-        }
-    }
-}
diff --git a/codec/yang-data-codec-gson/src/test/resources/bug-4969/yang/bar.yang b/codec/yang-data-codec-gson/src/test/resources/bug-4969/yang/bar.yang
deleted file mode 100644 (file)
index f90488f..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-module bar {
-    namespace "bar";
-    prefix bar;
-
-    revision "2016-01-22" {
-        description "Initial version";
-    }
-
-    typedef ref1 {
-        type ref1-2;
-    }
-
-    typedef ref2 {
-        type ref2-2;
-    }
-
-    typedef ref3 {
-        type ref3-2;
-    }
-
-    typedef ref1-2 {
-        type leafref {
-            path "/bar:root/bar:l1";
-        }
-    }
-
-    typedef ref2-2 {
-        type leafref {
-            path "/bar:root/bar:l2";
-        }
-    }
-
-    typedef ref3-2 {
-        type leafref {
-            path "/bar:root/bar:l3";
-        }
-    }
-
-    container root {
-        leaf l1 {
-            type bits {
-                bit a;
-                bit b;
-                bit c;
-                bit d;
-            }
-        }
-        leaf l2 {
-            type leafref {
-                path "/root/l1";
-            }
-        }
-        leaf l3 {
-            type leafref {
-                path "../l1";
-            }
-        }
-    }
-}
diff --git a/codec/yang-data-codec-gson/src/test/resources/bug-4969/yang/foo.yang b/codec/yang-data-codec-gson/src/test/resources/bug-4969/yang/foo.yang
deleted file mode 100644 (file)
index ad3ac16..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-module foo {
-    namespace "foo";
-    prefix foo;
-
-    import bar { prefix bar; revision-date 2016-01-22; }
-
-    revision "2016-01-22" {
-        description "Initial version";
-    }
-
-    container root {
-        leaf ref1 {
-            type bar:ref1;
-        }
-        leaf ref2 {
-            type bar:ref2;
-        }
-        leaf ref3 {
-            type bar:ref3;
-        }
-        leaf ref4 {
-            type leafref {
-                path "/bar:root/bar:l1";
-            }
-        }
-    }
-}
diff --git a/codec/yang-data-codec-gson/src/test/resources/bug-6112/yang/union-with-identityref.yang b/codec/yang-data-codec-gson/src/test/resources/bug-6112/yang/union-with-identityref.yang
deleted file mode 100644 (file)
index 6dbe6e5..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2016 Intel Corporation and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-
-module union-with-identityref {
-    yang-version 1;
-    namespace "union:identityref:test";
-    prefix "unionidentityreftest";
-
-    description "test union with identityref";
-
-    revision "2016-07-12";
-
-    identity ident-base;
-    identity ident-one {
-        base ident-base;
-    }
-
-    typedef union-type {
-        type union {
-            type uint8;
-            type identityref {
-                base ident-base;
-            }
-        }
-    }
-
-    container root {
-        leaf leaf-value {
-            type union-type;
-        }
-    }
-}
diff --git a/codec/yang-data-codec-gson/src/test/resources/bug5446/foo.yang b/codec/yang-data-codec-gson/src/test/resources/bug5446/foo.yang
deleted file mode 100644 (file)
index 57ae347..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-module foo {
-    yang-version 1;
-    namespace "foo";
-    prefix "foo";
-
-    revision "2015-11-05" {
-    }
-
-    typedef ipv4-address-binary {
-        type binary {
-            length "4";
-        }
-    }
-
-    typedef ipv6-address-binary {
-        type binary {
-            length "16";
-        }
-    }
-
-    typedef ip-address-binary {
-        type union {
-            type ipv4-address-binary;
-            type ipv6-address-binary;
-        }
-    }
-
-    container root {
-        leaf ip-address {
-            type ip-address-binary;
-        }
-    }
-}
diff --git a/codec/yang-data-codec-gson/src/test/resources/bug7246/yang/rpc-test.yang b/codec/yang-data-codec-gson/src/test/resources/bug7246/yang/rpc-test.yang
deleted file mode 100644 (file)
index 004183e..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-module rpc-test {
-    namespace my-namespace;
-    prefix p;
-
-    feature my-name;
-
-    identity my-name;
-
-    extension my-name;
-
-    typedef my-name {
-        type string;
-    }
-
-    grouping my-name {
-        leaf my-name {
-            type my-name;
-        }
-    }
-
-    rpc my-name {
-        input {
-            container my-name {
-                leaf my-name {
-                    type my-name;
-                }
-            }
-        }
-        output {
-            container my-name {
-                leaf my-name {
-                    type my-name;
-                }
-            }
-        }
-    }
-}
diff --git a/codec/yang-data-codec-gson/src/test/resources/bug8083/yang/bar.yang b/codec/yang-data-codec-gson/src/test/resources/bug8083/yang/bar.yang
deleted file mode 100644 (file)
index 7e6ad76..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-module example-barmod {
-
-    namespace "http://example.com/barmod";
-    prefix "barmod";
-
-    import example-foomod {
-        prefix "foomod";
-    }
-
-    augment "/foomod:top/foomod:foo-list" {
-        container bar-container {
-            leaf bar-leaf {
-                type string;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/codec/yang-data-codec-gson/src/test/resources/bug8083/yang/baz.yang b/codec/yang-data-codec-gson/src/test/resources/bug8083/yang/baz.yang
deleted file mode 100644 (file)
index 0690b1f..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-module baz {
-
-    namespace baz-ns;
-    prefix baz-prefix;
-
-    container top-cont {
-        list keyed-list {
-            key empty-key-leaf;
-
-            leaf empty-key-leaf {
-                type empty;
-            }
-
-            leaf regular-leaf {
-                type int32;
-            }
-        }
-
-        leaf iid-leaf {
-            type instance-identifier;
-        }
-    }
-}
\ No newline at end of file
diff --git a/codec/yang-data-codec-gson/src/test/resources/bug8083/yang/foo.yang b/codec/yang-data-codec-gson/src/test/resources/bug8083/yang/foo.yang
deleted file mode 100644 (file)
index 478bfc7..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-module example-foomod {
-
-    namespace "http://example.com/foomod";
-    prefix "foomod";
-
-    container top {
-        leaf foo {
-            type instance-identifier;
-        }
-
-        list foo-list {
-            key name;
-
-            leaf name {
-                type string;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/codec/yang-data-codec-gson/src/test/resources/bug8083/yang/foobar.yang b/codec/yang-data-codec-gson/src/test/resources/bug8083/yang/foobar.yang
deleted file mode 100644 (file)
index ec42bab..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-module foobar {
-
-    namespace foobar-ns;
-    prefix foobar-prefix;
-
-    container top-cont {
-        list keyed-list {
-            key iid-key-leaf;
-
-            leaf iid-key-leaf {
-                type instance-identifier;
-            }
-
-            leaf regular-leaf {
-                type int32;
-            }
-        }
-
-        leaf iid-leaf {
-            type instance-identifier;
-        }
-
-        leaf leaf-b {
-            type int32;
-        }
-    }
-}
\ No newline at end of file
diff --git a/codec/yang-data-codec-gson/src/test/resources/bug8083/yang/zab.yang b/codec/yang-data-codec-gson/src/test/resources/bug8083/yang/zab.yang
deleted file mode 100644 (file)
index 5af9529..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-module zab {
-
-    namespace zab-ns;
-    prefix zab-prefix;
-
-    identity base-id;
-
-    identity derived-id {
-        base base-id;
-    }
-
-    container top-cont {
-        list keyed-list {
-            key identityref-key-leaf;
-
-            leaf identityref-key-leaf {
-                type identityref {
-                    base base-id;
-                }
-            }
-
-            leaf regular-leaf {
-                type int32;
-            }
-        }
-
-        leaf iid-leaf {
-            type instance-identifier;
-        }
-    }
-}
\ No newline at end of file
diff --git a/codec/yang-data-codec-gson/src/test/resources/leafref/yang/augment-leafref-module.yang b/codec/yang-data-codec-gson/src/test/resources/leafref/yang/augment-leafref-module.yang
deleted file mode 100644 (file)
index 7e9dcc2..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-module augment-leafref-module {
-    namespace "augment:leafref:module";
-
-    prefix "auglfrfmo";
-    revision 2014-12-16 {
-    }
-
-    typedef leafreftype {
-        type leafref {
-            path "/auglfrfmo:cont/auglfrfmo:lf3";
-        }
-    }
-
-    container cont {
-        leaf lf3 {
-            type string;
-        }
-    }
-}
diff --git a/codec/yang-data-codec-gson/src/test/resources/leafref/yang/leafref-module.yang b/codec/yang-data-codec-gson/src/test/resources/leafref/yang/leafref-module.yang
deleted file mode 100644 (file)
index 3428cfe..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-module leafref-module {
-    namespace "leafref:module";
-
-    prefix "lfrfmo";
-
-    import augment-leafref-module { prefix augleafref; revision-date 2014-12-16; }
-    revision 2013-11-18 {
-    }
-
-    container cont {
-        leaf lf1 {
-            type int32;
-        }
-        leaf lf2 {
-            type leafref {
-                path "/cont/lf1";
-            }
-        }
-        leaf lf4 {
-            type augleafref:leafreftype;
-        }
-    }
-}
diff --git a/codec/yang-data-codec-gson/src/test/resources/yt1027/yt1027.yang b/codec/yang-data-codec-gson/src/test/resources/yt1027/yt1027.yang
deleted file mode 100644 (file)
index 12e756b..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-module yt1027 {
-  namespace "yt1027.test";
-  prefix tst;
-
-  leaf uint64 {
-    type uint64;
-  }
-  leaf int64 {
-    type int64;
-  }
-  leaf decimal {
-    type decimal64 {
-      fraction-digits 1;
-    }
-  }
-}
-
diff --git a/codec/yang-data-codec-gson/src/test/resources/yt1473/bar.yang b/codec/yang-data-codec-gson/src/test/resources/yt1473/bar.yang
deleted file mode 100644 (file)
index 2eebb34..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-module bar {
-  namespace barns;
-  prefix bar;
-
-  import foo { prefix foo; }
-
-  identity two {
-    base foo:one;
-  }
-
-  leaf-list str {
-    type string;
-  }
-
-  leaf-list foo {
-    type identityref {
-      base foo:one;
-    }
-  }
-
-  leaf-list bar {
-    type instance-identifier;
-  }
-
-  leaf-list bee {
-    type foo:bitz;
-  }
-
-  leaf baz {
-    type instance-identifier;
-  }
-}
diff --git a/codec/yang-data-codec-gson/src/test/resources/yt1473/foo.yang b/codec/yang-data-codec-gson/src/test/resources/yt1473/foo.yang
deleted file mode 100644 (file)
index e1f156a..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-module foo {
-  namespace foons;
-  prefix foo;
-
-  identity one;
-
-  typedef bitz {
-    type bits {
-      bit one;
-      bit two;
-      bit three;
-    }
-  }
-
-  list foo {
-    key str;
-    leaf str {
-      type string;
-    }
-  }
-
-  list bar {
-    key qname;
-    leaf qname {
-      type identityref {
-        base one;
-      }
-    }
-  }
-
-  list baz {
-    key id;
-    leaf id {
-      type instance-identifier;
-    }
-  }
-
-  list bee {
-    key bts;
-    leaf bts {
-      type bitz;
-    }
-  }
-}