From d840c856065f73b91eb59605313268716bec3dd3 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 22 Sep 2021 00:27:01 +0200 Subject: [PATCH] Move generatedTypeForExtendedDefinitionTypeWithIdentityrefBaseTypeTest() Move this test into the legacy test suite. Change-Id: I127db528643cc59f76ce3e6198c96508e2c46d01 Signed-off-by: Robert Varga --- .../impl/DefaultBindingGeneratorTest.java | 23 +++++++++++++++++++ .../binding/yang/types/TypeProviderTest.java | 14 ----------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingGeneratorTest.java b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingGeneratorTest.java index e130b7f46b..45a3165acb 100644 --- a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingGeneratorTest.java +++ b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingGeneratorTest.java @@ -86,4 +86,27 @@ public class DefaultBindingGeneratorTest { assertEquals(1, enumsTypeArgs.length); assertEquals(TEST_TYPE_PROVIDER + ".Foo.ListOfEnums", enumsTypeArgs[0].getFullyQualifiedName()); } + + @Test + public void generatedTypeForExtendedDefinitionTypeWithIdentityrefBaseTypeTest() { + final var cttName = JavaTypeName.create(TEST_TYPE_PROVIDER, "ConstructionTypeTest"); + final var ctt = TYPES.stream() + .filter(type -> type.getIdentifier().equals(cttName)) + .findFirst() + .orElseThrow(); + + final var methods = ctt.getMethodDefinitions(); + assertEquals(56, methods.size()); + + final var type = methods.stream().filter(method -> method.getName().equals("getAesIdentityrefType")) + .findFirst() + .orElseThrow() + .getReturnType(); + assertThat(type, instanceOf(ParameterizedType.class)); + final var pType = (ParameterizedType) type; + assertEquals(Types.CLASS, pType.getRawType()); + final var pTypeArgs = pType.getActualTypeArguments(); + assertEquals(1, pTypeArgs.length); + assertEquals(TEST_TYPE_PROVIDER + ".Aes", pTypeArgs[0].getFullyQualifiedName()); + } } diff --git a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderTest.java b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderTest.java index 9900318633..26cdb2ceaf 100644 --- a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderTest.java +++ b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderTest.java @@ -467,18 +467,4 @@ public class TypeProviderTest { final Type extType = provider.generatedTypeForExtendedDefinitionType(barItemLeafrefId, barItemLeafrefId); assertEquals(null, extType); } - - @Test - public void generatedTypeForExtendedDefinitionTypeWithIdentityrefBaseTypeTest() { - final AbstractTypeProvider provider = new RuntimeTypeProvider(SCHEMA_CONTEXT); - - final Module baseYangTypes = resolveModule("test-type-provider"); - - final TypeDefinition aesIdentityrefType = resolveTypeDefinitionFromModule(baseYangTypes, - "aes-identityref-type"); - - assertNotNull(aesIdentityrefType); - final Type extType = provider.generatedTypeForExtendedDefinitionType(aesIdentityrefType, aesIdentityrefType); - assertEquals(null, extType); - } } -- 2.36.6