X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-dom-adapter%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fdom%2Fadapter%2FBindingDOMDataTreeCommitCohortRegistryAdapterTest.java;h=02824349d08bc6b83ce8f3a4c3ace68e8ef378da;hb=5f8a373c07549a901b70595067dd11c161d0c4e4;hp=dc7c9adb590bace88c8b2a633b4800bfbb266fb7;hpb=c4d02d92b7125cb5b0aa2e67e3a8b5a7c6f92b21;p=mdsal.git

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 dc7c9adb59..02824349d0 100644
--- 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
@@ -7,55 +7,49 @@
  */
 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;
-import static org.mockito.Mockito.verify;
 
 import com.google.common.util.concurrent.MoreExecutors;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.opendaylight.mdsal.binding.api.DataTreeCommitCohort;
 import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
 import org.opendaylight.mdsal.binding.dom.adapter.test.util.BindingBrokerTestFactory;
-import org.opendaylight.mdsal.binding.dom.adapter.test.util.BindingTestContext;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistration;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.Top;
-import org.opendaylight.yangtools.concepts.ObjectRegistration;
+import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
+@ExtendWith(MockitoExtension.class)
 public class BindingDOMDataTreeCommitCohortRegistryAdapterTest {
+    @Mock
+    private DOMDataTreeCommitCohortRegistry cohortRegistry;
+    @Mock
+    private Registration cohortRegistration;
+    @Mock
+    private DataTreeCommitCohort<Top> dataTreeCommitCohort;
 
     @Test
-    public void basicTest() throws Exception {
-        final BindingBrokerTestFactory bindingBrokerTestFactory = new BindingBrokerTestFactory();
+    void basicTest() {
+        final var bindingBrokerTestFactory = new BindingBrokerTestFactory();
         bindingBrokerTestFactory.setExecutor(MoreExecutors.newDirectExecutorService());
-        final BindingTestContext bindingTestContext = bindingBrokerTestFactory.getTestContext();
+        final var bindingTestContext = bindingBrokerTestFactory.getTestContext();
         bindingTestContext.start();
 
-        final DOMDataTreeCommitCohortRegistry cohortRegistry = mock(DOMDataTreeCommitCohortRegistry.class);
-        final DOMDataTreeCommitCohortRegistration<?> cohortRegistration =
-                mock(DOMDataTreeCommitCohortRegistration.class);
-        doReturn(cohortRegistration).when(cohortRegistry)
-                .registerCommitCohort(any(), any());
+        doReturn(cohortRegistration).when(cohortRegistry).registerCommitCohort(any(), any());
         doNothing().when(cohortRegistration).close();
-        final BindingDOMDataTreeCommitCohortRegistryAdapter registryAdapter =
-                new BindingDOMDataTreeCommitCohortRegistryAdapter(bindingTestContext.getCodec(), cohortRegistry);
+        final var registryAdapter = new BindingDOMDataTreeCommitCohortRegistryAdapter(bindingTestContext.getCodec(),
+            cohortRegistry);
 
-        assertNotNull(registryAdapter.from(bindingTestContext.getCodec(), cohortRegistry));
-
-        final DataTreeIdentifier dataTreeIdentifier = DataTreeIdentifier.create(LogicalDatastoreType.CONFIGURATION,
+        final var dataTreeIdentifier = DataTreeIdentifier.of(LogicalDatastoreType.CONFIGURATION,
                 InstanceIdentifier.create(Top.class));
-        final DataTreeCommitCohort<?> dataTreeCommitCohort = mock(DataTreeCommitCohort.class);
-        final ObjectRegistration<?> objectRegistration =
-                registryAdapter.registerCommitCohort(dataTreeIdentifier, dataTreeCommitCohort);
-        assertEquals(dataTreeCommitCohort, objectRegistration.getInstance());
-
-        objectRegistration.close();
-        verify(cohortRegistration).close();
+        try (var reg = registryAdapter.registerCommitCohort(dataTreeIdentifier, dataTreeCommitCohort)) {
+            // Nothing else
+        }
     }
 }
\ No newline at end of file