From c37faddd2ee28db16f3195565b955258be226cf7 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Thu, 17 Jun 2021 14:03:35 +0200
Subject: [PATCH] fix tests

---
 .../test/src/channel_preview_test.dart           |  4 ----
 .../test/src/full_screen_media_test.dart         | 16 ++++++++--------
 packages/stream_chat_flutter/test/src/mocks.dart |  4 ++--
 .../test/src/typing_indicator_test.dart          | 15 ++++++++-------
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/packages/stream_chat_flutter/test/src/channel_preview_test.dart b/packages/stream_chat_flutter/test/src/channel_preview_test.dart
index b913489e..baa82614 100644
--- a/packages/stream_chat_flutter/test/src/channel_preview_test.dart
+++ b/packages/stream_chat_flutter/test/src/channel_preview_test.dart
@@ -60,10 +60,6 @@ void main() {
             )
           ]));
 
-      when(() => channelState.typingEvents).thenReturn([]);
-      when(() => channelState.typingEventsStream)
-          .thenAnswer((_) => Stream.value([]));
-
       await tester.pumpWidget(MaterialApp(
         home: StreamChat(
           client: client,
diff --git a/packages/stream_chat_flutter/test/src/full_screen_media_test.dart b/packages/stream_chat_flutter/test/src/full_screen_media_test.dart
index 81c342eb..d418c303 100644
--- a/packages/stream_chat_flutter/test/src/full_screen_media_test.dart
+++ b/packages/stream_chat_flutter/test/src/full_screen_media_test.dart
@@ -53,15 +53,15 @@ void main() {
               user: User(id: 'other-user'),
             )
           ]));
-
-      when(() => channelState.typingEvents).thenAnswer((i) => [
-            User(id: 'other-user', extraData: {'name': 'demo'})
-          ]);
+      when(() => channelState.typingEvents).thenAnswer((i) => {
+            User(id: 'other-user', extraData: {'name': 'demo'}):
+                const Event(type: EventType.typingStart),
+          });
       when(() => channelState.typingEventsStream)
-          .thenAnswer((i) => Stream.value([
-                User(id: 'other-user', extraData: {'name': 'demo'}),
-                User(id: 'other-user', extraData: {'name': 'demo'}),
-              ]));
+          .thenAnswer((i) => Stream.value({
+                User(id: 'other-user', extraData: {'name': 'demo'}):
+                    const Event(type: EventType.typingStart),
+              }));
 
       await tester.pumpWidget(MaterialApp(
         home: StreamChat(
diff --git a/packages/stream_chat_flutter/test/src/mocks.dart b/packages/stream_chat_flutter/test/src/mocks.dart
index d2b04e11..28e00e4b 100644
--- a/packages/stream_chat_flutter/test/src/mocks.dart
+++ b/packages/stream_chat_flutter/test/src/mocks.dart
@@ -23,8 +23,8 @@ class MockChannel extends Mock implements Channel {
 
 class MockChannelState extends Mock implements ChannelClientState {
   MockChannelState() {
-    when(() => typingEvents).thenReturn([]);
-    when(() => typingEventsStream).thenAnswer((_) => Stream.value([]));
+    when(() => typingEvents).thenReturn({});
+    when(() => typingEventsStream).thenAnswer((_) => Stream.value({}));
   }
 }
 
diff --git a/packages/stream_chat_flutter/test/src/typing_indicator_test.dart b/packages/stream_chat_flutter/test/src/typing_indicator_test.dart
index cc9af663..75431f44 100644
--- a/packages/stream_chat_flutter/test/src/typing_indicator_test.dart
+++ b/packages/stream_chat_flutter/test/src/typing_indicator_test.dart
@@ -53,14 +53,15 @@ void main() {
             )
           ]));
 
-      when(() => channelState.typingEvents).thenAnswer((i) => [
-            User(id: 'other-user', extraData: {'name': 'demo'})
-          ]);
+      when(() => channelState.typingEvents).thenAnswer((i) => {
+            User(id: 'other-user', extraData: {'name': 'demo'}):
+                const Event(type: EventType.typingStart),
+          });
       when(() => channelState.typingEventsStream)
-          .thenAnswer((i) => Stream.value([
-                User(id: 'other-user', extraData: {'name': 'demo'}),
-                User(id: 'other-user', extraData: {'name': 'demo'}),
-              ]));
+          .thenAnswer((i) => Stream.value({
+                User(id: 'other-user', extraData: {'name': 'demo'}):
+                    const Event(type: EventType.typingStart),
+              }));
 
       await tester.pumpWidget(MaterialApp(
         home: StreamChat(