Rework BindingRuntimeTypes

[mdsal.git] / binding / mdsal-binding-generator / src / test / java / org / opendaylight / mdsal / binding / generator / impl / Mdsal600Test.java

diff --git a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal600Test.java b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal600Test.java
index 3a529c60558b57aa2270240aaf7c82cff8a161bc..7ce90788f2b7bf5ceb9e47c35911337df432ea06 100644 (file)
--- a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal600Test.java
+++ b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal600Test.java
@@ -47,14 +47,12 @@ public class Mdsal600Test {
         // The real thing, used to kaboom
         final var runtimeTypes = new DefaultBindingRuntimeGenerator().generateTypeMapping(models);
 
-        // Verify schema-to-type lookup
-        final var barType = runtimeTypes.findType(barTypeSchema).orElseThrow();
-        final var bazType = runtimeTypes.findType(bazTypeSchema).orElseThrow();
-        assertEquals(FOO.createEnclosed("Bar"), barType.getIdentifier());
-        assertEquals(FOO.createEnclosed("Baz"), bazType.getIdentifier());
-
         // Verify type-to-schema lookup
-        assertSame(barTypeSchema, runtimeTypes.findSchema(barType).orElseThrow());
-        assertSame(bazTypeSchema, runtimeTypes.findSchema(bazType).orElseThrow());
+        final var barType = runtimeTypes.findSchema(FOO.createEnclosed("Bar")).orElseThrow();
+        final var bazType = runtimeTypes.findSchema(FOO.createEnclosed("Baz")).orElseThrow();
+
+        // Verify underlying schema lookup
+        assertSame(barSchema, barType.statement());
+        assertSame(bazSchema, bazType.statement());
     }
 }