Code Review
/
openflowplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
OPNFLWPLUG-1032: Neon-MRI: Bump odlparent, yangtools, mdsal
[openflowplugin.git]
/
applications
/
notification-supplier
/
src
/
test
/
java
/
org
/
opendaylight
/
openflowplugin
/
applications
/
notification
/
supplier
/
impl
/
NodeNotificationSupplierImplTest.java
diff --git
a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/NodeNotificationSupplierImplTest.java
b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/NodeNotificationSupplierImplTest.java
index 3a93b9cc22054c83722661ce27328279a0a28a99..1b3e2665f1746b7a85566e42086b80cfad07e90f 100644
(file)
--- a/
applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/NodeNotificationSupplierImplTest.java
+++ b/
applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/NodeNotificationSupplierImplTest.java
@@
-10,6
+10,7
@@
package org.opendaylight.openflowplugin.applications.notification.supplier.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@
-18,7
+19,6
@@
import java.util.ArrayList;
import java.util.Collection;
import org.junit.Before;
import org.junit.Test;
import java.util.Collection;
import org.junit.Before;
import org.junit.Test;
-import org.mockito.Matchers;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
@@
-73,7
+73,7
@@
public class NodeNotificationSupplierImplTest {
assertNotNull(notification);
assertEquals(FLOW_NODE_ID, notification.getId().getValue());
assertEquals(FLOW_NODE_ID,
assertNotNull(notification);
assertEquals(FLOW_NODE_ID, notification.getId().getValue());
assertEquals(FLOW_NODE_ID,
- notification.getNodeRef().getValue().firstKeyOf(Node.class
, NodeKey.class
).getId().getValue());
+ notification.getNodeRef().getValue().firstKeyOf(Node.class).getId().getValue());
}
@Test
}
@Test
@@
-83,7
+83,7
@@
public class NodeNotificationSupplierImplTest {
Collection<DataTreeModification<FlowCapableNode>> collection = new ArrayList<>();
collection.add(testData);
notifSupplierImpl.onDataTreeChanged(collection);
Collection<DataTreeModification<FlowCapableNode>> collection = new ArrayList<>();
collection.add(testData);
notifSupplierImpl.onDataTreeChanged(collection);
- verify(notifProviderService, times(1)).publish(
Matchers.
any(NodeUpdated.class));
+ verify(notifProviderService, times(1)).publish(any(NodeUpdated.class));
}
@Test(expected = IllegalArgumentException.class)
}
@Test(expected = IllegalArgumentException.class)
@@
-101,7
+101,7
@@
public class NodeNotificationSupplierImplTest {
final NodeRemoved notification = notifSupplierImpl.deleteNotification(createTestFlowCapableNodePath());
assertNotNull(notification);
assertEquals(FLOW_NODE_ID,
final NodeRemoved notification = notifSupplierImpl.deleteNotification(createTestFlowCapableNodePath());
assertNotNull(notification);
assertEquals(FLOW_NODE_ID,
- notification.getNodeRef().getValue().firstKeyOf(Node.class
, NodeKey.class
).getId().getValue());
+ notification.getNodeRef().getValue().firstKeyOf(Node.class).getId().getValue());
}
@Test
}
@Test
@@
-111,7
+111,7
@@
public class NodeNotificationSupplierImplTest {
Collection<DataTreeModification<FlowCapableNode>> collection = new ArrayList<>();
collection.add(testData);
notifSupplierImpl.onDataTreeChanged(collection);
Collection<DataTreeModification<FlowCapableNode>> collection = new ArrayList<>();
collection.add(testData);
notifSupplierImpl.onDataTreeChanged(collection);
- verify(notifProviderService, times(1)).publish(
Matchers.
any(NodeRemoved.class));
+ verify(notifProviderService, times(1)).publish(any(NodeRemoved.class));
}
@Test(expected = IllegalArgumentException.class)
}
@Test(expected = IllegalArgumentException.class)