Migrate YANG inputs for yang-data-util

Migrated all YANG testfiles counting 50 lines or less.

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

diff --git a/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextTreeTest.java b/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextTreeTest.java
index 6bb89651d390ab6dbea9b550679d00a2e20fb8ad..0976083598d245f45989476ae4117467d2f7d358 100644 (file)
--- a/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextTreeTest.java
+++ b/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextTreeTest.java
@@ -29,7 +29,19 @@ class DataSchemaContextTreeTest {
 
     @BeforeAll
     static void init() {
-        CONTEXT = DataSchemaContextTree.from(YangParserTestUtils.parseYangResource("/dataschemacontext.yang"));
+        CONTEXT = DataSchemaContextTree.from(YangParserTestUtils.parseYang("""
+            module dataschemacontext {
+              namespace "dataschemacontext";
+              prefix dsc;
+
+              container foo {
+                choice bar {
+                  leaf baz {
+                    type string;
+                  }
+                }
+              }
+            }"""));
     }
 
     @AfterAll

diff --git a/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/codec/IdentityCodecUtilTest.java b/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/codec/IdentityCodecUtilTest.java
index 1970476be08e21e85fba610986e8566f0e264cce..d5fffa947c1e74bd544b083b372c64900c975582 100644 (file)
--- a/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/codec/IdentityCodecUtilTest.java
+++ b/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/codec/IdentityCodecUtilTest.java
@@ -25,7 +25,13 @@ class IdentityCodecUtilTest {
 
     @BeforeAll
     static void init() {
-        SCHEMA_CONTEXT = YangParserTestUtils.parseYangResource("/yangtools846.yang");
+        SCHEMA_CONTEXT = YangParserTestUtils.parseYang("""
+            module yangtools846 {
+              namespace "yangtools846";
+              prefix yt846;
+
+              identity foo;
+            }""");
     }
 
     @AfterAll

diff --git a/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/impl/context/YT1412Test.java b/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/impl/context/YT1412Test.java
index 70f8bff32c97e8de5c8b2a6d21161c52e4361259..e9b644e4e221675fbbe3f0b4d73f956033493e3c 100644 (file)
--- a/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/impl/context/YT1412Test.java
+++ b/data/yang-data-util/src/test/java/org/opendaylight/yangtools/yang/data/util/impl/context/YT1412Test.java
@@ -41,7 +41,32 @@ class YT1412Test {
 
     @BeforeAll
     static void init() {
-        CONTEXT = DataSchemaContextTree.from(YangParserTestUtils.parseYangResource("/yt1412.yang"));
+        CONTEXT = DataSchemaContextTree.from(YangParserTestUtils.parseYang("""
+            module foo {
+              namespace foo;
+              prefix foo;
+              yang-version 1.1;
+
+              container one {
+                choice two {
+                  choice three {
+                    leaf four {
+                      type string;
+                    }
+                  }
+                }
+              }
+
+              augment /one {
+                list five;
+              }
+
+              augment /one/two/three/three {
+                leaf six {
+                  type string;
+                }
+              }
+            }"""));
     }
 
     @AfterAll

diff --git a/data/yang-data-util/src/test/resources/dataschemacontext.yang b/data/yang-data-util/src/test/resources/dataschemacontext.yang
deleted file mode 100644 (file)
index a8ec4cf..0000000
--- a/data/yang-data-util/src/test/resources/dataschemacontext.yang
+++ /dev/null
@@ -1,12 +0,0 @@
-module dataschemacontext {
-    namespace "dataschemacontext";
-    prefix dsc;
-
-    container foo {
-        choice bar {
-            leaf baz {
-                type string;
-            }
-        }
-    }
-}

diff --git a/data/yang-data-util/src/test/resources/yangtools846.yang b/data/yang-data-util/src/test/resources/yangtools846.yang
deleted file mode 100644 (file)
index 4e577c8..0000000
--- a/data/yang-data-util/src/test/resources/yangtools846.yang
+++ /dev/null
@@ -1,7 +0,0 @@
-module yangtools846 {
-    namespace "yangtools846";
-    prefix yt846;
-
-    identity foo;
-}
-

diff --git a/data/yang-data-util/src/test/resources/yt1412.yang b/data/yang-data-util/src/test/resources/yt1412.yang
deleted file mode 100644 (file)
index d40c1b2..0000000
--- a/data/yang-data-util/src/test/resources/yt1412.yang
+++ /dev/null
@@ -1,25 +0,0 @@
-module foo {
-  namespace foo;
-  prefix foo;
-  yang-version 1.1;
-
-  container one {
-    choice two {
-      choice three {
-        leaf four {
-          type string;
-        }
-      }
-    }
-  }
-
-  augment /one {
-    list five;
-  }
-
-  augment /one/two/three/three {
-    leaf six {
-      type string;
-    }
-  }
-}