BDK Test Utils improved (#845)

* Fixes in BDK test tools

StreamService mock was created but not registered in BDK
Added a method to reset listeners

* Update SymphonyBdkTestMock.java

* BDK Test Utils improved

Author: symphony-enrico

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,7 +42,7 @@ 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

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;
@@ -72,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

@@ -1,5 +1,6 @@
 package com.symphony.bdk.test.junit.jupiter;
 
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import com.symphony.bdk.core.SymphonyBdk;
@@ -37,7 +38,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);
   }
 
@@ -70,7 +71,7 @@ private void initAuthSessionMock(SymphonyBdk symphonyBdk) {
 
   private void initMessageServiceMock(SymphonyBdk symphonyBdk) {
     MessageService messageService = bdkTestMock.getMessageService();
-    TemplateEngine templateEngine = new FreeMarkerEngine();
+    TemplateEngine templateEngine = spy(new FreeMarkerEngine());
     when(messageService.templates()).thenReturn(templateEngine);
     when(symphonyBdk.messages()).thenReturn(messageService);
   }