Bump upstreams to 2022.09

[bgpcep.git] / bgp / openconfig-spi / src / test / java / org / opendaylight / protocol / bgp / openconfig / spi / BGPTableTypeRegistryProviderActivatorTest.java

diff --git a/bgp/openconfig-spi/src/test/java/org/opendaylight/protocol/bgp/openconfig/spi/BGPTableTypeRegistryProviderActivatorTest.java b/bgp/openconfig-spi/src/test/java/org/opendaylight/protocol/bgp/openconfig/spi/BGPTableTypeRegistryProviderActivatorTest.java
index be84c9b7d24687a75d83ae637b909639fb0a7095..e94aa0fec5d7c29f8b0a375073e93ef566b30c0d 100644 (file)
--- a/bgp/openconfig-spi/src/test/java/org/opendaylight/protocol/bgp/openconfig/spi/BGPTableTypeRegistryProviderActivatorTest.java
+++ b/bgp/openconfig-spi/src/test/java/org/opendaylight/protocol/bgp/openconfig/spi/BGPTableTypeRegistryProviderActivatorTest.java
@@ -5,35 +5,32 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.protocol.bgp.openconfig.spi;
 
-import java.util.Collections;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
 import java.util.List;
-import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV4UNICAST;
-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.yangtools.concepts.AbstractRegistration;
+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;
 
 public class BGPTableTypeRegistryProviderActivatorTest {
-
     @Test
     public void testBGPTableTypeRegistryProviderActivator() {
-        final AbstractBGPTableTypeRegistryProviderActivator activator = new AbstractBGPTableTypeRegistryProviderActivator(){
-            @Override
-            protected List<AbstractRegistration> startBGPTableTypeRegistryProviderImpl(
-                    final BGPTableTypeRegistryProvider provider) {
-                return Collections.singletonList(provider.registerBGPTableType(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class, IPV4UNICAST.class));
-            }};
+        final BGPTableTypeRegistryProviderActivator activator =
+            provider -> List.of(provider.registerBGPTableType(Ipv4AddressFamily.VALUE,
+                UnicastSubsequentAddressFamily.VALUE, IPV4UNICAST.VALUE));
 
         final SimpleBGPTableTypeRegistryProvider provider = new SimpleBGPTableTypeRegistryProvider();
-        activator.startBGPTableTypeRegistryProvider(provider);
-        Assert.assertTrue(provider.getTableType(IPV4UNICAST.class).isPresent());
-        activator.stopBGPTableTypeRegistryProvider();
-        Assert.assertFalse(provider.getTableType(IPV4UNICAST.class).isPresent());
-        activator.close();
-    }
+        final List<Registration> regs = activator.startBGPTableTypeRegistryProvider(provider);
+        assertNotNull(provider.getTableType(IPV4UNICAST.VALUE));
+        assertEquals(1, regs.size());
 
+        regs.get(0).close();
+        assertNull(provider.getTableType(IPV4UNICAST.VALUE));
+    }
 }