This migrates to use non-deprecated AbstractConcurrentDataBrokerTest,
which allows proper background processing of DTCLs.
JIRA: OVSDB-454
Change-Id: Ic98369564e3d45fdc38e6bbc992b548fe97ba360
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit
64aeaec5e3d0d701dec14a07c8517ff0397b152a)
import org.mockito.Mockito;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
import org.mockito.Mockito;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.binding.test.AbstractDataBrokerTest;
+import org.opendaylight.controller.md.sal.binding.test.AbstractConcurrentDataBrokerTest;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService;
import org.opendaylight.ovsdb.lib.OvsdbConnection;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService;
import org.opendaylight.ovsdb.lib.OvsdbConnection;
/**
* Unit tests for the data-tree change listener.
*/
/**
* Unit tests for the data-tree change listener.
*/
-public class OvsdbDataTreeChangeListenerTest extends AbstractDataBrokerTest {
+public class OvsdbDataTreeChangeListenerTest extends AbstractConcurrentDataBrokerTest {
private final OvsdbConnection ovsdbConnection = mock(OvsdbConnection.class);
private DataBroker dataBroker;
private OvsdbDataTreeChangeListener listener;
private final OvsdbConnection ovsdbConnection = mock(OvsdbConnection.class);
private DataBroker dataBroker;
private OvsdbDataTreeChangeListener listener;
+ public OvsdbDataTreeChangeListenerTest() {
+ super(true);
+ }
+
@Before
public void setupListener() {
dataBroker = getDataBroker();
@Before
public void setupListener() {
dataBroker = getDataBroker();
transaction.submit().get();
// Then the listener tries to open a connection
transaction.submit().get();
// Then the listener tries to open a connection
- Mockito.verify(ovsdbConnection).connect(inetAddress, port);
+ Mockito.verify(ovsdbConnection, Mockito.timeout(5000)).connect(inetAddress, port);