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%2FBindingDOMMountPointListenerAdapterTest.java;h=ebb605d87ed2beac89e0f95b5142913c11c703b9;hb=11408d627adca7eb71ac956c3ad01f75b6b91596;hp=cb67a808d4721f1bdb1bdbc5531e677d5f4b1bb6;hpb=6ea8b6d9ff00161af4a4792f4ca9746775ab5f84;p=mdsal.git diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointListenerAdapterTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointListenerAdapterTest.java index cb67a808d4..ebb605d87e 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointListenerAdapterTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointListenerAdapterTest.java @@ -12,13 +12,14 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; -import static org.mockito.MockitoAnnotations.initMocks; +import static org.mockito.Mockito.verifyNoInteractions; import com.google.common.util.concurrent.MoreExecutors; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.mdsal.binding.api.MountPointService.MountPointListener; import org.opendaylight.mdsal.binding.dom.adapter.test.util.BindingBrokerTestFactory; import org.opendaylight.mdsal.binding.dom.adapter.test.util.BindingTestContext; @@ -26,10 +27,11 @@ import org.opendaylight.mdsal.dom.api.DOMMountPointService; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +@RunWith(MockitoJUnitRunner.StrictStubs.class) public class BindingDOMMountPointListenerAdapterTest { private BindingDOMMountPointListenerAdapter bindingDOMMountPointListenerAdapter; - private BindingToNormalizedNodeCodec codec; + private AdapterContext codec; @Mock private MountPointListener listener; @Mock private DOMMountPointService mountPointService; @@ -37,7 +39,6 @@ public class BindingDOMMountPointListenerAdapterTest { @Before public void setUp() throws Exception { - initMocks(this); final BindingBrokerTestFactory testFactory = new BindingBrokerTestFactory(); testFactory.setExecutor(MoreExecutors.newDirectExecutorService()); final BindingTestContext testContext = testFactory.getTestContext(); @@ -58,14 +59,14 @@ public class BindingDOMMountPointListenerAdapterTest { @Test public void onMountPointCreatedWithExceptionTest() throws Exception { reset(listener); - bindingDOMMountPointListenerAdapter.onMountPointCreated(YangInstanceIdentifier.EMPTY); - verifyZeroInteractions(listener); + bindingDOMMountPointListenerAdapter.onMountPointCreated(YangInstanceIdentifier.empty()); + verifyNoInteractions(listener); } @Test public void onMountPointRemovedWithExceptionTest() throws Exception { reset(listener); - bindingDOMMountPointListenerAdapter.onMountPointRemoved(YangInstanceIdentifier.EMPTY); - verifyZeroInteractions(listener); + bindingDOMMountPointListenerAdapter.onMountPointRemoved(YangInstanceIdentifier.empty()); + verifyNoInteractions(listener); } } \ No newline at end of file