OPNFLWPLUG-1032: Neon-MRI: Bump odlparent, yangtools, mdsal

[openflowplugin.git] / applications / forwardingrules-manager / src / test / java / test / mock / util / FRMTest.java

diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/util/FRMTest.java b/applications/forwardingrules-manager/src/test/java/test/mock/util/FRMTest.java
index 8156b1a67cdf73606b62a3dd60b2b44e0b8a8165..02bcd1ee5411c7615be7168dafc47307c32e2768 100644 (file)
--- a/applications/forwardingrules-manager/src/test/java/test/mock/util/FRMTest.java
+++ b/applications/forwardingrules-manager/src/test/java/test/mock/util/FRMTest.java
@@ -8,6 +8,8 @@
 package test.mock.util;
 
 import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import org.mockito.Mockito;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
@@ -36,7 +38,7 @@ public abstract class FRMTest extends AbstractDataBrokerTest {
 
         FlowCapableNodeBuilder fcnBuilder = new FlowCapableNodeBuilder();
         NodeBuilder nodeBuilder = new NodeBuilder();
-        nodeBuilder.setKey(nodeKey);
+        nodeBuilder.withKey(nodeKey);
         nodeBuilder.addAugmentation(FlowCapableNode.class, fcnBuilder.build());
 
         WriteTransaction writeTx = getDataBroker().newWriteOnlyTransaction();
@@ -58,7 +60,7 @@ public abstract class FRMTest extends AbstractDataBrokerTest {
 
     public void addTable(final TableKey tableKey, final NodeKey nodeKey) {
         addFlowCapableNode(nodeKey);
-        final Table table = new TableBuilder().setKey(tableKey).setFlow(Collections.<Flow>emptyList()).build();
+        final Table table = new TableBuilder().withKey(tableKey).setFlow(Collections.<Flow>emptyList()).build();
         WriteTransaction writeTx = getDataBroker().newWriteOnlyTransaction();
         InstanceIdentifier<Table> tableII = InstanceIdentifier.create(Nodes.class).child(Node.class, nodeKey)
                 .augmentation(FlowCapableNode.class).child(Table.class, tableKey);
@@ -82,18 +84,26 @@ public abstract class FRMTest extends AbstractDataBrokerTest {
         Mockito.when(configurationService.registerListener(Mockito.any())).thenReturn(() -> {
         });
 
-        Mockito.when(configurationService.getProperty(Mockito.eq("disable-reconciliation"), Mockito.any()))
+        Mockito.lenient().when(configurationService.getProperty(Mockito.eq("disable-reconciliation"), Mockito.any()))
                 .thenReturn(config.isDisableReconciliation());
 
-        Mockito.when(configurationService.getProperty(Mockito.eq("stale-marking-enabled"), Mockito.any()))
+        Mockito.lenient().when(configurationService.getProperty(Mockito.eq("stale-marking-enabled"), Mockito.any()))
                 .thenReturn(config.isStaleMarkingEnabled());
 
-        Mockito.when(configurationService.getProperty(Mockito.eq("reconciliation-retry-count"), Mockito.any()))
-                .thenReturn(config.getReconciliationRetryCount());
+        Mockito.lenient().when(configurationService.getProperty(Mockito.eq("reconciliation-retry-count"),
+                Mockito.any())).thenReturn(config.getReconciliationRetryCount());
 
-        Mockito.when(configurationService.getProperty(Mockito.eq("bundle-based-reconciliation-enabled"), Mockito.any()))
-                .thenReturn(config.isBundleBasedReconciliationEnabled());
+        Mockito.lenient().when(configurationService.getProperty(Mockito.eq("bundle-based-reconciliation-enabled"),
+                Mockito.any())).thenReturn(config.isBundleBasedReconciliationEnabled());
 
         return configurationService;
     }
+
+    protected Callable<Integer> listSize(List<?> list) {
+        return new Callable<Integer>() {
+            public Integer call() throws Exception {
+                return list.size(); // The condition supplier part
+            }
+        };
+    }
 }