Cleanup Mdsal554Test

We are shifting modules here, stop doing that. Also assert the number of
types generated before touching any offset.

Change-Id: I5f457fcab5340ad30d9246e92dddf7c473d42220
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/Mdsal554Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal554Test.java
index 632c155ed90540e7c115854f87a553da937cbff0..5451d40fc85a82956da3a162908e267ea0990990 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal554Test.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal554Test.java
@@ -9,34 +9,22 @@ package org.opendaylight.mdsal.binding.generator.impl;
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import org.junit.Test;
 import org.opendaylight.mdsal.binding.model.api.GeneratedType;
 import org.opendaylight.mdsal.binding.model.api.JavaTypeName;
 import org.opendaylight.mdsal.binding.model.api.MethodSignature;
 import org.opendaylight.mdsal.binding.model.api.Type;
-import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
-import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class Mdsal554Test {
     @Test
     public void builderTemplateGenerateListenerMethodsTest() {
-        final EffectiveModelContext context = YangParserTestUtils.parseYangResource("/mdsal554.yang");
-
-        final Set<Module> toGenModules = new HashSet<>();
-        for (final Module module : context.getModules()) {
-            toGenModules.add(module);
-        }
-
-        final List<Type> genTypes = DefaultBindingGenerator.generateFor(context, toGenModules);
-
-        final GeneratedType type = (GeneratedType) genTypes.get(3);
-
-        final List<MethodSignature> methods = type.getMethodDefinitions();
+        final List<Type> genTypes = DefaultBindingGenerator.generateFor(
+            YangParserTestUtils.parseYangResource("/mdsal554.yang"));
+        assertEquals(4, genTypes.size());
 
+        final List<MethodSignature> methods = ((GeneratedType) genTypes.get(3)).getMethodDefinitions();
         assertEquals(3, methods.size());
         assertEquals(methods.get(0).getName(), "onDeprecatedNotification");
         assertEquals(methods.get(0).isDefault(), false);