Merge branch 'main' into fix/symphony-bdk-test-jupiter-no-freemarker-deps

Author: thibauult

symphony-bdk-test/symphony-bdk-test-jupiter/src/main/java/com/symphony/bdk/test/SymphonyBdkTestMock.java

@@ -1,6 +1,7 @@
 package com.symphony.bdk.test;
 
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 
 import com.symphony.bdk.core.SymphonyBdk;
 import com.symphony.bdk.core.auth.AuthSession;
@@ -41,12 +42,16 @@ public class SymphonyBdkTestMock {
   private final SessionService sessionService = mock(SessionService.class);
   private final HealthService healthService = mock(HealthService.class);
   private final ExtensionService extensionService = mock(ExtensionService.class);
-  private final MockDatafeedLoop datafeedLoop = new MockDatafeedLoop();
+  private final MockDatafeedLoop datafeedLoop = spy(new MockDatafeedLoop());
 
 
   @Data
   private static class MockDatafeedLoop implements DatafeedLoop {
 
+    public MockDatafeedLoop() {
+      SymphonyBdkTestUtils.clearListeners();
+    }
+
     @Override
     public void start() {
     }

symphony-bdk-test/symphony-bdk-test-jupiter/src/main/java/com/symphony/bdk/test/SymphonyBdkTestUtils.java

@@ -7,6 +7,7 @@
 import com.symphony.bdk.gen.api.model.UserV2;
 import com.symphony.bdk.gen.api.model.V4Event;
 import com.symphony.bdk.gen.api.model.V4Initiator;
+import com.symphony.bdk.gen.api.model.V4InstantMessageCreated;
 import com.symphony.bdk.gen.api.model.V4Message;
 import com.symphony.bdk.gen.api.model.V4MessageSent;
 import com.symphony.bdk.gen.api.model.V4Payload;
@@ -50,6 +51,8 @@ public static void removeListener(RealTimeEventListener listener) {
     listeners.remove(listener);
   }
 
+  public static void clearListeners() { listeners.clear(); }
+
   public static void pushMessageToDF(V4User initiator, V4Stream stream, String message) {
     pushMessageToDF(initiator, stream, message, null);
   }
@@ -70,6 +73,14 @@ public static void pushMessageToDF(V4User initiator, V4Message message) {
         .timestamp(Instant.now().toEpochMilli()));
   }
 
+  public static void pushMessageToDF(V4User initiator, V4InstantMessageCreated message) {
+    pushEventToDataFeed(new V4Event().initiator(new V4Initiator().user(initiator))
+        .payload(new V4Payload().instantMessageCreated(message))
+        .type(V4EventType.INSTANTMESSAGECREATED.name())
+        .id("event-id")
+        .timestamp(Instant.now().toEpochMilli()));
+  }
+
   public static void pushElementActionToDF(V4User initiator, V4SymphonyElementsAction elementAction) {
     pushEventToDataFeed(new V4Event().initiator(new V4Initiator().user(initiator))
         .payload(new V4Payload().symphonyElementsAction(elementAction))

symphony-bdk-test/symphony-bdk-test-jupiter/src/main/java/com/symphony/bdk/test/junit/jupiter/BdkTestInitialisation.java

@@ -37,7 +37,7 @@ public void beforeAll(ExtensionContext context) throws Exception {
     initMessageServiceMock(symphonyBdk);
     initSessionServiceMock(symphonyBdk, botUser);
     initOtherMocks(symphonyBdk);
-    final ActivityRegistry activityRegistry = new ActivityRegistry(botUser, bdkTestMock.getDatafeedLoop());
+    final ActivityRegistry activityRegistry = spy(new ActivityRegistry(botUser, bdkTestMock.getDatafeedLoop()));
     when(symphonyBdk.activities()).thenReturn(activityRegistry);
   }
 
@@ -52,6 +52,7 @@ private void initOtherMocks(SymphonyBdk symphonyBdk) {
     when(symphonyBdk.users()).thenReturn(bdkTestMock.getUserService());
     when(symphonyBdk.signals()).thenReturn(bdkTestMock.getSignalService());
     when(symphonyBdk.presences()).thenReturn(bdkTestMock.getPresenceService());
+    when(symphonyBdk.streams()).thenReturn(bdkTestMock.getStreamService());
   }
 
   private void initSessionServiceMock(SymphonyBdk symphonyBdk, UserV2 botUser) {