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 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.sal.binding.api.NotificationProviderService;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.DataObjectModification;
+import org.opendaylight.mdsal.binding.api.DataTreeModification;
+import org.opendaylight.mdsal.binding.api.NotificationPublishService;
import org.opendaylight.openflowplugin.applications.notification.supplier.impl.helper.TestChangeEventBuildHelper;
import org.opendaylight.openflowplugin.applications.notification.supplier.impl.helper.TestData;
import org.opendaylight.openflowplugin.applications.notification.supplier.impl.helper.TestSupplierVerifyHelper;
private static final String FLOW_NODE_ID = "openflow:111";
private static final String FLOW_CODE_CONNECTOR_ID = "test-con-111";
private NodeConnectorStatNotificationSupplierImpl notifSupplierImpl;
- private NotificationProviderService notifProviderService;
+ private NotificationPublishService notifProviderService;
private DataBroker dataBroker;
@Before
public void initalization() {
- notifProviderService = mock(NotificationProviderService.class);
+ notifProviderService = mock(NotificationPublishService.class);
dataBroker = mock(DataBroker.class);
notifSupplierImpl = new NodeConnectorStatNotificationSupplierImpl(notifProviderService, dataBroker);
TestSupplierVerifyHelper.verifyDataTreeChangeListenerRegistration(dataBroker);
@Test
public void testCreate() {
- final NodeConnectorStatisticsUpdate notification = notifSupplierImpl.createNotification(createTestConnectorStat(),
- createTestConnectorStatPath());
+ final NodeConnectorStatisticsUpdate notification = notifSupplierImpl
+ .createNotification(createTestConnectorStat(), createTestConnectorStatPath());
assertNotNull(notification);
assertEquals(FLOW_NODE_ID, notification.getId().getValue());
- assertEquals(FLOW_CODE_CONNECTOR_ID, notification.getNodeConnector().get(0).getId().getValue());
+ assertEquals(FLOW_CODE_CONNECTOR_ID, notification.nonnullNodeConnector().values().iterator().next().getId()
+ .getValue());
}
@Test
- public void testCreateChangeEvent() {
- final TestData testData = new TestData(createTestConnectorStatPath(),null,createTestConnectorStat(),
- DataObjectModification.ModificationType.WRITE);
+ public void testCreateChangeEvent() throws InterruptedException {
+ final TestData<FlowCapableNodeConnectorStatistics> testData = new TestData<>(createTestConnectorStatPath(),
+ null, createTestConnectorStat(), DataObjectModification.ModificationType.WRITE);
Collection<DataTreeModification<FlowCapableNodeConnectorStatistics>> collection = new ArrayList<>();
collection.add(testData);
notifSupplierImpl.onDataTreeChanged(collection);
- verify(notifProviderService, times(1)).publish(Matchers.any(NodeConnectorStatisticsUpdate.class));
+ verify(notifProviderService, times(1)).putNotification(any(NodeConnectorStatisticsUpdate.class));
}
@Test(expected = IllegalArgumentException.class)