Move generatedTypeForExtendedDefinitionTypeWithIdentityrefBaseTypeTest()

Move this test into the legacy test suite.

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

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 e130b7f46b3ec835f096b3ef25fab4dacbe0c164..45a3165acb8fb0e353554b027b16771e8f1eb217 100644 (file)
--- 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 9900318633d20069dc4d7e8aeb2b55fde27c70c8..26cdb2ceaf223cc25fe63e8db7075785155006e1 100644 (file)
--- 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);
-    }
 }