Merge "Bug 6110: Fixed bugs in statistics manager due to race condition." into stable...

[openflowplugin.git] / applications / statistics-manager / src / test / java / org / opendaylight / openflowplugin / applications / statistics / manager / impl / StatAbstractListenCommitTest.java

diff --git a/applications/statistics-manager/src/test/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractListenCommitTest.java b/applications/statistics-manager/src/test/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractListenCommitTest.java
index 195dbcee75cd9193bfae705cd833041f4d2a0aab..2eaac49f54a2cbc902ede9c9dd8b1a4816479e10 100644 (file)
--- a/applications/statistics-manager/src/test/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractListenCommitTest.java
+++ b/applications/statistics-manager/src/test/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractListenCommitTest.java
@@ -26,7 +26,7 @@ import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
+
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
@@ -36,6 +36,10 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.NotificationListener;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
+
 /**
  * Unit tests for StatAbstractListenCommit.
  *
@@ -74,6 +78,11 @@ public class StatAbstractListenCommitTest {
                 return InstanceIdentifier.create(DataObject.class);
             }
 
+            @Override
+            protected void processDataChange(Collection changes) {
+
+            }
+
             @Override
             protected NotificationListener getStatNotificationListener() {
                 return mockNotificationListener;
@@ -139,7 +148,7 @@ public class StatAbstractListenCommitTest {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void testReadLatestConfigurationWithInterveningOnDataChanged() {
+    public void testReadLatestConfigurationWithInterveningOnDataTreeChanged() {
 
         InstanceIdentifier<DataObject> path = InstanceIdentifier.create(DataObject.class);
 
@@ -153,7 +162,7 @@ public class StatAbstractListenCommitTest {
                     @Override
                     public CheckedFuture<Optional<DataObject>, ReadFailedException> answer(
                             InvocationOnMock unused) {
-                        statCommit.onDataChanged(mock(AsyncDataChangeEvent.class));
+                        statCommit.onDataTreeChanged(new ArrayList<>());
                         return Futures.immediateCheckedFuture(expected1);
                     }
                 };