Migrate OvsdbDataTreeChangeListenerTest

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)

diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbDataTreeChangeListenerTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbDataTreeChangeListenerTest.java
index 906e703c3fb0504ce583bdc21735c5f88823e7be..25951074cf4c2e4aeae81c2c1cb51b9b571b391d 100644 (file)
--- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbDataTreeChangeListenerTest.java
+++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbDataTreeChangeListenerTest.java
@@ -17,7 +17,7 @@ import org.junit.Test;
 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;
@@ -33,12 +33,16 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 /**
  * 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;
 
+    public OvsdbDataTreeChangeListenerTest() {
+        super(true);
+    }
+
     @Before
     public void setupListener() {
         dataBroker = getDataBroker();
@@ -70,6 +74,6 @@ public class OvsdbDataTreeChangeListenerTest extends AbstractDataBrokerTest {
         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);
     }
 }