X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=dom%2Fmdsal-dom-spi%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fdom%2Fspi%2FForwardingDOMDataBrokerTest.java;h=77a0eb2b154d82ce79051288084453d35ea57ca7;hb=82d49007372df18b968afa6d297c991b91bf1fc2;hp=ec721bc162aba43647cf374212c6c3e2d7fa1722;hpb=c452b0da50b4de6a41932855b97aa3b517b4879c;p=mdsal.git

diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBrokerTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBrokerTest.java
index ec721bc162..77a0eb2b15 100644
--- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBrokerTest.java
+++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBrokerTest.java
@@ -7,46 +7,55 @@
  */
 package org.opendaylight.mdsal.dom.spi;
 
-import static org.mockito.Matchers.any;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.verify;
-import static org.mockito.MockitoAnnotations.initMocks;
 
-import javax.annotation.Nonnull;
-import org.junit.Test;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
+import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
+
+@ExtendWith(MockitoExtension.class)
+class ForwardingDOMDataBrokerTest {
+    private interface Extension extends DOMDataBroker.Extension {
+        // Nothing else
+    }
 
-public class ForwardingDOMDataBrokerTest extends ForwardingDOMDataBroker {
-
-    @Mock(name = "domDataBroker")
+    @Mock
+    private DOMTransactionChain chain;
+    @Mock
+    private Extension extension;
+    @Mock
     private DOMDataBroker domDataBroker;
+    @Mock
+    private DOMDataTreeReadTransaction readTx;
+    @Mock
+    private DOMDataTreeWriteTransaction writeTx;
 
     @Test
-    public void basicTest() throws Exception {
-        initMocks(this);
+    void basicTest() throws Exception {
+        final var impl = new ForwardingDOMDataBroker() {
+            @Override
+            protected DOMDataBroker delegate() {
+                return domDataBroker;
+            }
+        };
 
-        Mockito.doReturn(null).when(domDataBroker).createTransactionChain(any());
-        this.createTransactionChain(null);
-        verify(domDataBroker).createTransactionChain(any());
+        doReturn(chain).when(domDataBroker).createTransactionChain();
+        assertSame(chain, impl.createTransactionChain());
 
-        doReturn(null).when(domDataBroker).getSupportedExtensions();
-        this.getSupportedExtensions();
-        verify(domDataBroker).getSupportedExtensions();
+        doReturn(List.of(extension)).when(domDataBroker).supportedExtensions();
+        assertSame(extension, impl.extension(Extension.class));
 
-        doReturn(null).when(domDataBroker).newReadOnlyTransaction();
-        this.newReadOnlyTransaction();
-        verify(domDataBroker).newReadOnlyTransaction();
-
-        doReturn(null).when(domDataBroker).newWriteOnlyTransaction();
-        this.newWriteOnlyTransaction();
-        verify(domDataBroker).newWriteOnlyTransaction();
-    }
+        doReturn(readTx).when(domDataBroker).newReadOnlyTransaction();
+        assertSame(readTx, impl.newReadOnlyTransaction());
 
-    @Nonnull
-    @Override
-    protected DOMDataBroker delegate() {
-        return domDataBroker;
+        doReturn(writeTx).when(domDataBroker).newWriteOnlyTransaction();
+        assertSame(writeTx, impl.newWriteOnlyTransaction());
     }
 }
\ No newline at end of file