X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=netconf%2Fmdsal-netconf-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fmdsal%2Fconnector%2Fops%2FValidateTest.java;h=a426c76b7856ed1eb8d09d1b1fd4dc3bed70f6ff;hb=1d91e1bbe29d0da6ea427a5d0837064c8a3d5134;hp=a035c821e7f0beb98c929f88a1b9e473403cefee;hpb=1e7a14cc2c59bfcae2ff0c2ef7034faa155c071f;p=netconf.git

diff --git a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/ValidateTest.java b/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/ValidateTest.java
index a035c821e7..a426c76b78 100644
--- a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/ValidateTest.java
+++ b/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/ValidateTest.java
@@ -5,12 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.netconf.mdsal.connector.ops;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
@@ -20,14 +19,14 @@ import static org.opendaylight.netconf.mdsal.connector.ops.AbstractNetconfOperat
 import static org.opendaylight.netconf.mdsal.connector.ops.AbstractNetconfOperationTest.executeOperation;
 import static org.opendaylight.netconf.mdsal.connector.ops.AbstractNetconfOperationTest.verifyResponse;
 
+import com.google.common.collect.ImmutableClassToInstanceMap;
 import com.google.common.util.concurrent.Futures;
-import java.util.Collections;
 import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction;
+import org.opendaylight.mdsal.dom.api.DOMDataBroker;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction;
 import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.mdsal.connector.DOMDataTransactionValidator;
 import org.opendaylight.netconf.mdsal.connector.DOMDataTransactionValidator.ValidationFailedException;
@@ -40,7 +39,7 @@ public class ValidateTest {
     @Mock
     private DOMDataTransactionValidator failingValidator;
     @Mock
-    private DOMDataReadWriteTransaction readWriteTx;
+    private DOMDataTreeReadWriteTransaction readWriteTx;
     @Mock
     private DOMDataBroker dataBroker;
 
@@ -123,12 +122,12 @@ public class ValidateTest {
     }
 
     private void whenValidatorIsNotDefined() {
-        doReturn(Collections.emptyMap()).when(dataBroker).getSupportedExtensions();
+        doReturn(ImmutableClassToInstanceMap.of()).when(dataBroker).getExtensions();
     }
 
     private void whenUsingValidator(final DOMDataTransactionValidator validator) {
-        doReturn(Collections.singletonMap(DOMDataTransactionValidator.class, validator))
-            .when(dataBroker).getSupportedExtensions();
+        doReturn(ImmutableClassToInstanceMap.of(DOMDataTransactionValidator.class, validator))
+            .when(dataBroker).getExtensions();
     }
 
     private TransactionProvider initCandidateTransaction() {
@@ -137,8 +136,7 @@ public class ValidateTest {
         return transactionProvider;
     }
 
-    private Document validate(final String resource,
-                              final TransactionProvider transactionProvider) throws Exception {
+    private Document validate(final String resource,  final TransactionProvider transactionProvider) throws Exception {
         final Validate validate = new Validate(SESSION_ID_FOR_REPORTING, transactionProvider);
         return executeOperation(validate, resource);
     }