Introduce restconf.server.{api,spi,mdsal}

[netconf.git] / restconf / restconf-nb / src / test / java / org / opendaylight / restconf / nb / rfc8040 / streams / SSESessionHandlerTest.java

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/SSESessionHandlerTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/SSESessionHandlerTest.java
index 71c2357d3f7c5ec30177dd82606df70e76251a14..dbda937232720db76884a0e6d088e83077061b43 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/SSESessionHandlerTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/SSESessionHandlerTest.java
@@ -10,17 +10,14 @@ package org.opendaylight.restconf.nb.rfc8040.streams;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import javax.ws.rs.sse.Sse;
 import javax.ws.rs.sse.SseEventSink;
@@ -31,17 +28,18 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opendaylight.restconf.nb.rfc8040.ReceiveEventsParams;
-import org.opendaylight.restconf.nb.rfc8040.streams.RestconfStream.EncodingName;
+import org.opendaylight.restconf.server.spi.RestconfStream;
+import org.opendaylight.restconf.server.spi.RestconfStream.EncodingName;
 import org.opendaylight.yangtools.concepts.Registration;
 
 @ExtendWith(MockitoExtension.class)
 class SSESessionHandlerTest {
     @Mock
-    private ScheduledExecutorService executorService;
+    private PingExecutor pingExecutor;
     @Mock
     private RestconfStream<?> stream;
     @Mock
-    private ScheduledFuture<?> pingFuture;
+    private Registration pingRegistration;
     @Mock
     private SseEventSink eventSink;
     @Mock
@@ -49,8 +47,8 @@ class SSESessionHandlerTest {
     @Mock
     private Registration reg;
 
-    private SSESessionHandler setup(final int maxFragmentSize, final int heartbeatInterval) throws Exception {
-        final var sseSessionHandler = new SSESessionHandler(executorService, eventSink, sse, stream,
+    private SSESender setup(final int maxFragmentSize, final long heartbeatInterval) throws Exception {
+        final var sseSessionHandler = new SSESender(pingExecutor, eventSink, sse, stream,
             EncodingName.RFC8040_XML, new ReceiveEventsParams(null, null, null, null, null, null, null),
             maxFragmentSize, heartbeatInterval);
         doReturn(reg).when(stream).addSubscriber(eq(sseSessionHandler), any(), any());
@@ -63,19 +61,17 @@ class SSESessionHandlerTest {
     }
 
     private void setupPing(final long maxFragmentSize, final long heartbeatInterval) {
-        doReturn(pingFuture).when(executorService)
-            .scheduleWithFixedDelay(any(Runnable.class), eq(heartbeatInterval), eq(heartbeatInterval),
-                eq(TimeUnit.MILLISECONDS));
+        doReturn(pingRegistration).when(pingExecutor)
+            .startPingProcess(any(Runnable.class), eq(heartbeatInterval), eq(TimeUnit.MILLISECONDS));
     }
 
     @Test
     void onSSEConnectedWithEnabledPing() throws Exception {
-        final int heartbeatInterval = 1000;
+        final var heartbeatInterval = 1000L;
         final var sseSessionHandler = setup(1000, heartbeatInterval);
 
         sseSessionHandler.init();
-        verify(executorService).scheduleWithFixedDelay(any(Runnable.class), eq((long) heartbeatInterval),
-                eq((long) heartbeatInterval), eq(TimeUnit.MILLISECONDS));
+        verify(pingExecutor).startPingProcess(any(Runnable.class), eq(heartbeatInterval), eq(TimeUnit.MILLISECONDS));
     }
 
     @Test
@@ -84,7 +80,7 @@ class SSESessionHandlerTest {
         final var sseSessionHandler = setup(1000, heartbeatInterval);
 
         sseSessionHandler.init();
-        verifyNoMoreInteractions(executorService);
+        verifyNoMoreInteractions(pingExecutor);
     }
 
     @Test
@@ -102,12 +98,10 @@ class SSESessionHandlerTest {
         final var sseSessionHandler = setup(150, 8000);
         setupPing(150, 8000);
         sseSessionHandler.init();
-        doReturn(false).when(pingFuture).isCancelled();
-        doReturn(false).when(pingFuture).isDone();
 
+        doNothing().when(pingRegistration).close();
         sseSessionHandler.close();
         verify(reg).close();
-        verify(pingFuture).cancel(anyBoolean());
     }
 
     @Test
@@ -116,9 +110,9 @@ class SSESessionHandlerTest {
         setupPing(150, 8000);
         sseSessionHandler.init();
 
+        doNothing().when(pingRegistration).close();
         sseSessionHandler.close();
         verify(reg).close();
-        verify(pingFuture).cancel(anyBoolean());
     }
 
     @Test
@@ -128,7 +122,7 @@ class SSESessionHandlerTest {
 
         sseSessionHandler.close();
         verify(reg).close();
-        verify(pingFuture, never()).cancel(anyBoolean());
+        verifyNoMoreInteractions(pingRegistration);
     }
 
     @Test