Do not mock YangInstanceIdentifier

We just need a simple YangInstanceIdentifier. Do not mock it, but
rather use the correct value.

Change-Id: I8498973e71f394c736c4abab4b481f756ca0e2f8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeChangeServiceAdapterTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeChangeServiceAdapterTest.java
index ad1127335820b23b8b51a9421fc97ecc8de3ffba..d060aef6755a2e0df975caba8a53d61b97131489 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeChangeServiceAdapterTest.java
+++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeChangeServiceAdapterTest.java
@@ -45,6 +45,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 @RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class BindingDOMDataTreeChangeServiceAdapterTest {
     private static final InstanceIdentifier<Top> TOP_PATH = InstanceIdentifier.create(Top.class);
+    private static final YangInstanceIdentifier TOP_YIID = YangInstanceIdentifier.of(Top.QNAME);
 
     @Mock
     private DOMDataTreeChangeService mockDOMService;
@@ -52,16 +53,13 @@ public class BindingDOMDataTreeChangeServiceAdapterTest {
     @Mock
     private BindingDOMCodecServices services;
 
-    @Mock
-    private YangInstanceIdentifier mockYangID;
-
     @SuppressWarnings("rawtypes")
     @Mock
     private ListenerRegistration mockDOMReg;
 
     @Before
     public void setUp() {
-        doReturn(mockYangID).when(services).toYangInstanceIdentifier(TOP_PATH);
+        doReturn(TOP_YIID).when(services).toYangInstanceIdentifier(TOP_PATH);
     }
 
     @Test
@@ -71,22 +69,22 @@ public class BindingDOMDataTreeChangeServiceAdapterTest {
         final DataTreeChangeService service = new BindingDOMDataTreeChangeServiceAdapter(codec, mockDOMService);
 
         doReturn(mockDOMReg).when(mockDOMService).registerDataTreeChangeListener(
-                domDataTreeIdentifier(mockYangID),
+                domDataTreeIdentifier(TOP_YIID),
                 any(DOMDataTreeChangeListener.class));
         final DataTreeIdentifier<Top> treeId = DataTreeIdentifier.create(LogicalDatastoreType.CONFIGURATION, TOP_PATH);
         final TestClusteredDataTreeChangeListener mockClusteredListener = new TestClusteredDataTreeChangeListener();
         service.registerDataTreeChangeListener(treeId , mockClusteredListener);
 
-        verify(mockDOMService).registerDataTreeChangeListener(domDataTreeIdentifier(this.mockYangID),
+        verify(mockDOMService).registerDataTreeChangeListener(domDataTreeIdentifier(TOP_YIID),
                 isA(ClusteredDOMDataTreeChangeListener.class));
 
         reset(mockDOMService);
         doReturn(mockDOMReg).when(mockDOMService).registerDataTreeChangeListener(
-                domDataTreeIdentifier(mockYangID), any(DOMDataTreeChangeListener.class));
+                domDataTreeIdentifier(TOP_YIID), any(DOMDataTreeChangeListener.class));
         final TestDataTreeChangeListener mockNonClusteredListener = new TestDataTreeChangeListener();
         service.registerDataTreeChangeListener(treeId , mockNonClusteredListener);
 
-        verify(this.mockDOMService).registerDataTreeChangeListener(domDataTreeIdentifier(this.mockYangID),
+        verify(mockDOMService).registerDataTreeChangeListener(domDataTreeIdentifier(TOP_YIID),
                 not(isA(ClusteredDOMDataTreeChangeListener.class)));
     }