Improve UnionTypeDefTest asserts

Test structure here is less than optimal, having implicit assumptions
and very weak asserts. Improve the situation.

Change-Id: I6024b00de594df41201b6cd7f358b87fb3b2c55f
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/UnionTypeDefTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UnionTypeDefTest.java
index 1e4b7c52eaf80c06dae3af792cd76d595ad03f59..68c9b2c472d6fc533bfc431e453b2338a8289351 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UnionTypeDefTest.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UnionTypeDefTest.java
@@ -34,19 +34,22 @@ public class UnionTypeDefTest {
         final List<GeneratedType> generateTypes = DefaultBindingGenerator.generateFor(
             YangParserTestUtils.parseYangResource("/bug8449.yang"));
         assertNotNull(generateTypes);
-        for (final GeneratedType type : generateTypes) {
-            if (type.getName().equals("Cont")) {
-                final GeneratedType refType = type.getEnclosedTypes().iterator().next();
-                for (final GeneratedProperty generatedProperty : refType.getProperties()) {
-                    switch (generatedProperty.getName()) {
-                        case "stringRefValue":
-                            assertEquals(Types.STRING, generatedProperty.getReturnType());
-                            break;
-                        default:
-                            // ignore
-                    }
-                }
-            }
-        }
+        assertEquals(6, generateTypes.size());
+
+        final GeneratedType cont = generateTypes.stream()
+            .filter(type -> type.getName().equals("Cont"))
+            .findFirst()
+            .orElseThrow();
+
+        final List<GeneratedType> enclosedTypes = cont.getEnclosedTypes();
+        assertEquals(1, enclosedTypes.size());
+
+        final GeneratedType refType = enclosedTypes.get(0);
+        final List<GeneratedProperty> properties = refType.getProperties();
+        assertEquals(1, properties.size());
+
+        final GeneratedProperty property = properties.get(0);
+        assertEquals("stringRefValue", property.getName());
+        assertEquals(Types.STRING, property.getReturnType());
     }
 }