Update MRI projects for Aluminium

[ovsdb.git] / utils / mdsal-utils / src / test / java / org / opendaylight / ovsdb / utils / mdsal / utils / ControllerMdsalUtilsTest.java

diff --git a/utils/mdsal-utils/src/test/java/org/opendaylight/ovsdb/utils/mdsal/utils/ControllerMdsalUtilsTest.java b/utils/mdsal-utils/src/test/java/org/opendaylight/ovsdb/utils/mdsal/utils/ControllerMdsalUtilsTest.java
index 33cce60d0d93d51a8186d4184ee676cc0d590c18..d9d58a9f4378ac89835eb3a136592c3d3060e297 100644 (file)
--- a/utils/mdsal-utils/src/test/java/org/opendaylight/ovsdb/utils/mdsal/utils/ControllerMdsalUtilsTest.java
+++ b/utils/mdsal-utils/src/test/java/org/opendaylight/ovsdb/utils/mdsal/utils/ControllerMdsalUtilsTest.java
@@ -10,7 +10,6 @@ package org.opendaylight.ovsdb.utils.mdsal.utils;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -71,8 +70,8 @@ public class ControllerMdsalUtilsTest {
         boolean result = mdsalUtils.merge(LogicalDatastoreType.CONFIGURATION,
                 mock(InstanceIdentifier.class), mock(DataObject.class));
 
-        verify(writeTransaction, times(1)).merge(any(LogicalDatastoreType.class),
-                any(InstanceIdentifier.class), any(DataObject.class), anyBoolean());
+        verify(writeTransaction, times(1)).mergeParentStructureMerge(any(LogicalDatastoreType.class),
+                any(InstanceIdentifier.class), any(DataObject.class));
         verify(writeTransaction, times(1)).commit();
 
         assertTrue("Error, the merge transaction failed", result);
@@ -88,8 +87,8 @@ public class ControllerMdsalUtilsTest {
         boolean result = mdsalUtils.put(LogicalDatastoreType.CONFIGURATION,
                 mock(InstanceIdentifier.class), mock(DataObject.class));
 
-        verify(writeTransaction, times(1)).put(any(LogicalDatastoreType.class),
-                any(InstanceIdentifier.class), any(DataObject.class), anyBoolean());
+        verify(writeTransaction, times(1)).mergeParentStructurePut(any(LogicalDatastoreType.class),
+                any(InstanceIdentifier.class), any(DataObject.class));
         verify(writeTransaction, times(1)).commit();
 
         assertTrue("Error, the put transaction failed", result);