test: add timeout in matrix test & overridden DBs

matthiasn · Dec 9, 2024 · 8bf4889 · 8bf4889
1 parent dbff4de
commit 8bf4889
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 16 deletions.
diff --git a/integration_test/matrix_service_test.dart b/integration_test/matrix_service_test.dart
@@ -53,10 +53,6 @@ void main() {
       () => mockUpdateNotifications.notify(any()),
     ).thenAnswer((_) {});
 
-    getIt
-      ..registerSingleton<UpdateNotifications>(mockUpdateNotifications)
-      ..registerSingleton<UserActivityService>(UserActivityService());
-
     final aliceDb = JournalDb(
       overriddenFilename: 'alice_db.sqlite',
       inMemoryDatabase: true,
@@ -115,18 +111,16 @@ void main() {
         ..createSync(recursive: true);
       debugPrint('Created temporary docDir ${docDir.path}');
 
-      final mockSettingsDb = MockSettingsDb();
-
       getIt
         ..registerSingleton<Directory>(docDir)
         ..registerSingleton<LoggingDb>(LoggingDb(inMemoryDatabase: true))
+        ..registerSingleton<UpdateNotifications>(mockUpdateNotifications)
+        ..registerSingleton<UserActivityService>(UserActivityService())
         ..registerSingleton<JournalDb>(JournalDb(inMemoryDatabase: true))
         ..registerSingleton<SettingsDb>(SettingsDb(inMemoryDatabase: true))
         ..registerSingleton<SecureStorage>(secureStorageMock);
 
-      when(() => mockSettingsDb.itemByKey(any())).thenAnswer((_) async => null);
-      when(() => mockSettingsDb.saveSettingsItem(any(), any()))
-          .thenAnswer((_) async => 0);
+      await Future<void>.delayed(const Duration(seconds: 5));
     });
 
     setUp(() {});
@@ -146,6 +140,8 @@ void main() {
           dbName: 'Alice',
           deviceDisplayName: 'Alice',
           overriddenJournalDb: aliceDb,
+          overriddenLoggingDb: LoggingDb(inMemoryDatabase: true),
+          overriddenSettingsDb: SettingsDb(inMemoryDatabase: true),
         );
 
         await alice.login();
@@ -171,6 +167,8 @@ void main() {
           dbName: 'Bob',
           deviceDisplayName: 'Bob',
           overriddenJournalDb: bobDb,
+          overriddenLoggingDb: LoggingDb(inMemoryDatabase: true),
+          overriddenSettingsDb: SettingsDb(inMemoryDatabase: true),
         );
 
         await bob.login();

diff --git a/lib/features/sync/matrix/last_read.dart b/lib/features/sync/matrix/last_read.dart
@@ -2,11 +2,15 @@ import 'package:lotti/database/settings_db.dart';
 import 'package:lotti/features/sync/matrix.dart';
 import 'package:lotti/get_it.dart';
 
-Future<void> setLastReadMatrixEventId(String eventId) =>
-    getIt<SettingsDb>().saveSettingsItem(
+Future<void> setLastReadMatrixEventId(
+  String eventId,
+  SettingsDb? overriddenSettingsDb,
+) =>
+    (overriddenSettingsDb ?? getIt<SettingsDb>()).saveSettingsItem(
       lastReadMatrixEventId,
       eventId,
     );
 
-Future<String?> getLastReadMatrixEventId() =>
-    getIt<SettingsDb>().itemByKey(lastReadMatrixEventId);
+Future<String?> getLastReadMatrixEventId(SettingsDb? overriddenSettingsDb) =>
+    (overriddenSettingsDb ?? getIt<SettingsDb>())
+        .itemByKey(lastReadMatrixEventId);
diff --git a/lib/features/sync/matrix/matrix_service.dart b/lib/features/sync/matrix/matrix_service.dart
@@ -2,6 +2,8 @@ import 'dart:async';
 
 import 'package:lotti/classes/config.dart';
 import 'package:lotti/database/database.dart';
+import 'package:lotti/database/logging_db.dart';
+import 'package:lotti/database/settings_db.dart';
 import 'package:lotti/features/sync/client_runner.dart';
 import 'package:lotti/features/sync/matrix.dart';
 import 'package:lotti/features/user_activity/state/user_activity_service.dart';
@@ -15,6 +17,8 @@ class MatrixService {
     this.deviceDisplayName,
     String? dbName,
     JournalDb? overriddenJournalDb,
+    LoggingDb? overriddenLoggingDb,
+    SettingsDb? overriddenSettingsDb,
   })  : keyVerificationController =
             StreamController<KeyVerificationRunner>.broadcast(),
         _client = createMatrixClient(dbName: dbName) {
@@ -27,11 +31,13 @@ class MatrixService {
         await processNewTimelineEvents(
           service: this,
           overriddenJournalDb: overriddenJournalDb,
+          overriddenLoggingDb: overriddenLoggingDb,
+          overriddenSettingsDb: overriddenSettingsDb,
         );
       },
     );
 
-    getLastReadMatrixEventId().then(
+    getLastReadMatrixEventId(overriddenSettingsDb).then(
       (value) => lastReadEventContextId = value,
     );
 

diff --git a/lib/features/sync/matrix/timeline.dart b/lib/features/sync/matrix/timeline.dart
@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:lotti/database/database.dart';
 import 'package:lotti/database/logging_db.dart';
+import 'package:lotti/database/settings_db.dart';
 import 'package:lotti/features/sync/matrix.dart';
 import 'package:lotti/get_it.dart';
 import 'package:lotti/utils/list_extension.dart';
@@ -59,8 +60,10 @@ Future<void> listenToTimelineEvents({
 Future<void> processNewTimelineEvents({
   required MatrixService service,
   JournalDb? overriddenJournalDb,
+  LoggingDb? overriddenLoggingDb,
+  SettingsDb? overriddenSettingsDb,
 }) async {
-  final loggingDb = getIt<LoggingDb>();
+  final loggingDb = overriddenLoggingDb ?? getIt<LoggingDb>();
 
   try {
     final lastReadEventContextId = service.lastReadEventContextId;
@@ -111,7 +114,7 @@ Future<void> processNewTimelineEvents({
       try {
         if (eventId.startsWith(r'$')) {
           service.lastReadEventContextId = eventId;
-          await setLastReadMatrixEventId(eventId);
+          await setLastReadMatrixEventId(eventId, overriddenSettingsDb);
           final loginState = service.client.onLoginStateChanged.value;
           if (loginState == LoginState.loggedIn) {
             await timeline.setReadMarker(eventId: eventId);