X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-dom-adapter%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fdom%2Fadapter%2FForwardedNotificationAdapterTest.java;h=ff0f48a9ff18ea310a96d96c5f4719f245041e85;hb=e1ac69a900fc0ee60e030bb7de2f5642a86997d5;hp=d998bcbea3178c8d1ec138d97860755f21c7fabd;hpb=7ecf19a3c98c17b9f2d82b32fa9932f594e5a7ac;p=mdsal.git

diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ForwardedNotificationAdapterTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ForwardedNotificationAdapterTest.java
index d998bcbea3..ff0f48a9ff 100644
--- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ForwardedNotificationAdapterTest.java
+++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ForwardedNotificationAdapterTest.java
@@ -15,161 +15,95 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import org.eclipse.jdt.annotation.NonNull;
 import org.junit.Test;
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.mdsal.binding.api.NotificationService.Listener;
 import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractNotificationBrokerTest;
-import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.OpendaylightMdsalBindingTestListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.TwoLevelListChanged;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.TwoLevelListChangedBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.two.level.list.TopLevelListBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.two.level.list.TopLevelListKey;
+import org.opendaylight.yang.svc.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.YangModuleInfoImpl;
 import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
 import org.opendaylight.yangtools.yang.binding.util.BindingMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class ForwardedNotificationAdapterTest extends AbstractNotificationBrokerTest {
-    private static final Logger LOG = LoggerFactory.getLogger(ForwardedNotificationAdapterTest.class);
-
     @Override
     protected Set<YangModuleInfo> getModuleInfos() throws Exception {
-        return Set.of(BindingReflections.getModuleInfo(TwoLevelListChanged.class));
-    }
-
-    @Test
-    public void testPutSubscription() throws InterruptedException {
-        final var listener = new TestNotifListener(1);
-        try (var reg = getNotificationService().registerNotificationListener(listener)) {
-            assertPutSubscription(listener);
-        }
+        return Set.of(YangModuleInfoImpl.getInstance());
     }
 
     @Test
-    public void testPutSubscriptionSimple() throws InterruptedException {
-        final var listener = new SimpleNotifListener(1);
+    public void testPutSubscription() throws Exception {
+        final var listener = new NotifListener(1);
         try (var reg = getNotificationService().registerListener(TwoLevelListChanged.class, listener)) {
-            assertPutSubscription(listener);
-        }
-    }
+            final var testData = createTestData();
+            getNotificationPublishService().putNotification(testData);
 
-    private void assertPutSubscription(final AbstractNotifListener listener) throws InterruptedException {
-        final var testData = createTestData();
-        getNotificationPublishService().putNotification(testData);
-
-        final var received = listener.awaitNotifications();
-        assertEquals(1, received.size());
-        assertSame(testData, received.get(0));
-    }
-
-    @Test
-    public void testOfferSubscription() throws InterruptedException {
-        final var listener = new TestNotifListener(1);
-        try (var reg = getNotificationService().registerNotificationListener(listener)) {
-            assertOfferNotification(listener);
+            final var received = listener.awaitNotifications();
+            assertEquals(1, received.size());
+            assertSame(testData, received.get(0));
         }
     }
 
     @Test
-    public void testOfferSubscriptionSimple() throws InterruptedException {
-        final var listener = new SimpleNotifListener(1);
+    public void testOfferSubscription() throws Exception {
+        final var listener = new NotifListener(1);
         try (var reg = getNotificationService().registerListener(TwoLevelListChanged.class, listener)) {
-            assertOfferNotification(listener);
-        }
-    }
+            final var testData = createTestData();
 
-    private void assertOfferNotification(final AbstractNotifListener listener) throws InterruptedException {
-        final var testData = createTestData();
-
-        try {
             getNotificationPublishService().offerNotification(testData).get(1, TimeUnit.SECONDS);
-        } catch (ExecutionException | TimeoutException e) {
-            throw new AssertionError("Notification should be delivered", e);
-        }
-
-        final var received = listener.awaitNotifications();
-        assertEquals(1, received.size());
-        assertSame(testData, received.get(0));
-    }
 
-    @Test
-    public void testOfferTimedNotification() throws InterruptedException {
-        final var listener = new TestNotifListener(1);
-        try (var reg = getNotificationService().registerNotificationListener(listener)) {
-            assertOfferTimedNotification(listener);
+            final var received = listener.awaitNotifications();
+            assertEquals(1, received.size());
+            assertSame(testData, received.get(0));
         }
     }
 
     @Test
-    public void testOfferTimedNotificationSimple() throws InterruptedException {
-        final var listener = new SimpleNotifListener(1);
+    public void testOfferTimedNotification() throws Exception {
+        final var listener = new NotifListener(1);
         try (var reg = getNotificationService().registerListener(TwoLevelListChanged.class, listener)) {
-            assertOfferTimedNotification(listener);
-        }
-    }
-
-    private void assertOfferTimedNotification(final AbstractNotifListener listener) throws InterruptedException {
-        final var testData = createTestData();
+            final var testData = createTestData();
 
-        assertNotSame(NotificationPublishService.REJECTED,
-            getNotificationPublishService().offerNotification(testData, 5, TimeUnit.SECONDS));
+            assertNotSame(NotificationPublishService.REJECTED,
+                getNotificationPublishService().offerNotification(testData, 5, TimeUnit.SECONDS));
 
-        final var received = listener.awaitNotifications();
-        assertEquals(1, received.size());
-        assertSame(testData, received.get(0));
+            final var received = listener.awaitNotifications();
+            assertEquals(1, received.size());
+            assertSame(testData, received.get(0));
+        }
     }
 
-
     private static @NonNull TwoLevelListChanged createTestData() {
         return new TwoLevelListChangedBuilder()
             .setTopLevelList(BindingMap.of(new TopLevelListBuilder().withKey(new TopLevelListKey("test")).build()))
             .build();
     }
 
-    private abstract static class AbstractNotifListener {
+    private static  final class NotifListener implements Listener<TwoLevelListChanged> {
         private final List<TwoLevelListChanged> receivedNotifications = new ArrayList<>();
         private final CountDownLatch latch;
 
-        AbstractNotifListener(final int expectedCount) {
+        NotifListener(final int expectedCount) {
             latch = new CountDownLatch(expectedCount);
         }
 
-        final void receiveNotification(final TwoLevelListChanged notification) {
+        void receiveNotification(final TwoLevelListChanged notification) {
             receivedNotifications.add(notification);
             latch.countDown();
         }
 
-        final List<TwoLevelListChanged> awaitNotifications() throws InterruptedException {
+        List<TwoLevelListChanged> awaitNotifications() throws InterruptedException {
             latch.await();
             return receivedNotifications;
         }
-    }
-
-    private static class SimpleNotifListener extends AbstractNotifListener implements Listener<TwoLevelListChanged> {
-        SimpleNotifListener(final int expectedCount) {
-            super(expectedCount);
-        }
 
         @Override
         public void onNotification(final TwoLevelListChanged notification) {
             receiveNotification(notification);
         }
     }
-
-    private static class TestNotifListener extends AbstractNotifListener
-            implements OpendaylightMdsalBindingTestListener {
-        TestNotifListener(final int expectedCount) {
-            super(expectedCount);
-        }
-
-        @Override
-        public void onTwoLevelListChanged(final TwoLevelListChanged notification) {
-            receiveNotification(notification);
-        }
-    }
 }