Fixes broken CI (#806)

* Update pubspec.yaml * Migrated from mockito to mocktail * Test on dart 2.14
isar · Oct 14, 2021 · 7d5f81c · 7d5f81c
1 parent da44d6c
commit 7d5f81c
Show file tree

Hide file tree

Showing 18 changed files with 331 additions and 1,584 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         test-platform: [vm, chrome]
-        dart-channel: ["2.12.0", "2.13.0"]
+        dart-channel: ["2.12.0", "2.13.0", "2.14.0"]
     steps:
       - uses: actions/checkout@v1
       - uses: dart-lang/setup-dart@v1

diff --git a/hive/pubspec.yaml b/hive/pubspec.yaml
@@ -12,10 +12,9 @@ dependencies:
   crypto: ^3.0.0
 
 dev_dependencies:
-  test: ^1.15.7
-  # TODO: Fix & update mockito version
-  mockito: 5.0.0-nullsafety.5
+  test: ^1.17.12
+  mocktail: ^0.2.0
   pedantic: ^1.9.0
   path: ^1.7.0
   pointycastle: ^3.0.1
-  build_runner: ^1.10.0
+  build_runner: ^2.1.2
diff --git a/hive/test/tests/adapters/date_time_adapter_test.dart b/hive/test/tests/adapters/date_time_adapter_test.dart
@@ -1,5 +1,5 @@
 import 'package:hive/src/adapters/date_time_adapter.dart';
-import 'package:mockito/mockito.dart';
+import 'package:mocktail/mocktail.dart';
 import 'package:test/test.dart';
 
 import '../mocks.dart';
@@ -9,10 +9,10 @@ void main() {
     test('.read()', () {
       var now = DateTime.now();
       var binaryReader = MockBinaryReader();
-      when(binaryReader.readInt()).thenReturn(now.millisecondsSinceEpoch);
+      when(() => binaryReader.readInt()).thenReturn(now.millisecondsSinceEpoch);
 
       var date = DateTimeAdapter().read(binaryReader);
-      verify(binaryReader.readInt());
+      verify(() => binaryReader.readInt());
       expect(date, now.subtract(Duration(microseconds: now.microsecond)));
     });
 
@@ -21,7 +21,7 @@ void main() {
       var binaryWriter = MockBinaryWriter();
 
       DateTimeAdapter().write(binaryWriter, now);
-      verify(binaryWriter.writeInt(now.millisecondsSinceEpoch));
+      verify(() => binaryWriter.writeInt(now.millisecondsSinceEpoch));
     });
   });
 
@@ -30,22 +30,30 @@ void main() {
       test('local', () {
         var now = DateTime.now();
         var binaryReader = MockBinaryReader();
-        when(binaryReader.readInt()).thenReturn(now.millisecondsSinceEpoch);
-        when(binaryReader.readBool()).thenReturn(false);
+        when(() => binaryReader.readInt())
+            .thenReturn(now.millisecondsSinceEpoch);
+        when(() => binaryReader.readBool()).thenReturn(false);
 
         var date = DateTimeWithTimezoneAdapter().read(binaryReader);
-        verifyInOrder([binaryReader.readInt(), binaryReader.readBool()]);
+        verifyInOrder([
+          () => binaryReader.readInt(),
+          () => binaryReader.readBool(),
+        ]);
         expect(date, now.subtract(Duration(microseconds: now.microsecond)));
       });
 
       test('UTC', () {
         var now = DateTime.now().toUtc();
         var binaryReader = MockBinaryReader();
-        when(binaryReader.readInt()).thenReturn(now.millisecondsSinceEpoch);
-        when(binaryReader.readBool()).thenReturn(true);
+        when(() => binaryReader.readInt())
+            .thenReturn(now.millisecondsSinceEpoch);
+        when(() => binaryReader.readBool()).thenReturn(true);
 
         var date = DateTimeWithTimezoneAdapter().read(binaryReader);
-        verifyInOrder([binaryReader.readInt(), binaryReader.readBool()]);
+        verifyInOrder([
+          () => binaryReader.readInt(),
+          () => binaryReader.readBool(),
+        ]);
         expect(date, now.subtract(Duration(microseconds: now.microsecond)));
         expect(date.isUtc, true);
       });
@@ -58,8 +66,8 @@ void main() {
 
         DateTimeWithTimezoneAdapter().write(binaryWriter, now);
         verifyInOrder([
-          binaryWriter.writeInt(now.millisecondsSinceEpoch),
-          binaryWriter.writeBool(false),
+          () => binaryWriter.writeInt(now.millisecondsSinceEpoch),
+          () => binaryWriter.writeBool(false),
         ]);
       });
 
@@ -69,8 +77,8 @@ void main() {
 
         DateTimeWithTimezoneAdapter().write(binaryWriter, now);
         verifyInOrder([
-          binaryWriter.writeInt(now.millisecondsSinceEpoch),
-          binaryWriter.writeBool(true),
+          () => binaryWriter.writeInt(now.millisecondsSinceEpoch),
+          () => binaryWriter.writeBool(true),
         ]);
       });
     });

diff --git a/hive/test/tests/adapters/ignored_type_adapter_test.dart b/hive/test/tests/adapters/ignored_type_adapter_test.dart
@@ -1,5 +1,5 @@
 import 'package:hive/src/adapters/ignored_type_adapter.dart';
-import 'package:mockito/mockito.dart';
+import 'package:mocktail/mocktail.dart';
 import 'package:test/test.dart';
 
 import '../mocks.dart';
@@ -9,14 +9,14 @@ void main() {
     test('.read()', () {
       var binaryReader = MockBinaryReader();
       var value = IgnoredTypeAdapter().read(binaryReader);
-      verifyNever(binaryReader.read());
+      verifyNever(() => binaryReader.read());
       expect(value, null);
     });
 
     test('.write()', () {
       var binaryWriter = MockBinaryWriter();
       IgnoredTypeAdapter().write(binaryWriter, 42);
-      verifyNever(binaryWriter.writeInt(42));
+      verifyNever(() => binaryWriter.writeInt(42));
     });
   });
 }