Move more test yangs

We have a few superfluous directories with a single YANG file only.
Move the files so that we have flatter directory layout.

Change-Id: I4d9d01025d1a64f2e344d04bff2f1942310eba27
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug4145Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug4145Test.java
index aeaa4f819b79e713cfb7d360be91158102fbf915..d910b01a5cc1b74919a267838c7b457249112445 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug4145Test.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug4145Test.java
@@ -18,7 +18,7 @@ public class Bug4145Test {
     @Test
     public void bug4145Test() {
         List<GeneratedType> generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
-            "/bug-4145/foo.yang"));
+            "/bug4145.yang"));
         assertEquals(8, generateTypes.size());
     }
 }

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug6135Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug6135Test.java
index 13f3f6d678102aefa99e1027c5c7c2e52e873b0d..7ff2c5c5f1b3160c40e3cd441b0271233ad3ade5 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug6135Test.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug6135Test.java
@@ -20,7 +20,7 @@ public class Bug6135Test {
     @Test
     public void bug6135Test() {
         final List<GeneratedType> generateTypes = DefaultBindingGenerator.generateFor(
-            YangParserTestUtils.parseYangResource("/bug-6135/foo.yang"));
+            YangParserTestUtils.parseYangResource("/bug6135.yang"));
         assertEquals(5, generateTypes.size());
 
         GeneratedType genInterface = null;

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ExtendedTypedefTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ExtendedTypedefTest.java
index 22f0413baf8f3cc4470f0e141ef539263e1b46ac..363c8f1a32f348f4d3a94cbd52c21ac9941237aa 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ExtendedTypedefTest.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ExtendedTypedefTest.java
@@ -23,8 +23,7 @@ public class ExtendedTypedefTest {
     @Test
     public void constantGenerationTest() {
         final List<GeneratedType> genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResources(
-            ExtendedTypedefTest.class,
-            "/typedef-of-typedef/typedef_of_typedef.yang", "/ietf-models/ietf-inet-types.yang"));
+            ExtendedTypedefTest.class, "/typedef_of_typedef.yang", "/ietf-models/ietf-inet-types.yang"));
 
         GeneratedTransferObject simpleTypedef4 = null;
         GeneratedTransferObject extendedTypedefUnion = null;

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal302Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal302Test.java
index 35483c5c2b8591082f6aa5d6afb21609fc259b1b..03783d62d0adea275d1f49d894bcf10982f0cfa8 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal302Test.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal302Test.java
@@ -19,7 +19,7 @@ public class Mdsal302Test {
     @Test
     public void bug4145Test() {
         List<GeneratedType> generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
-            "/mdsal-302/mdsal-302.yang"));
+            "/mdsal302.yang"));
         assertNotNull(generateTypes);
         assertEquals(15, generateTypes.size());
     }

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal519Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal519Test.java
index 846fcd9e103b72a40a6e74ac65a7258945d5661a..44cc44158d51eaf793ff71a68f9c260a80d8fe9c 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal519Test.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal519Test.java
@@ -19,11 +19,10 @@ import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
  * Test specific combination of leafrefs, grouping and relative paths.
  */
 public class Mdsal519Test {
-
     @Test
     public void testNestedLeafref2() {
         final Collection<GeneratedType> types = DefaultBindingGenerator.generateFor(
-            YangParserTestUtils.parseYangResource("/mdsal-519/specific-grouping-leafref.yang"));
+            YangParserTestUtils.parseYangResource("/mdsal519.yang"));
         assertNotNull(types);
         assertEquals(4, types.size());
     }

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/Bug4621.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/Bug4621.java
index 0f1f9ffb55bd3433d461d58eb4f3a306f7c4e071..89510c01542205950c80d7ba5dfdcecf9dd85b1c 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/Bug4621.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/Bug4621.java
@@ -26,7 +26,7 @@ import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 public class Bug4621 {
     @Test
     public void bug4621test() {
-        final SchemaContext schemaContext = YangParserTestUtils.parseYangResource("/bug-4621/foo.yang");
+        final SchemaContext schemaContext = YangParserTestUtils.parseYangResource("/bug4621.yang");
         final Module moduleValid = schemaContext.findModules(URI.create("foo")).iterator().next();
         final TypeProvider typeProvider = new RuntimeTypeProvider(schemaContext);
 

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/bug-4145/foo.yang b/binding/mdsal-binding-generator-impl/src/test/resources/bug4145.yang
similarity index 100%
rename from binding/mdsal-binding-generator-impl/src/test/resources/bug-4145/foo.yang
rename to binding/mdsal-binding-generator-impl/src/test/resources/bug4145.yang

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/bug-4621/foo.yang b/binding/mdsal-binding-generator-impl/src/test/resources/bug4621.yang
similarity index 100%
rename from binding/mdsal-binding-generator-impl/src/test/resources/bug-4621/foo.yang
rename to binding/mdsal-binding-generator-impl/src/test/resources/bug4621.yang

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/bug-6135/foo.yang b/binding/mdsal-binding-generator-impl/src/test/resources/bug6135.yang
similarity index 100%
rename from binding/mdsal-binding-generator-impl/src/test/resources/bug-6135/foo.yang
rename to binding/mdsal-binding-generator-impl/src/test/resources/bug6135.yang

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/mdsal-302/mdsal-302.yang b/binding/mdsal-binding-generator-impl/src/test/resources/mdsal302.yang
similarity index 100%
rename from binding/mdsal-binding-generator-impl/src/test/resources/mdsal-302/mdsal-302.yang
rename to binding/mdsal-binding-generator-impl/src/test/resources/mdsal302.yang

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/mdsal-519/specific-grouping-leafref.yang b/binding/mdsal-binding-generator-impl/src/test/resources/mdsal519.yang
similarity index 100%
rename from binding/mdsal-binding-generator-impl/src/test/resources/mdsal-519/specific-grouping-leafref.yang
rename to binding/mdsal-binding-generator-impl/src/test/resources/mdsal519.yang

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/typedef-of-typedef/typedef_of_typedef.yang b/binding/mdsal-binding-generator-impl/src/test/resources/typedef_of_typedef.yang
similarity index 100%
rename from binding/mdsal-binding-generator-impl/src/test/resources/typedef-of-typedef/typedef_of_typedef.yang
rename to binding/mdsal-binding-generator-impl/src/test/resources/typedef_of_typedef.yang