OPNFLWPLUG-1032: Neon-MRI: Bump odlparent, yangtools, mdsal

[openflowplugin.git] / applications / notification-supplier / src / test / java / org / opendaylight / openflowplugin / applications / notification / supplier / impl / helper / TestSupplierVerifyHelper.java

diff --git a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/helper/TestSupplierVerifyHelper.java b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/helper/TestSupplierVerifyHelper.java
index 8c41ab1305811f8db55bf9aefebec89297d6ff47..662d78d2920a14541a37079ed6f0a00fed5af6d7 100644 (file)
--- a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/helper/TestSupplierVerifyHelper.java
+++ b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/helper/TestSupplierVerifyHelper.java
@@ -8,33 +8,22 @@
 
 package org.opendaylight.openflowplugin.applications.notification.supplier.impl.helper;
 
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
 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;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
+import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
 
-/**
- * Created by mirehak on 9/2/15.
- */
-public class TestSupplierVerifyHelper {
+public final class TestSupplierVerifyHelper {
 
     private TestSupplierVerifyHelper() {
         throw new UnsupportedOperationException("Test utility class");
     }
 
-    /**
-     * check if wildcarded path is not null
-     *
-     * @param dataBroker
-     */
-    public static void verifyDataChangeRegistration(DataBroker dataBroker) {
-        Mockito.verify(dataBroker).registerDataChangeListener(
-                Matchers.eq(LogicalDatastoreType.OPERATIONAL),
-                Matchers.notNull(InstanceIdentifier.class),
-                Matchers.notNull(DataChangeListener.class),
-                Matchers.eq(AsyncDataBroker.DataChangeScope.BASE));
+    public static void verifyDataTreeChangeListenerRegistration(DataBroker dataBroker) {
+
+        Mockito.verify(dataBroker).registerDataTreeChangeListener(
+                ArgumentMatchers.<DataTreeIdentifier>any(),
+                ArgumentMatchers.<DataTreeChangeListener>any());
     }
 }