Bump upstreams

[netconf.git] / plugins / netconf-server-mdsal / src / test / java / org / opendaylight / netconf / server / mdsal / operations / ValidateTest.java

diff --git a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/ValidateTest.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/ValidateTest.java
index 1d43adcdfc68bcdd12cf8c36569c43e3d0665de7..4ebfc6d61d1e3c0577e26a8be784775fc3019ff6 100644 (file)
--- a/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/ValidateTest.java
+++ b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/server/mdsal/operations/ValidateTest.java
@@ -18,11 +18,12 @@ import static org.opendaylight.netconf.server.mdsal.operations.AbstractNetconfOp
 import static org.opendaylight.netconf.server.mdsal.operations.AbstractNetconfOperationTest.executeOperation;
 import static org.opendaylight.netconf.server.mdsal.operations.AbstractNetconfOperationTest.verifyResponse;
 
-import com.google.common.collect.ImmutableClassToInstanceMap;
+import java.util.List;
 import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
@@ -45,7 +46,7 @@ public class ValidateTest {
     private DOMDataTransactionValidator failingValidator;
     @Mock
     private DOMDataTreeReadWriteTransaction readWriteTx;
-    @Mock
+    @Mock(answer = Answers.CALLS_REAL_METHODS)
     private DOMDataBroker dataBroker;
 
     @Before
@@ -114,12 +115,11 @@ public class ValidateTest {
     }
 
     private void whenValidatorIsNotDefined() {
-        doReturn(ImmutableClassToInstanceMap.of()).when(dataBroker).getExtensions();
+        doReturn(List.of()).when(dataBroker).supportedExtensions();
     }
 
     private void whenUsingValidator(final DOMDataTransactionValidator validator) {
-        doReturn(ImmutableClassToInstanceMap.of(DOMDataTransactionValidator.class, validator))
-            .when(dataBroker).getExtensions();
+        doReturn(List.of(validator)).when(dataBroker).supportedExtensions();
     }
 
     private TransactionProvider initCandidateTransaction() {