Drop <R, I> generic from RIBSupport

[bgpcep.git] / bgp / rib-spi / src / test / java / org / opendaylight / protocol / bgp / rib / spi / SimpleRIBExtensionTest.java

diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/SimpleRIBExtensionTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/SimpleRIBExtensionTest.java
index d6bb5388bd72eaf6f93c646a9d1e7beb1e55b3e0..8343056f7747d13511b8f328aebe155d0e2573ca 100644 (file)
--- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/SimpleRIBExtensionTest.java
+++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/SimpleRIBExtensionTest.java
@@ -7,39 +7,53 @@
  */
 package org.opendaylight.protocol.bgp.rib.spi;
 
-import com.google.common.collect.Lists;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.doReturn;
+
 import java.util.List;
-import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.bgp.rib.rib.loc.rib.tables.routes.Ipv4RoutesCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.ipv4.routes.Ipv4Routes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.ipv4.routes.ipv4.routes.Ipv4Route;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.Ipv4AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.UnicastSubsequentAddressFamily;
+import org.opendaylight.mdsal.binding.dom.adapter.AdapterContext;
+import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractConcurrentDataBrokerTest;
+import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataBrokerTestCustomizer;
+import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.Route;
+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.UnicastSubsequentAddressFamily;
+import org.opendaylight.yangtools.concepts.Registration;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+
+public class SimpleRIBExtensionTest extends AbstractConcurrentDataBrokerTest {
+    private AdapterContext adapter;
 
-public class SimpleRIBExtensionTest {
+    @Override
+    protected final AbstractDataBrokerTestCustomizer createDataBrokerTestCustomizer() {
+        final AbstractDataBrokerTestCustomizer customizer = super.createDataBrokerTestCustomizer();
+        this.adapter = customizer.getAdapterContext();
+        return customizer;
+    }
 
     @Test
     public void testExtensionProvider() {
-        final ServiceLoaderRIBExtensionConsumerContext ctx = ServiceLoaderRIBExtensionConsumerContext.createConsumerContext();
-        Assert.assertNull(ctx.getRIBSupport(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class));
-        final TestActivator act = new TestActivator();
-        act.startRIBExtensionProvider(ctx);
-        Assert.assertNotNull(ctx.getRIBSupport(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class));
-        act.close();
-        Assert.assertNull(ctx.getRIBSupport(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class));
-        ctx.close();
+        final BindingNormalizedNodeSerializer codec = adapter.currentSerializer();
+        var ctx = new DefaultRIBExtensionConsumerContext(codec);
+        assertNull(ctx.getRIBSupport(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class));
+
+        ctx = new DefaultRIBExtensionConsumerContext(codec, new TestActivator());
+        assertNotNull(ctx.getRIBSupport(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class));
     }
 
-    private final class TestActivator extends AbstractRIBExtensionProviderActivator {
+    private static final class TestActivator implements RIBExtensionProviderActivator {
         @Override
-        protected List<AutoCloseable> startRIBExtensionProviderImpl(final RIBExtensionProviderContext context) {
-            RIBSupport support = Mockito.mock(RIBSupport.class);
-            Mockito.doReturn(Ipv4Route.class).when(support).routesListClass();
-            Mockito.doReturn(Ipv4Routes.class).when(support).routesContainerClass();
-            Mockito.doReturn(Ipv4RoutesCase.class).when(support).routesCaseClass();
-            return Lists.newArrayList((AutoCloseable)context.registerRIBSupport(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class, support));
+        public List<Registration> startRIBExtensionProvider(final RIBExtensionProviderContext context,
+                final BindingNormalizedNodeSerializer mappingService) {
+            final RIBSupport<?, ?> support = Mockito.mock(RIBSupport.class);
+            doReturn(Route.class).when(support).routesListClass();
+            doReturn(DataObject.class).when(support).routesContainerClass();
+            doReturn(DataObject.class).when(support).routesCaseClass();
+            return List.of(context.registerRIBSupport(Ipv4AddressFamily.class,
+                    UnicastSubsequentAddressFamily.class, support));
         }
     }
 }