Migrate YANG inputs for yang-model-export

Migrated all YANG testfiles counting 50 lines or less.

JIRA: YANGTOOLS-1506
Change-Id: I90dc5abe72315090df3047a68cb83fee90224ef8
Signed-off-by: matus.matok <matus.matok@pantheon.tech>

diff --git a/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug5531Test.java b/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug5531Test.java
index df0a4247d0aa1a4baa73b26291896a43692e30cb..ecdbdfd4887787537dab84bc681f458963a7459d 100644 (file)
--- a/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug5531Test.java
+++ b/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug5531Test.java
@@ -22,7 +22,15 @@ import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 public class Bug5531Test {
     @Test
     public void test() throws Exception {
-        final var schema = YangParserTestUtils.parseYangResourceDirectory("/bugs/bug5531");
+        final var schema = YangParserTestUtils.parseYang("""
+            module foo {
+              namespace "foo";
+              prefix foo;
+
+              revision 2015-01-01 {
+                description "test";
+              }
+            }""");
 
         assertNotNull(schema);
         assertNotNull(schema.getModules());

diff --git a/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug6856Test.java b/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug6856Test.java
index 1328b58fc7ada22b78de2780fb9536079930bc63..1095be684773d355ee8f8e7c1d283c2298995704 100644 (file)
--- a/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug6856Test.java
+++ b/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug6856Test.java
@@ -20,7 +20,14 @@ import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 public class Bug6856Test {
     @Test
     public void testImplicitInputAndOutputInRpc() throws Exception {
-        final var schemaContext = YangParserTestUtils.parseYangResources(Bug6856Test.class, "/bugs/bug-6856/foo.yang");
+        final var schemaContext = YangParserTestUtils.parseYang("""
+            module foo {
+              namespace foo;
+              prefix foo;
+              revision 2017-02-28;
+
+              rpc foo-rpc {}
+            }""");
         assertNotNull(schemaContext);
 
         final var byteArrayOutputStream = new ByteArrayOutputStream();
@@ -39,7 +46,25 @@ public class Bug6856Test {
 
     @Test
     public void testExplicitInputAndOutputInRpc() throws Exception {
-        final var schemaContext = YangParserTestUtils.parseYangResources(Bug6856Test.class, "/bugs/bug-6856/bar.yang");
+        final var schemaContext = YangParserTestUtils.parseYang("""
+            module bar {
+              namespace bar;
+              prefix bar;
+              revision 2017-02-28;
+
+              rpc bar-rpc {
+                input {
+                  leaf input-leaf {
+                    type string;
+                  }
+                }
+                output {
+                  leaf output-leaf {
+                    type string;
+                  }
+                }
+              }
+            }""");
         assertNotNull(schemaContext);
 
         final var byteArrayOutputStream = new ByteArrayOutputStream();

diff --git a/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YT1313Test.java b/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YT1313Test.java
index b6e1a0fdc654bb7f2ece247bda005b116d6b0cf4..386391175b7bf489f3e9c52f1498fd16f6f74037 100644 (file)
--- a/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YT1313Test.java
+++ b/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YT1313Test.java
@@ -17,7 +17,48 @@ import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 public class YT1313Test {
     @Test
     public void testSubmoduleImportPrefixes() {
-        final var bar = YangParserTestUtils.parseYangResourceDirectory("/bugs/yt1313")
+        final var bar = YangParserTestUtils.parseYang("""
+            module bar {
+              namespace bar;
+              prefix bar;
+
+              include bar-one;
+              include bar-two;
+            }""", """
+            submodule bar-one {
+              belongs-to bar {
+                prefix bar;
+              }
+
+              import foo {
+                prefix foo1;
+              }
+
+              leaf one {
+                type foo1:foo;
+              }
+            }""", """
+            submodule bar-two {
+              belongs-to bar {
+                prefix bar;
+              }
+
+              import foo {
+                prefix foo2;
+              }
+
+              leaf two {
+                type foo2:foo;
+              }
+            }""", """
+            module foo {
+              namespace foo;
+              prefix foo;
+
+              typedef foo {
+                type string;
+              }
+            }""")
             .getModuleStatement(QNameModule.create(XMLNamespace.of("bar")));
 
         final StatementPrefixResolver resolver = StatementPrefixResolver.forModule(bar);

diff --git a/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YangTextSnippetTest.java b/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YangTextSnippetTest.java
index f6ceba9899fd5d169fa88d4a20554434cc021dc5..25bbc7e878618cc2f1df3c76745562398dde1c5a 100644 (file)
--- a/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YangTextSnippetTest.java
+++ b/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YangTextSnippetTest.java
@@ -24,7 +24,62 @@ public class YangTextSnippetTest {
 
     @Test
     public void testSubmoduleNamespaces() throws Exception {
-        assertFormat(YangParserTestUtils.parseYangResourceDirectory("/bugs/yt992"));
+        assertFormat(YangParserTestUtils.parseYang("""
+            module module1 {
+              yang-version "1.1";
+              namespace "urn:example:module1";
+              prefix "module1";
+
+              include module1submodule1;
+
+              revision "2019-05-17" {
+              }
+
+              container cont1 {
+                uses submodule-grouping;
+              }
+            }""", """
+            submodule module1submodule1 {
+              yang-version "1.1";
+
+              belongs-to "module1" {
+                prefix "module1";
+              }
+
+              import module2 {
+                prefix "module2";
+              }
+
+              revision "2019-05-17" {
+              }
+
+              grouping submodule-grouping {
+                uses module2:grouping1;
+
+                leaf leaf2 {
+                  type string;
+                  module2:ext1 "param1";
+                }
+              }
+            }""", """
+            module module2 {
+              yang-version "1.1";
+              namespace "urn:example:module2";
+              prefix "module2";
+
+              revision "2019-05-17" {
+              }
+
+              grouping grouping1 {
+                leaf leaf1 {
+                  type string;
+                }
+              }
+
+              extension ext1 {
+                argument "parameter";
+              }
+            }"""));
     }
 
     private static void assertFormat(final EffectiveModelContext context) {

diff --git a/model/yang-model-export/src/test/resources/bugs/bug-6856/bar.yang b/model/yang-model-export/src/test/resources/bugs/bug-6856/bar.yang
deleted file mode 100644 (file)
index a14733d..0000000
--- a/model/yang-model-export/src/test/resources/bugs/bug-6856/bar.yang
+++ /dev/null
@@ -1,19 +0,0 @@
-module bar {
-    namespace bar;
-    prefix bar;
-
-    revision 2017-02-28;
-
-    rpc bar-rpc {
-        input {
-            leaf input-leaf {
-                type string;
-            }
-        }
-        output {
-            leaf output-leaf {
-                type string;
-            }
-        }
-    }
-}
\ No newline at end of file

diff --git a/model/yang-model-export/src/test/resources/bugs/bug-6856/foo.yang b/model/yang-model-export/src/test/resources/bugs/bug-6856/foo.yang
deleted file mode 100644 (file)
index efe2f1c..0000000
--- a/model/yang-model-export/src/test/resources/bugs/bug-6856/foo.yang
+++ /dev/null
@@ -1,8 +0,0 @@
-module foo {
-    namespace foo;
-    prefix foo;
-
-    revision 2017-02-28;
-
-    rpc foo-rpc {}
-}
\ No newline at end of file

diff --git a/model/yang-model-export/src/test/resources/bugs/bug5531/foo.yang b/model/yang-model-export/src/test/resources/bugs/bug5531/foo.yang
deleted file mode 100644 (file)
index 2c6c2e3..0000000
--- a/model/yang-model-export/src/test/resources/bugs/bug5531/foo.yang
+++ /dev/null
@@ -1,8 +0,0 @@
-module foo {
-    namespace "foo";
-    prefix foo;
-
-    revision 2015-01-01 {
-        description "test";
-    }
-}

diff --git a/model/yang-model-export/src/test/resources/bugs/yt1313/bar-one.yang b/model/yang-model-export/src/test/resources/bugs/yt1313/bar-one.yang
deleted file mode 100644 (file)
index 9dc622d..0000000
--- a/model/yang-model-export/src/test/resources/bugs/yt1313/bar-one.yang
+++ /dev/null
@@ -1,13 +0,0 @@
-submodule bar-one {
-  belongs-to bar {
-    prefix bar;
-  }
-
-  import foo {
-    prefix foo1;
-  }
-
-  leaf one {
-    type foo1:foo;
-  }
-}

diff --git a/model/yang-model-export/src/test/resources/bugs/yt1313/bar-two.yang b/model/yang-model-export/src/test/resources/bugs/yt1313/bar-two.yang
deleted file mode 100644 (file)
index 5503b5c..0000000
--- a/model/yang-model-export/src/test/resources/bugs/yt1313/bar-two.yang
+++ /dev/null
@@ -1,13 +0,0 @@
-submodule bar-two {
-  belongs-to bar {
-    prefix bar;
-  }
-
-  import foo {
-    prefix foo2;
-  }
-
-  leaf two {
-    type foo2:foo;
-  }
-}

diff --git a/model/yang-model-export/src/test/resources/bugs/yt1313/bar.yang b/model/yang-model-export/src/test/resources/bugs/yt1313/bar.yang
deleted file mode 100644 (file)
index 6df4097..0000000
--- a/model/yang-model-export/src/test/resources/bugs/yt1313/bar.yang
+++ /dev/null
@@ -1,8 +0,0 @@
-module bar {
-  namespace bar;
-  prefix bar;
-
-  include bar-one;
-  include bar-two;
-}
-  

diff --git a/model/yang-model-export/src/test/resources/bugs/yt1313/foo.yang b/model/yang-model-export/src/test/resources/bugs/yt1313/foo.yang
deleted file mode 100644 (file)
index e34ae2f..0000000
--- a/model/yang-model-export/src/test/resources/bugs/yt1313/foo.yang
+++ /dev/null
@@ -1,9 +0,0 @@
-module foo {
-  namespace foo;
-  prefix foo;
-
-  typedef foo {
-    type string;
-  }
-}
-  

diff --git a/model/yang-model-export/src/test/resources/bugs/yt992/module1@2019-05-17.yang b/model/yang-model-export/src/test/resources/bugs/yt992/module1@2019-05-17.yang
deleted file mode 100644 (file)
index 77d25ff..0000000
--- a/model/yang-model-export/src/test/resources/bugs/yt992/module1@2019-05-17.yang
+++ /dev/null
@@ -1,14 +0,0 @@
-module module1 {
-    yang-version "1.1";
-    namespace "urn:example:module1";
-    prefix "module1";
-
-    include module1submodule1;
-
-    revision "2019-05-17" {
-    }
-
-    container cont1 {
-        uses submodule-grouping;
-    }
-}
\ No newline at end of file

diff --git a/model/yang-model-export/src/test/resources/bugs/yt992/module1submodule1@2019-05-17.yang b/model/yang-model-export/src/test/resources/bugs/yt992/module1submodule1@2019-05-17.yang
deleted file mode 100644 (file)
index fd31501..0000000
--- a/model/yang-model-export/src/test/resources/bugs/yt992/module1submodule1@2019-05-17.yang
+++ /dev/null
@@ -1,22 +0,0 @@
-submodule module1submodule1 {
-    yang-version "1.1";
-    belongs-to "module1" {
-        prefix "module1";
-    }
-
-    import module2 {
-        prefix "module2";
-    }
-
-    revision "2019-05-17" {
-    }
-
-    grouping submodule-grouping {
-        uses module2:grouping1;
-
-        leaf leaf2 {
-            type string;
-            module2:ext1 "param1";
-        }
-    }
-}
\ No newline at end of file

diff --git a/model/yang-model-export/src/test/resources/bugs/yt992/module2@2019-05-17.yang b/model/yang-model-export/src/test/resources/bugs/yt992/module2@2019-05-17.yang
deleted file mode 100644 (file)
index 129f420..0000000
--- a/model/yang-model-export/src/test/resources/bugs/yt992/module2@2019-05-17.yang
+++ /dev/null
@@ -1,18 +0,0 @@
-module module2 {
-    yang-version "1.1";
-    namespace "urn:example:module2";
-    prefix "module2";
-
-    revision "2019-05-17" {
-    }
-
-    grouping grouping1 {
-        leaf leaf1 {
-            type string;
-        }
-    }
-
-    extension ext1 {
-        argument "parameter";
-    }
-}
\ No newline at end of file