import static org.mockito.Mockito.mock;
import static org.opendaylight.mdsal.dom.broker.TestUtils.TEST_CHILD;
-import com.google.common.collect.Multimap;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
import org.opendaylight.mdsal.dom.api.DOMNotification;
import org.opendaylight.mdsal.dom.api.DOMNotificationListener;
+import org.opendaylight.mdsal.dom.api.DOMNotificationPublishDemandExtension;
+import org.opendaylight.mdsal.dom.api.DOMNotificationPublishDemandExtension.DemandListener;
import org.opendaylight.mdsal.dom.api.DOMNotificationPublishService;
-import org.opendaylight.mdsal.dom.spi.DOMNotificationSubscriptionListener;
-import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;
-import org.opendaylight.yangtools.util.ListenerRegistry;
+import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
public class DOMNotificationRouterTest {
+ @Test
+ public void registerNotificationListener() {
+ try (var domNotificationRouter = new DOMNotificationRouter(1024)) {
+ final var domNotificationListener = mock(DOMNotificationListener.class);
+
+ domNotificationRouter.notificationService().registerNotificationListener(domNotificationListener,
+ List.of(Absolute.of(QName.create("urn:opendaylight:test-listener", "notif1"))));
+ assertEquals(1, domNotificationRouter.listeners().size());
+
+ domNotificationRouter.notificationService().registerNotificationListener(domNotificationListener,
+ List.of(Absolute.of(QName.create("urn:opendaylight:test-listener", "notif2")),
+ Absolute.of(QName.create("urn:opendaylight:test-listener", "notif3"))));
+ assertEquals(3, domNotificationRouter.listeners().size());
+ }
+ }
@Test
- public void create() throws Exception {
- assertNotNull(DOMNotificationRouter.create(1024));
+ public void registerNotificationListeners() {
+ try (var domNotificationRouter = new DOMNotificationRouter(1024)) {
+ final var domNotificationListener1 = mock(DOMNotificationListener.class);
+ final var domNotificationListener2 = mock(DOMNotificationListener.class);
+
+ domNotificationRouter.notificationService().registerNotificationListeners(
+ Map.of(Absolute.of(QName.create("urn:opendaylight:test-listener", "notif1")), domNotificationListener1,
+ Absolute.of(QName.create("urn:opendaylight:test-listener", "notif2")), domNotificationListener2));
+ assertEquals(2, domNotificationRouter.listeners().size());
+ }
}
@SuppressWarnings("checkstyle:IllegalCatch")
@Test
public void complexTest() throws Exception {
- final DOMNotificationSubscriptionListener domNotificationSubscriptionListener =
- mock(DOMNotificationSubscriptionListener.class);
- doNothing().when(domNotificationSubscriptionListener).onSubscriptionChanged(any());
+ final var demandListener = mock(DemandListener.class);
+ doNothing().when(demandListener).onDemandUpdated(any());
- final CountDownLatch latch = new CountDownLatch(1);
- final DOMNotificationListener domNotificationListener = new TestListener(latch);
- final DOMNotificationRouter domNotificationRouter = DOMNotificationRouter.create(1024);
+ final var latch = new CountDownLatch(1);
+ final var domNotificationListener = new TestListener(latch);
+ final var domNotificationRouter = new DOMNotificationRouter(1024);
+ final var notifService = domNotificationRouter.notificationService();
+ final var notifPubService = domNotificationRouter.notificationPublishService();
+ final var demandExt = notifPubService.extension(DOMNotificationPublishDemandExtension.class);
+ assertNotNull(demandExt);
- Multimap<Absolute, ?> listeners = domNotificationRouter.listeners();
+ var listeners = domNotificationRouter.listeners();
assertTrue(listeners.isEmpty());
- assertNotNull(domNotificationRouter.registerNotificationListener(domNotificationListener,
- Absolute.of(TestModel.TEST_QNAME)));
- assertNotNull(domNotificationRouter.registerNotificationListener(domNotificationListener,
- Absolute.of(TestModel.TEST2_QNAME)));
+ assertNotNull(notifService.registerNotificationListener(domNotificationListener,
+ List.of(Absolute.of(TestModel.TEST_QNAME))));
+ assertNotNull(notifService.registerNotificationListener(domNotificationListener,
+ List.of(Absolute.of(TestModel.TEST2_QNAME))));
listeners = domNotificationRouter.listeners();
assertFalse(listeners.isEmpty());
- ListenerRegistry<DOMNotificationSubscriptionListener> subscriptionListeners =
- domNotificationRouter.subscriptionListeners();
+ assertEquals(0, domNotificationRouter.demandListeners().streamObjects().count());
- assertEquals(0, subscriptionListeners.streamListeners().count());
- assertNotNull(domNotificationRouter.registerSubscriptionListener(domNotificationSubscriptionListener));
+ assertNotNull(demandExt.registerDemandListener(demandListener));
- subscriptionListeners = domNotificationRouter.subscriptionListeners();
- assertSame(domNotificationSubscriptionListener,
- subscriptionListeners.streamListeners().findAny().orElseThrow());
+ assertSame(demandListener, domNotificationRouter.demandListeners().streamObjects().findAny().orElseThrow());
- final DOMNotification domNotification = mock(DOMNotification.class);
+ final var domNotification = mock(DOMNotification.class);
doReturn("test").when(domNotification).toString();
doReturn(Absolute.of(TestModel.TEST_QNAME)).when(domNotification).getType();
doReturn(TEST_CHILD).when(domNotification).getBody();
- assertNotNull(domNotificationRouter.offerNotification(domNotification));
+ assertNotNull(notifPubService.offerNotification(domNotification));
- try {
- assertNotNull(domNotificationRouter.offerNotification(domNotification, 1, TimeUnit.SECONDS));
- assertNotNull(domNotificationRouter.offerNotification(domNotification, 1, TimeUnit.SECONDS));
- } catch (Exception e) {
- // FIXME: what is the point here?!
- assertTrue(e instanceof UnsupportedOperationException);
- }
-
- assertNotNull(domNotificationRouter.putNotification(domNotification));
+ assertNotNull(notifPubService.offerNotification(domNotification, 1, TimeUnit.SECONDS));
+ assertNotNull(notifPubService.offerNotification(domNotification, 1, TimeUnit.SECONDS));
+ assertNotNull(notifPubService.putNotification(domNotification));
}
@Test
public void offerNotification() throws Exception {
- final DOMNotificationRouter domNotificationRouter = DOMNotificationRouter.create(1024);
- final DOMNotification domNotification = mock(DOMNotification.class);
- doReturn(Absolute.of(TestModel.TEST_QNAME)).when(domNotification).getType();
- doReturn(TEST_CHILD).when(domNotification).getBody();
- assertNotNull(domNotificationRouter.putNotification(domNotification));
- assertNotNull(domNotificationRouter.offerNotification(domNotification));
- assertNotNull(domNotificationRouter.offerNotification(domNotification, 1, TimeUnit.SECONDS));
+ try (var domNotificationRouter = new DOMNotificationRouter(1024)) {
+ final var domNotification = mock(DOMNotification.class);
+ doReturn(Absolute.of(TestModel.TEST_QNAME)).when(domNotification).getType();
+ doReturn(TEST_CHILD).when(domNotification).getBody();
+
+ final var notifPubService = domNotificationRouter.notificationPublishService();
+ assertNotNull(notifPubService.putNotification(domNotification));
+ assertNotNull(notifPubService.offerNotification(domNotification));
+ assertNotNull(notifPubService.offerNotification(domNotification, 1, TimeUnit.SECONDS));
+ }
}
@Test
public void testOfferNotificationWithBlocking() throws Exception {
- final CountDownLatch latch = new CountDownLatch(1);
- final TestListener testListener = new TestListener(latch);
- final DOMNotification domNotification = mock(DOMNotification.class);
+ final var latch = new CountDownLatch(1);
+ final var testListener = new TestListener(latch);
+ final var domNotification = mock(DOMNotification.class);
doReturn("test").when(domNotification).toString();
doReturn(Absolute.of(TestModel.TEST_QNAME)).when(domNotification).getType();
doReturn(TEST_CHILD).when(domNotification).getBody();
- try (TestRouter testRouter = new TestRouter(1)) {
- assertNotNull(testRouter.registerNotificationListener(testListener, Absolute.of(TestModel.TEST_QNAME)));
- assertNotNull(testRouter.registerNotificationListener(testListener, Absolute.of(TestModel.TEST2_QNAME)));
+ try (var testRouter = new TestRouter(1)) {
+ final var notifService = testRouter.notificationService();
+ final var notifPubService = testRouter.notificationPublishService();
+
+ assertNotNull(notifService.registerNotificationListener(testListener,
+ List.of(Absolute.of(TestModel.TEST_QNAME))));
+ assertNotNull(notifService.registerNotificationListener(testListener,
+ List.of(Absolute.of(TestModel.TEST2_QNAME))));
assertNotEquals(DOMNotificationPublishService.REJECTED,
- testRouter.offerNotification(domNotification, 3, TimeUnit.SECONDS));
+ notifPubService.offerNotification(domNotification, 3, TimeUnit.SECONDS));
assertTrue("Listener was not notified", latch.await(5, TimeUnit.SECONDS));
assertEquals("Received notifications", 1, testListener.getReceivedNotifications().size());
assertEquals(DOMNotificationPublishService.REJECTED,
- testRouter.offerNotification(domNotification, 1, TimeUnit.SECONDS));
+ notifPubService.offerNotification(domNotification, 1, TimeUnit.SECONDS));
assertEquals("Received notifications", 1, testListener.getReceivedNotifications().size());
}
}
@Test
public void close() throws Exception {
- final DOMNotificationRouter domNotificationRouter = DOMNotificationRouter.create(1024);
- final ExecutorService executor = domNotificationRouter.executor();
- final ExecutorService observer = domNotificationRouter.observer();
-
- assertFalse(executor.isShutdown());
- assertFalse(observer.isShutdown());
- domNotificationRouter.close();
+ final ExecutorService executor;
+ final ExecutorService observer;
+
+ try (var domNotificationRouter = new DOMNotificationRouter(1024)) {
+ executor = domNotificationRouter.executor();
+ observer = domNotificationRouter.observer();
+ assertFalse(executor.isShutdown());
+ assertFalse(observer.isShutdown());
+ }
assertTrue(executor.isShutdown());
assertTrue(observer.isShutdown());
}
private static class TestListener implements DOMNotificationListener {
- private final CountDownLatch latch;
private final List<DOMNotification> receivedNotifications = new ArrayList<>();
+ private final CountDownLatch latch;
TestListener(final CountDownLatch latch) {
this.latch = latch;
latch.countDown();
}
- public List<DOMNotification> getReceivedNotifications() {
+ List<DOMNotification> getReceivedNotifications() {
return receivedNotifications;
}
}
@Override
ListenableFuture<? extends Object> publish(final DOMNotification notification,
- final Collection<AbstractListenerRegistration<? extends DOMNotificationListener>> subscribers) {
+ final Collection<Reg> subscribers) {
if (triggerRejected) {
- return REJECTED;
+ return DOMNotificationPublishService.REJECTED;
}
triggerRejected = true;
}
@Override
- public ListenableFuture<? extends Object> putNotification(final DOMNotification notification)
+ public ListenableFuture<? extends Object> putNotificationImpl(final DOMNotification notification)
throws InterruptedException {
Thread.sleep(2000);
- return super.putNotification(notification);
+ return super.putNotificationImpl(notification);
}
}
}
Code Review / mdsal.git / blobdiff