From ea6280bf755e366eb08c52207bad51cdd10b273c Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 22 Jun 2023 15:12:34 +0200 Subject: [PATCH] Do not use BindingReflections in RibSupportUtilsTest Use plain literals instead of programmatic methods to assert values being present. Change-Id: Iac26789f767d4ab9374ade0468b4f7730bf1aedd Signed-off-by: Robert Varga --- .../bgp/rib/spi/RibSupportUtilsTest.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtilsTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtilsTest.java index e2fa03968a..82d6496635 100644 --- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtilsTest.java +++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtilsTest.java @@ -14,13 +14,10 @@ import static org.junit.Assert.assertTrue; import com.google.common.collect.ImmutableMap; import java.util.Map; import org.junit.Test; -import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.rib.peer.SupportedTables; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.Tables; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.TablesKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.AddressFamily; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.Ipv4AddressFamily; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.SubsequentAddressFamily; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.UnicastSubsequentAddressFamily; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; @@ -28,8 +25,6 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent public class RibSupportUtilsTest { private static final NodeIdentifierWithPredicates NII; private static final NodeIdentifierWithPredicates NII_PATH; - private static final AddressFamily AFI = Ipv4AddressFamily.VALUE; - private static final SubsequentAddressFamily SAFI = UnicastSubsequentAddressFamily.VALUE; private static final TablesKey TABLE_KEY = new TablesKey(Ipv4AddressFamily.VALUE, UnicastSubsequentAddressFamily.VALUE); @@ -53,8 +48,8 @@ public class RibSupportUtilsTest { final Map m = p.asMap(); assertFalse(m.isEmpty()); assertEquals(Tables.QNAME, p.getNodeType()); - assertTrue(m.containsValue(BindingReflections.findQName(AFI.implementedInterface()))); - assertTrue(m.containsValue(BindingReflections.findQName(SAFI.implementedInterface()))); + assertTrue(m.containsValue(Ipv4AddressFamily.QNAME)); + assertTrue(m.containsValue(UnicastSubsequentAddressFamily.QNAME)); } @Test @@ -63,13 +58,14 @@ public class RibSupportUtilsTest { final Map m = p.asMap(); assertFalse(m.isEmpty()); assertEquals(SupportedTables.QNAME, p.getNodeType()); - assertTrue(m.containsValue(BindingReflections.findQName(AFI.implementedInterface()))); - assertTrue(m.containsValue(BindingReflections.findQName(SAFI.implementedInterface()))); + assertTrue(m.containsValue(Ipv4AddressFamily.QNAME)); + assertTrue(m.containsValue(UnicastSubsequentAddressFamily.QNAME)); } @Test public void toYangPathKey() { - final NodeIdentifierWithPredicates result = RibSupportUtils.toYangPathKey(SupportedTables.QNAME, AFI, SAFI); + final NodeIdentifierWithPredicates result = RibSupportUtils.toYangPathKey(SupportedTables.QNAME, + Ipv4AddressFamily.VALUE, UnicastSubsequentAddressFamily.VALUE); assertEquals(NII_PATH.toString(), result.toString()); } -- 2.36.6