refacto: replaced FutureOr with Future

Floating-Dartists · May 25, 2023 · 3ec28b9 · 3ec28b9
1 parent 4bab27d
commit 3ec28b9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/lib/src/matomo.dart b/lib/src/matomo.dart
@@ -386,7 +386,7 @@ class MatomoTracker {
   }
 
   /// Iterate on the actions in the queue and send them to Matomo.
-  FutureOr<void> dispatchActions() {
+  Future<void> dispatchActions() {
     return _dequeue();
   }
 
@@ -716,7 +716,7 @@ class MatomoTracker {
     }
   }
 
-  FutureOr<void> _dequeue() {
+  Future<void> _dequeue() async {
     if (!_initialized) {
       throw const UninitializedMatomoInstanceException();
     }

diff --git a/lib/utils/lock.dart b/lib/utils/lock.dart
@@ -10,7 +10,7 @@ class Lock {
   bool get locked => last != null;
 
   Future<T> synchronized<T>(
-    FutureOr<T> Function() func,
+    Future<T> Function() func,
   ) async {
     final prev = last;
     final completer = Completer<void>.sync();

diff --git a/test/ressources/utils/uninitialized_test_util.dart b/test/ressources/utils/uninitialized_test_util.dart
@@ -1,11 +1,9 @@
-import 'dart:async';
-
 import 'package:flutter_test/flutter_test.dart';
 import 'package:matomo_tracker/src/exceptions.dart';
 import 'package:matomo_tracker/src/matomo.dart';
 import 'package:meta/meta.dart';
 
-typedef TrackerCallback = FutureOr<void> Function(MatomoTracker tracker);
+typedef TrackerCallback = Future<void> Function(MatomoTracker tracker);
 
 /// A test that expects the [callback] to throw an
 /// [UninitializedMatomoInstanceException].
@@ -17,7 +15,7 @@ void uninitializedTest(TrackerCallback callback) {
       final matomoTracker = MatomoTracker();
 
       await expectLater(
-        () async => await callback(matomoTracker),
+        () async => callback(matomoTracker),
         throwsA(isA<UninitializedMatomoInstanceException>()),
       );
     },

diff --git a/test/src/matomo_test.dart b/test/src/matomo_test.dart
@@ -170,7 +170,7 @@ void main() {
 
     group('trackScreenWithName', () {
       uninitializedTest(
-        (tracker) {
+        (tracker) async {
           tracker.trackScreenWithName(
             actionName: matomoTrackerMockWidget.toStringShort(),
           );
@@ -268,7 +268,7 @@ void main() {
   });
 
   group('setVisitorUserId', () {
-    uninitializedTest((tracker) => tracker.setVisitorUserId(uid));
+    uninitializedTest((tracker) async => tracker.setVisitorUserId(uid));
 
     test('it should be able to set visitor userId', () async {
       final matomoTracker = await getInitializedMatomoTracker();