From 97791bf01ca69608322141b94883f806fd5d4b07 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 25 Mar 2021 12:02:21 +0100 Subject: [PATCH] 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 --- .../binding/generator/impl/Mdsal554Test.java | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) 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 632c155ed9..5451d40fc8 100644 --- 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 toGenModules = new HashSet<>(); - for (final Module module : context.getModules()) { - toGenModules.add(module); - } - - final List genTypes = DefaultBindingGenerator.generateFor(context, toGenModules); - - final GeneratedType type = (GeneratedType) genTypes.get(3); - - final List methods = type.getMethodDefinitions(); + final List genTypes = DefaultBindingGenerator.generateFor( + YangParserTestUtils.parseYangResource("/mdsal554.yang")); + assertEquals(4, genTypes.size()); + final List methods = ((GeneratedType) genTypes.get(3)).getMethodDefinitions(); assertEquals(3, methods.size()); assertEquals(methods.get(0).getName(), "onDeprecatedNotification"); assertEquals(methods.get(0).isDefault(), false); -- 2.36.6