Convert DataChangeListeners to DataTreeChangeListeners

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

diff --git a/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/node/FlowCapableNodeListenerTest.java b/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/node/FlowCapableNodeListenerTest.java
index c5f70217784b701171f853f0919c4c968f84dbaf..74c91e96a96d25b9ed9347f38b94b8f4a0378b74 100644 (file)
--- a/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/node/FlowCapableNodeListenerTest.java
+++ b/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/node/FlowCapableNodeListenerTest.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.flow.inventory.rev130819.FlowCapableNode;
 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 FlowCapableNodeListenerTest {
@@ -40,7 +38,10 @@ public class FlowCapableNodeListenerTest {
 
     private DataBroker dataProvider;
     private SwitchManager switchManager;
-    private ListenerRegistration<DataChangeListener> listenerRegistration;
+    private ListenerRegistration<?> listenerRegistration;
+    private DataTreeModification<FlowCapableNode> mockDataTreeModification;
+    private DataObjectModification<FlowCapableNode> mockModification;
+    private Collection<DataTreeModification<FlowCapableNode>> changeEvent;
 
     @SuppressWarnings("unchecked")
     @Before
@@ -48,11 +49,15 @@ public class FlowCapableNodeListenerTest {
         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);
 
         listener = new FlowCapableNodeListener(dataProvider, switchManager);
+
+        mockDataTreeModification = mock(DataTreeModification.class);
+        mockModification = mock(DataObjectModification.class);
+        doReturn(mockModification).when(mockDataTreeModification).getRootNode();
+        changeEvent = Collections.singletonList(mockDataTreeModification);
     }
 
     @Test
@@ -64,7 +69,6 @@ public class FlowCapableNodeListenerTest {
     @SuppressWarnings("unchecked")
     @Test
     public void onDataChangeTestCreatedData() {
-        AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> change = mock(AsyncDataChangeEvent.class);
         FlowCapableNode entryValue = mock(FlowCapableNode.class);
         NodeId childNodeId = mock(NodeId.class);
 
@@ -73,18 +77,18 @@ public class FlowCapableNodeListenerTest {
             .augmentation(FlowCapableNode.class)
             .build();
 
-        Map<InstanceIdentifier<?>, DataObject> entrySet = new HashMap<InstanceIdentifier<?>, DataObject>();
-        entrySet.put(entryKey, entryValue);
-        when(change.getCreatedData()).thenReturn(entrySet);
+        doReturn(new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL, entryKey)).when(mockDataTreeModification)
+                .getRootPath();
+        doReturn(DataObjectModification.ModificationType.WRITE).when(mockModification).getModificationType();
+        doReturn(entryValue).when(mockModification).getDataAfter();
 
-        listener.onDataChanged(change);
+        listener.onDataTreeChanged(changeEvent);
         verify(switchManager).updateSwitch(childNodeId, entryValue);
     }
 
     @SuppressWarnings("unchecked")
     @Test
     public void onDataChangeTestUpdatedData() {
-        AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> change = mock(AsyncDataChangeEvent.class);
         FlowCapableNode entryValue = mock(FlowCapableNode.class);
         NodeId childNodeId = mock(NodeId.class);
 
@@ -93,18 +97,18 @@ public class FlowCapableNodeListenerTest {
             .augmentation(FlowCapableNode.class)
             .build();
 
-        Map<InstanceIdentifier<?>, DataObject> entrySet = new HashMap<InstanceIdentifier<?>, DataObject>();
-        entrySet.put(entryKey, entryValue);
-        when(change.getUpdatedData()).thenReturn(entrySet);
+        doReturn(new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL, entryKey)).when(mockDataTreeModification)
+                .getRootPath();
+        doReturn(DataObjectModification.ModificationType.SUBTREE_MODIFIED).when(mockModification).getModificationType();
+        doReturn(entryValue).when(mockModification).getDataAfter();
 
-        listener.onDataChanged(change);
+        listener.onDataTreeChanged(changeEvent);
         verify(switchManager).updateSwitch(childNodeId, entryValue);
     }
 
     @SuppressWarnings("unchecked")
     @Test
     public void onDataChangeTestRemovedPaths() {
-        AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> change = mock(AsyncDataChangeEvent.class);
         NodeId childNodeId = mock(NodeId.class);
 
         InstanceIdentifier<FlowCapableNode> entryKey = InstanceIdentifier.builder(Nodes.class)
@@ -112,11 +116,11 @@ public class FlowCapableNodeListenerTest {
             .augmentation(FlowCapableNode.class)
             .build();
 
-        Set<InstanceIdentifier<?>> removedPaths = new HashSet<InstanceIdentifier<?>>();
-        removedPaths.add(entryKey);
-        when(change.getRemovedPaths()).thenReturn(removedPaths);
+        doReturn(new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL, entryKey)).when(mockDataTreeModification)
+                .getRootPath();
+        doReturn(DataObjectModification.ModificationType.DELETE).when(mockModification).getModificationType();
 
-        listener.onDataChanged(change);
+        listener.onDataTreeChanged(changeEvent);
         verify(switchManager).updateSwitch(childNodeId, null);
     }