Improve mdsal-binding-java-api-generator asserts

Use proper assertNotNull() and also be more defensive about type
ordering.

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

diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratorTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratorTest.java
index b7babc8e7e7f448cf339563a142b0089f3a52160..5f51cf89ca2a4479c3614d498e4b3e378fc1d00c 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratorTest.java
+++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratorTest.java
@@ -265,7 +265,10 @@ public class BuilderGeneratorTest {
         final EffectiveModelContext context = YangParserTestUtils.parseYangResource(
                 "/test-types.yang");
         final List<GeneratedType> types = new DefaultBindingGenerator().generateTypes(context);
-        final BuilderTemplate bt = BuilderGenerator.templateForType(types.get(19));
+        assertEquals(29, types.size());
+
+        final BuilderTemplate bt = BuilderGenerator.templateForType(
+            types.stream().filter(t -> t.getName().equals("Nodes")).findFirst().orElseThrow());
 
         final List<String> sortedProperties = bt.properties.stream()
                 .sorted(ByTypeMemberComparator.getInstance())

diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java
index a3946ccf839625d38399afe5e889225bf50aa063..5121bc2b31b3c8e282725afcd99ef0c51d810d23 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java
+++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java
@@ -12,7 +12,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 import org.junit.Test;
@@ -34,7 +33,7 @@ public class ClassCodeGeneratorTest {
         final List<GeneratedType> genTypes = new DefaultBindingGenerator().generateTypes(
             YangParserTestUtils.parseYangResource("/list-composite-key.yang"));
 
-        assertTrue(genTypes != null);
+        assertNotNull(genTypes);
         assertEquals(7, genTypes.size());
 
         int genTypesCount = 0;