Replace mockito with mocktail

Workiva · Apr 26, 2024 · b644005 · b644005
1 parent 957245e
commit b644005
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 23 deletions.
diff --git a/w_common/test/unit/browser/browser_stubs.dart b/w_common/test/unit/browser/browser_stubs.dart
@@ -14,7 +14,7 @@
 
 import 'dart:html';
 
-import 'package:mockito/mockito.dart';
+import 'package:mocktail/mocktail.dart';
 import 'package:w_common/disposable_browser.dart';
 
 import '../stubs.dart';

diff --git a/w_common/test/unit/browser/cache/cache_test.dart b/w_common/test/unit/browser/cache/cache_test.dart
@@ -14,7 +14,7 @@
 @TestOn('browser')
 
 import 'dart:async';
-import 'package:mockito/mockito.dart';
+import 'package:mocktail/mocktail.dart';
 import 'package:test/test.dart';
 import 'package:w_common/src/common/cache/cache.dart';
 import 'package:w_common/src/common/cache/least_recently_used_strategy.dart';
@@ -108,7 +108,7 @@ void main() {
         var mockCachingStrategy = MockCachingStrategy();
         var childCache = Cache(mockCachingStrategy);
         await childCache.get(cachedId, () => cachedValue);
-        verify(mockCachingStrategy.onDidGet(cachedId, cachedValue));
+        verify(() => mockCachingStrategy.onDidGet(cachedId, cachedValue));
       });
 
       test('should call onDidGet when value is cached', () async {
@@ -117,7 +117,7 @@ void main() {
         await childCache.get(cachedId, () => cachedValue);
         await childCache.get(cachedId, () => cachedValue);
 
-        verify(mockCachingStrategy.onDidGet(cachedId, cachedValue)).called(2);
+        verify(() => mockCachingStrategy.onDidGet(cachedId, cachedValue)).called(2);
       });
 
       test('should throw when disposed', () async {
@@ -200,15 +200,15 @@ void main() {
         await childCache.get(cachedId, () => cachedValue);
         await childCache.remove(cachedId);
 
-        verify(stubCachingStrategy.onDidRemove(cachedId, cachedValue));
+        verify(() => stubCachingStrategy.onDidRemove(cachedId, cachedValue));
       });
 
       test('should call onWillRemove when value was cached', () async {
         var stubCachingStrategy = MockCachingStrategy();
         var childCache = Cache(stubCachingStrategy);
         await childCache.get(cachedId, () => cachedValue);
         await childCache.remove(cachedId);
-        verify(stubCachingStrategy.onWillRemove(cachedId));
+        verify(() => stubCachingStrategy.onWillRemove(cachedId));
       });
 
       test('should not call onDidRemove when identifier is not cached',
@@ -217,7 +217,7 @@ void main() {
         var childCache = Cache(stubCachingStrategy);
         await childCache.remove(cachedId);
 
-        verifyNever(stubCachingStrategy.onDidRemove(cachedId, cachedValue));
+        verifyNever(() => stubCachingStrategy.onDidRemove(cachedId, cachedValue));
       });
 
       test('should not call onWillRemove when identifier is not cached',
@@ -226,7 +226,7 @@ void main() {
         var childCache = Cache(stubCachingStrategy);
         await childCache.remove(cachedId);
 
-        verifyNever(stubCachingStrategy.onWillRemove(cachedId));
+        verifyNever(() => stubCachingStrategy.onWillRemove(cachedId));
       });
 
       test('should remove after pending get if called synchronously', () {
@@ -292,7 +292,7 @@ void main() {
         await childCache.get(cachedId, () => cachedValue);
         await childCache.release(cachedId);
 
-        verify(stubCachingStrategy.onDidRelease(
+        verify(() => stubCachingStrategy.onDidRelease(
             cachedId, cachedValue, childCache.remove));
       });
 
@@ -302,15 +302,15 @@ void main() {
         await childCache.get(cachedId, () => cachedValue);
         await childCache.release(cachedId);
 
-        verify(stubCachingStrategy.onWillRelease(cachedId));
+        verify(() => stubCachingStrategy.onWillRelease(cachedId));
       });
 
       test('should not call onDidRelease when identifier is not cached',
           () async {
         var stubCachingStrategy = MockCachingStrategy();
         var childCache = Cache(stubCachingStrategy);
         await childCache.release(cachedId);
-        verifyNever(stubCachingStrategy.onDidRelease(
+        verifyNever(() => stubCachingStrategy.onDidRelease(
             cachedId, cachedValue, childCache.remove));
       });
 
@@ -319,7 +319,7 @@ void main() {
         var stubCachingStrategy = MockCachingStrategy();
         var childCache = Cache(stubCachingStrategy);
         await childCache.release(cachedId);
-        verifyNever(stubCachingStrategy.onWillRelease(cachedId));
+        verifyNever(() => stubCachingStrategy.onWillRelease(cachedId));
       });
 
       test('should complete if pending get factory completes with an error',

diff --git a/w_common/test/unit/browser/cache/cache_test.mg.mocks.dart b/w_common/test/unit/browser/cache/cache_test.mg.mocks.dart
@@ -5,7 +5,7 @@
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i3;
 
-import 'package:mockito/mockito.dart' as _i1;
+import 'package:mocktail/mocktail.dart' as _i1;
 import 'package:w_common/src/common/cache/cache.dart' as _i2;
 
 // ignore_for_file: type=lint

diff --git a/w_common/test/unit/browser/disposable_browser_test.dart b/w_common/test/unit/browser/disposable_browser_test.dart
@@ -16,7 +16,7 @@
 import 'dart:html';
 import 'dart:js' as js;
 
-import 'package:mockito/mockito.dart';
+import 'package:mocktail/mocktail.dart';
 import 'package:test/test.dart';
 import 'package:w_common/src/browser/disposable_browser.dart';
 import 'package:w_common/src/common/disposable.dart' show LeakFlag;
@@ -48,9 +48,9 @@ void main() {
 
         disposable.subscribeToDocumentEvent(eventName, callback,
             documentObject: document, useCapture: useCapture);
-        verify(document.addEventListener(eventName, callback, useCapture));
+        verify(() => document.addEventListener(eventName, callback, useCapture));
         await disposable.dispose();
-        verify(document.removeEventListener(eventName, callback, useCapture));
+        verify(() => document.removeEventListener(eventName, callback, useCapture));
       });
 
       test(
@@ -60,9 +60,9 @@ void main() {
 
         disposable.subscribeToWindowEvent(eventName, callback,
             windowObject: window, useCapture: useCapture);
-        verify(window.addEventListener(eventName, callback, useCapture));
+        verify(() => window.addEventListener(eventName, callback, useCapture));
         await disposable.dispose();
-        verify(window.removeEventListener(eventName, callback, useCapture));
+        verify(() => window.removeEventListener(eventName, callback, useCapture));
       });
     });
 

diff --git a/w_common_tools/build.yaml b/w_common_tools/build.yaml
@@ -1,8 +1,3 @@
 targets:
   $default:
     builders:
-      # mockito's builder is expensive and is not needed until this package is
-      # migrated to null-safety. At that point, it should be scoped only to
-      # relevant files.
-      mockito:mockBuilder:
-        enabled: false