Remove RIBImpl's use of DataBroker

[bgpcep.git] / bgp / rib-impl / src / test / java / org / opendaylight / protocol / bgp / rib / impl / config / AbstractConfig.java

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java
index 671ffcd48d524f13bd4fe7eca54ad192c9379242..d97d17d7765e5d0596e0a4b0aa5b0ef0bb18e502 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java
@@ -10,7 +10,6 @@ package org.opendaylight.protocol.bgp.rib.impl.config;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -20,7 +19,6 @@ import java.net.InetSocketAddress;
 import java.util.Collections;
 import org.junit.Before;
 import org.mockito.Mock;
-import org.opendaylight.mdsal.binding.api.TransactionChainListener;
 import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeService;
@@ -94,12 +92,7 @@ class AbstractConfig extends DefaultRibPoliciesMockTest {
                 .params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.Rib.class, new RibKey(RIB_ID))).when(this.rib)
                 .getInstanceIdentifier();
         doReturn(this.domTx).when(this.rib).createPeerDOMChain(any(DOMTransactionChainListener.class));
-        doAnswer(invocation -> {
-            final Object[] args = invocation.getArguments();
-            return getDataBroker().createTransactionChain((TransactionChainListener) args[0]);
-        }).when(this.rib).createPeerChain(any(TransactionChainListener.class));
 
-        doReturn(getDataBroker()).when(this.rib).getDataBroker();
         doReturn(AS).when(this.rib).getLocalAs();
         doReturn(mock(RIBSupportContextRegistry.class)).when(this.rib).getRibSupportContext();
         doReturn(Collections.emptySet()).when(this.rib).getLocalTablesKeys();
@@ -122,10 +115,9 @@ class AbstractConfig extends DefaultRibPoliciesMockTest {
                 any(), anyInt(), any(KeyMapping.class));
         doReturn(this.dispatcher).when(this.rib).getDispatcher();
 
-        doReturn(java.util.Optional.of(new BgpTableTypeImpl(Ipv4AddressFamily.class,
-                UnicastSubsequentAddressFamily.class)))
+        doReturn(new BgpTableTypeImpl(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class))
                 .when(this.tableTypeRegistry).getTableType(any());
-        doReturn(java.util.Optional.of(TABLES_KEY)).when(this.tableTypeRegistry).getTableKey(any());
+        doReturn(TABLES_KEY).when(this.tableTypeRegistry).getTableKey(any());
         doReturn(Collections.singleton(new BgpTableTypeImpl(Ipv4AddressFamily.class,
                 UnicastSubsequentAddressFamily.class)))
                 .when(this.rib).getLocalTables();