Merge branch 'blueprint' from controller

[mdsal.git] / binding / mdsal-binding-dom-adapter / src / test / java / org / opendaylight / mdsal / binding / dom / adapter / BindingDOMDataTreeCommitCohortRegistryAdapterTest.java

diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeCommitCohortRegistryAdapterTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeCommitCohortRegistryAdapterTest.java
index 454978c879a602f7018ad5d453006758440da390..9620758ee640daafc4530b173d70a149558e0ea6 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeCommitCohortRegistryAdapterTest.java
+++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeCommitCohortRegistryAdapterTest.java
@@ -9,7 +9,7 @@ package org.opendaylight.mdsal.binding.dom.adapter;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -38,19 +38,21 @@ public class BindingDOMDataTreeCommitCohortRegistryAdapterTest {
         bindingTestContext.start();
 
         final DOMDataTreeCommitCohortRegistry cohortRegistry = mock(DOMDataTreeCommitCohortRegistry.class);
-        final DOMDataTreeCommitCohortRegistration cohortRegistration = mock(DOMDataTreeCommitCohortRegistration.class);
+        final DOMDataTreeCommitCohortRegistration<?> cohortRegistration =
+                mock(DOMDataTreeCommitCohortRegistration.class);
         doReturn(cohortRegistration).when(cohortRegistry)
                 .registerCommitCohort(any(), any());
         doNothing().when(cohortRegistration).close();
         final BindingDOMDataTreeCommitCohortRegistryAdapter registryAdapter =
                 new BindingDOMDataTreeCommitCohortRegistryAdapter(bindingTestContext.getCodec(), cohortRegistry);
 
-        assertNotNull(registryAdapter.from(bindingTestContext.getCodec(), cohortRegistry));
+        assertNotNull(BindingDOMDataTreeCommitCohortRegistryAdapter.from(bindingTestContext.getCodec(),
+            cohortRegistry));
 
-        final DataTreeIdentifier dataTreeIdentifier = DataTreeIdentifier.create(LogicalDatastoreType.CONFIGURATION,
+        final DataTreeIdentifier<Top> dataTreeIdentifier = DataTreeIdentifier.create(LogicalDatastoreType.CONFIGURATION,
                 InstanceIdentifier.create(Top.class));
-        final DataTreeCommitCohort dataTreeCommitCohort = mock(DataTreeCommitCohort.class);
-        final ObjectRegistration objectRegistration =
+        final DataTreeCommitCohort<Top> dataTreeCommitCohort = mock(DataTreeCommitCohort.class);
+        final ObjectRegistration<?> objectRegistration =
                 registryAdapter.registerCommitCohort(dataTreeIdentifier, dataTreeCommitCohort);
         assertEquals(dataTreeCommitCohort, objectRegistration.getInstance());