Convert DataChangeListeners to DataTreeChangeListeners

[groupbasedpolicy.git] / renderers / ofoverlay / src / test / java / org / opendaylight / groupbasedpolicy / renderer / ofoverlay / node / OfOverlayNodeListenerTest.java

diff --git a/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/node/OfOverlayNodeListenerTest.java b/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/node/OfOverlayNodeListenerTest.java
index 20481a6e2a283ac32a0534e4ece66fba396981e9..ee2ee1512e6d038be0b809b71b6e9aa8d0c4b96d 100644 (file)
--- a/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/node/OfOverlayNodeListenerTest.java
+++ b/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/node/OfOverlayNodeListenerTest.java
@@ -9,21 +9,20 @@
 package org.opendaylight.groupbasedpolicy.renderer.ofoverlay.node;
 
 import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
+import java.util.Collection;
+import java.util.Collections;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
+import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
+import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
+import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
+import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.OfOverlayNodeConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
@@ -31,7 +30,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 public class OfOverlayNodeListenerTest {
@@ -40,12 +38,13 @@ public class OfOverlayNodeListenerTest {
 
     private DataBroker dataProvider;
     private SwitchManager switchManager;
-    private ListenerRegistration<DataChangeListener> listenerRegistration;
+    private ListenerRegistration<?> listenerRegistration;
 
-    private AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> change;
     private OfOverlayNodeConfig entryValue;
     private NodeId childNodeId;
     private InstanceIdentifier<OfOverlayNodeConfig> entryKey;
+    private DataObjectModification<OfOverlayNodeConfig> mockModification;
+    private Collection<DataTreeModification<OfOverlayNodeConfig>> changeEvent;
 
     @SuppressWarnings("unchecked")
     @Before
@@ -53,11 +52,9 @@ public class OfOverlayNodeListenerTest {
         dataProvider = mock(DataBroker.class);
         switchManager = mock(SwitchManager.class);
         listenerRegistration = mock(ListenerRegistration.class);
-        when(
-                dataProvider.registerDataChangeListener(any(LogicalDatastoreType.class), any(InstanceIdentifier.class),
-                        any(DataChangeListener.class), any(DataChangeScope.class))).thenReturn(listenerRegistration);
+        when(dataProvider.registerDataTreeChangeListener(any(DataTreeIdentifier.class),
+                any(DataTreeChangeListener.class))).thenReturn(listenerRegistration);
 
-        change = mock(AsyncDataChangeEvent.class);
         entryValue = mock(OfOverlayNodeConfig.class);
         childNodeId = mock(NodeId.class);
         entryKey = InstanceIdentifier.builder(Nodes.class)
@@ -66,6 +63,13 @@ public class OfOverlayNodeListenerTest {
             .build();
 
         listener = new OfOverlayNodeListener(dataProvider, switchManager);
+
+        DataTreeModification<OfOverlayNodeConfig> mockDataTreeModification = mock(DataTreeModification.class);
+        mockModification = mock(DataObjectModification.class);
+        doReturn(mockModification).when(mockDataTreeModification).getRootNode();
+        doReturn(new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION, entryKey))
+            .when(mockDataTreeModification).getRootPath();
+        changeEvent = Collections.singletonList(mockDataTreeModification);
     }
 
     @Test
@@ -76,31 +80,28 @@ public class OfOverlayNodeListenerTest {
 
     @Test
     public void onDataChangedTestCreatedData() {
-        Map<InstanceIdentifier<?>, DataObject> entrySet = new HashMap<InstanceIdentifier<?>, DataObject>();
-        entrySet.put(entryKey, entryValue);
-        when(change.getCreatedData()).thenReturn(entrySet);
+        doReturn(DataObjectModification.ModificationType.WRITE).when(mockModification).getModificationType();
+        doReturn(entryValue).when(mockModification).getDataAfter();
 
-        listener.onDataChanged(change);
+        listener.onDataTreeChanged(changeEvent);
         verify(switchManager).updateSwitchConfig(childNodeId, entryValue);
     }
 
     @Test
     public void onDataChangedTestUpdatedData() {
-        Map<InstanceIdentifier<?>, DataObject> entrySet = new HashMap<InstanceIdentifier<?>, DataObject>();
-        entrySet.put(entryKey, entryValue);
-        when(change.getUpdatedData()).thenReturn(entrySet);
+        doReturn(DataObjectModification.ModificationType.SUBTREE_MODIFIED).when(mockModification).getModificationType();
+        doReturn(entryValue).when(mockModification).getDataAfter();
 
-        listener.onDataChanged(change);
+        listener.onDataTreeChanged(changeEvent);
         verify(switchManager).updateSwitchConfig(childNodeId, entryValue);
     }
 
     @Test
     public void onDataChangedTestRemovedPaths() {
-        Set<InstanceIdentifier<?>> removedPaths = new HashSet<InstanceIdentifier<?>>();
-        removedPaths.add(entryKey);
-        when(change.getRemovedPaths()).thenReturn(removedPaths);
+        doReturn(DataObjectModification.ModificationType.DELETE).when(mockModification).getModificationType();
+        doReturn(entryValue).when(mockModification).getDataBefore();
 
-        listener.onDataChanged(change);
+        listener.onDataTreeChanged(changeEvent);
         verify(switchManager).updateSwitchConfig(childNodeId, null);
     }
 }