X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-generator-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fgenerator%2Fimpl%2FGenEnumResolvingTest.java;h=7d9b89321c87789c6feefc6cf8605c51e97c6dd9;hb=6e41665dbd6cc79c0ae4b85f7f10083521947928;hp=335a853202d8b01a75c953560ab1e924e73b6aec;hpb=8eccd3361817a9b116798cc054ded188ad1d8958;p=mdsal.git

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenEnumResolvingTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenEnumResolvingTest.java
index 335a853202..7d9b89321c 100644
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenEnumResolvingTest.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenEnumResolvingTest.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.generator.impl;
 
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -22,19 +24,17 @@ import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 public class GenEnumResolvingTest {
     @Test
     public void testLeafEnumResolving() {
-        final List<Type> genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResources(
+        final List<GeneratedType> genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResources(
             GenEnumResolvingTest.class,
             "/enum-test-models/ietf-interfaces@2012-11-15.yang", "/ietf-models/iana-if-type.yang"));
-        assertTrue(genTypes != null);
+        assertNotNull(genTypes);
 
         assertEquals("Expected count of all Generated Types", 6, genTypes.size());
 
         GeneratedType genInterface = null;
-        for (final Type type : genTypes) {
-            if (type instanceof GeneratedType) {
-                if (type.getName().equals("Interface")) {
-                    genInterface = (GeneratedType) type;
-                }
+        for (final GeneratedType type : genTypes) {
+            if (type.getName().equals("Interface")) {
+                genInterface = type;
             }
         }
         assertNotNull("Generated Type Interface is not present in list of Generated Types", genInterface);
@@ -66,7 +66,7 @@ public class GenEnumResolvingTest {
         assertNotNull("Generated Interface cannot contain NULL reference for Method Signature Definitions!", methods);
 
         // FIXME: split this into getter/default/static asserts
-        assertEquals(20, methods.size());
+        assertEquals(19, methods.size());
         Enumeration ianaIfType = null;
         for (final MethodSignature method : methods) {
             if (method.getName().equals("getType")) {
@@ -82,13 +82,13 @@ public class GenEnumResolvingTest {
 
     @Test
     public void testTypedefEnumResolving() {
-        final List<Type> genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
+        final List<GeneratedType> genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
             "/ietf-models/iana-if-type.yang"));
-        assertTrue(genTypes != null);
+        assertNotNull(genTypes);
         assertEquals(1, genTypes.size());
 
-        final Type type = genTypes.get(0);
-        assertTrue(type instanceof Enumeration);
+        final GeneratedType type = genTypes.get(0);
+        assertThat(type, instanceOf(Enumeration.class));
 
         final Enumeration enumer = (Enumeration) type;
         assertEquals("Enumeration type MUST contain 272 values!", 272, enumer.getValues().size());
@@ -96,21 +96,18 @@ public class GenEnumResolvingTest {
 
     @Test
     public void testLeafrefEnumResolving() {
-        final List<Type> genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResources(
+        final List<GeneratedType> genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResources(
             GenEnumResolvingTest.class,
             "/enum-test-models/abstract-topology@2013-02-08.yang", "/enum-test-models/ietf-interfaces@2012-11-15.yang",
             "/ietf-models/iana-if-type.yang"));
         assertNotNull(genTypes);
-        assertTrue(!genTypes.isEmpty());
+        assertEquals(24, genTypes.size());
 
         GeneratedType genInterface = null;
-        for (final Type type : genTypes) {
-            if (type instanceof GeneratedType) {
-                if (type.getPackageName().equals(
-                        "org.opendaylight.yang.gen.v1.urn.model._abstract.topology.rev130208.topology.interfaces")
-                        && type.getName().equals("Interface")) {
-                    genInterface = (GeneratedType) type;
-                }
+        for (final GeneratedType type : genTypes) {
+            if (type.getName().equals("Interface") && type.getPackageName().equals(
+                "org.opendaylight.yang.gen.v1.urn.model._abstract.topology.rev130208.topology.interfaces")) {
+                genInterface = type;
             }
         }
         assertNotNull("Generated Type Interface is not present in list of Generated Types", genInterface);