refactor(shorebird_cli): move test mocks and fakes into their own files (#1305)

packages/shorebird_cli/test/src/adb_test.dart

@@ -7,11 +7,7 @@ import 'package:shorebird_cli/src/android_sdk.dart';
 import 'package:shorebird_cli/src/process.dart';
 import 'package:test/test.dart';
 
-class _MockAndroidSdk extends Mock implements AndroidSdk {}
-
-class _MockShorebirdProcess extends Mock implements ShorebirdProcess {}
-
-class _MockProcess extends Mock implements Process {}
+import 'mocks.dart';
 
 void main() {
   group(Adb, () {
@@ -36,8 +32,8 @@ void main() {
     });
 
     setUp(() {
-      androidSdk = _MockAndroidSdk();
-      process = _MockShorebirdProcess();
+      androidSdk = MockAndroidSdk();
+      process = MockShorebirdProcess();
       adb = Adb();
 
       when(() => androidSdk.adbPath).thenReturn(adbPath);
@@ -133,7 +129,7 @@ void main() {
       });
 
       test('returns correct process (unfiltered)', () async {
-        final Process logcatProcess = _MockProcess();
+        final Process logcatProcess = MockProcess();
         when(() => process.start(any(), any())).thenAnswer((invocation) async {
           final executable = invocation.positionalArguments[0] as String;
           if (executable == adbPath) return logcatProcess;
@@ -146,7 +142,7 @@ void main() {
 
       test('returns correct process (filtered)', () async {
         const filter = 'flutter';
-        final logcatProcess = _MockProcess();
+        final logcatProcess = MockProcess();
         const logcatStdout = Stream<List<int>>.empty();
 
         when(
@@ -166,7 +162,7 @@ void main() {
 
       test('forwards device-id if provided', () async {
         const deviceId = '1234';
-        final Process logcatProcess = _MockProcess();
+        final Process logcatProcess = MockProcess();
         when(() => process.start(any(), any())).thenAnswer((invocation) async {
           final executable = invocation.positionalArguments[0] as String;
           if (executable == adbPath) return logcatProcess;

packages/shorebird_cli/test/src/android_sdk_test.dart

@@ -8,7 +8,7 @@ import 'package:shorebird_cli/src/android_sdk.dart';
 import 'package:shorebird_cli/src/platform.dart';
 import 'package:test/test.dart';
 
-class _MockPlatform extends Mock implements Platform {}
+import 'mocks.dart';
 
 void main() {
   group(AndroidSdk, () {
@@ -27,7 +27,7 @@ void main() {
 
     setUp(() {
       homeDirectory = Directory.systemTemp.createTempSync();
-      platform = _MockPlatform();
+      platform = MockPlatform();
       androidSdk = AndroidSdk();
 
       when(() => platform.isLinux).thenReturn(false);

packages/shorebird_cli/test/src/android_studio_test.dart

@@ -8,7 +8,7 @@ import 'package:shorebird_cli/src/android_studio.dart';
 import 'package:shorebird_cli/src/platform.dart';
 import 'package:test/test.dart';
 
-class _MockPlatform extends Mock implements Platform {}
+import 'mocks.dart';
 
 void main() {
   group(AndroidStudio, () {
@@ -31,7 +31,7 @@ void main() {
     }
 
     setUp(() {
-      platform = _MockPlatform();
+      platform = MockPlatform();
       androidStudio = AndroidStudio();
     });
 

packages/shorebird_cli/test/src/auth/auth_test.dart

@@ -16,15 +16,8 @@ import 'package:shorebird_cli/src/platform.dart';
 import 'package:shorebird_code_push_client/shorebird_code_push_client.dart';
 import 'package:test/test.dart';
 
-class _FakeBaseRequest extends Fake implements http.BaseRequest {}
-
-class _MockCodePushClient extends Mock implements CodePushClient {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockHttpClient extends Mock implements http.Client {}
-
-class _MockPlatform extends Mock implements Platform {}
+import '../fakes.dart';
+import '../mocks.dart';
 
 void main() {
   group('scoped', () {
@@ -65,7 +58,7 @@ void main() {
     late Platform platform;
 
     setUpAll(() {
-      registerFallbackValue(_FakeBaseRequest());
+      registerFallbackValue(FakeBaseRequest());
     });
 
     R runWithOverrides<R>(R Function() body) {
@@ -102,10 +95,10 @@ void main() {
 
     setUp(() {
       credentialsDir = Directory.systemTemp.createTempSync().path;
-      httpClient = _MockHttpClient();
-      codePushClient = _MockCodePushClient();
-      logger = _MockLogger();
-      platform = _MockPlatform();
+      httpClient = MockHttpClient();
+      codePushClient = MockCodePushClient();
+      logger = MockLogger();
+      platform = MockPlatform();
 
       when(() => codePushClient.getCurrentUser()).thenAnswer((_) async => user);
       when(() => platform.environment).thenReturn(<String, String>{});

packages/shorebird_cli/test/src/bundletool_test.dart

@@ -9,11 +9,7 @@ import 'package:shorebird_cli/src/java.dart';
 import 'package:shorebird_cli/src/process.dart';
 import 'package:test/test.dart';
 
-class _MockCache extends Mock implements Cache {}
-
-class _MockJava extends Mock implements Java {}
-
-class _MockShorebirdProcess extends Mock implements ShorebirdProcess {}
+import 'mocks.dart';
 
 void main() {
   group(Bundletool, () {
@@ -39,9 +35,9 @@ void main() {
 
     setUp(() {
       workingDirectory = Directory.systemTemp.createTempSync();
-      cache = _MockCache();
-      java = _MockJava();
-      process = _MockShorebirdProcess();
+      cache = MockCache();
+      java = MockJava();
+      process = MockShorebirdProcess();
       bundletool = Bundletool();
 
       when(() => cache.updateAll()).thenAnswer((_) async {});

packages/shorebird_cli/test/src/cache_test.dart

@@ -13,17 +13,8 @@ import 'package:shorebird_cli/src/process.dart';
 import 'package:shorebird_cli/src/shorebird_env.dart';
 import 'package:test/test.dart';
 
-class _FakeBaseRequest extends Fake implements http.BaseRequest {}
-
-class _MockHttpClient extends Mock implements http.Client {}
-
-class _MockPlatform extends Mock implements Platform {}
-
-class _MockProcess extends Mock implements Process {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
-
-class _MockShorebirdProcess extends Mock implements ShorebirdProcess {}
+import 'fakes.dart';
+import 'mocks.dart';
 
 class TestCachedArtifact extends CachedArtifact {
   TestCachedArtifact({required super.cache, required super.platform});
@@ -60,15 +51,15 @@ void main() {
     }
 
     setUpAll(() {
-      registerFallbackValue(_FakeBaseRequest());
+      registerFallbackValue(FakeBaseRequest());
     });
 
     setUp(() {
-      httpClient = _MockHttpClient();
-      platform = _MockPlatform();
-      chmodProcess = _MockProcess();
-      shorebirdEnv = _MockShorebirdEnv();
-      shorebirdProcess = _MockShorebirdProcess();
+      httpClient = MockHttpClient();
+      platform = MockPlatform();
+      chmodProcess = MockProcess();
+      shorebirdEnv = MockShorebirdEnv();
+      shorebirdProcess = MockShorebirdProcess();
 
       shorebirdRoot = Directory.systemTemp.createTempSync();
       when(

packages/shorebird_cli/test/src/code_push_client_wrapper_test.dart

@@ -14,19 +14,7 @@ import 'package:shorebird_cli/src/third_party/flutter_tools/lib/flutter_tools.da
 import 'package:shorebird_code_push_client/shorebird_code_push_client.dart';
 import 'package:test/test.dart';
 
-class _MockAuth extends Mock implements Auth {}
-
-class _MockCodePushClient extends Mock implements CodePushClient {}
-
-class _MockHttpClient extends Mock implements http.Client {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockPlatform extends Mock implements Platform {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
+import 'mocks.dart';
 
 void main() {
   group('scoped', () {
@@ -36,10 +24,10 @@ void main() {
     late ShorebirdEnv shorebirdEnv;
 
     setUp(() {
-      auth = _MockAuth();
-      httpClient = _MockHttpClient();
-      platform = _MockPlatform();
-      shorebirdEnv = _MockShorebirdEnv();
+      auth = MockAuth();
+      httpClient = MockHttpClient();
+      platform = MockPlatform();
+      shorebirdEnv = MockShorebirdEnv();
 
       when(() => auth.client).thenReturn(httpClient);
       when(() => shorebirdEnv.hostedUri).thenReturn(
@@ -143,10 +131,10 @@ void main() {
     tearDownAll(restoreExitFunction);
 
     setUp(() {
-      codePushClient = _MockCodePushClient();
-      logger = _MockLogger();
-      platform = _MockPlatform();
-      progress = _MockProgress();
+      codePushClient = MockCodePushClient();
+      logger = MockLogger();
+      platform = MockPlatform();
+      progress = MockProgress();
 
       codePushClientWrapper = runWithOverrides(
         () => CodePushClientWrapper(codePushClient: codePushClient),

packages/shorebird_cli/test/src/command_runner_test.dart

@@ -12,15 +12,7 @@ import 'package:shorebird_cli/src/shorebird_flutter.dart';
 import 'package:shorebird_cli/src/version.dart';
 import 'package:test/test.dart';
 
-class _MockLogger extends Mock implements Logger {}
-
-class _MockPlatform extends Mock implements Platform {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
-
-class _MockProcessResult extends Mock implements ShorebirdProcessResult {}
-
-class _MockShorebirdFlutter extends Mock implements ShorebirdFlutter {}
+import 'mocks.dart';
 
 void main() {
   group(ShorebirdCliCommandRunner, () {
@@ -48,11 +40,11 @@ void main() {
     }
 
     setUp(() {
-      logger = _MockLogger();
-      platform = _MockPlatform();
-      shorebirdEnv = _MockShorebirdEnv();
-      shorebirdFlutter = _MockShorebirdFlutter();
-      processResult = _MockProcessResult();
+      logger = MockLogger();
+      platform = MockPlatform();
+      shorebirdEnv = MockShorebirdEnv();
+      shorebirdFlutter = MockShorebirdFlutter();
+      processResult = MockProcessResult();
       when(() => processResult.exitCode).thenReturn(ExitCode.success.code);
       when(
         () => shorebirdEnv.shorebirdEngineRevision,

packages/shorebird_cli/test/src/commands/account/downgrade_account_command_test.dart

@@ -8,16 +8,7 @@ import 'package:shorebird_cli/src/shorebird_validator.dart';
 import 'package:shorebird_code_push_client/shorebird_code_push_client.dart';
 import 'package:test/test.dart';
 
-class _MockCodePushClientWrapper extends Mock
-    implements CodePushClientWrapper {}
-
-class _MockCodePushClient extends Mock implements CodePushClient {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockShorebirdValidator extends Mock implements ShorebirdValidator {}
+import '../../mocks.dart';
 
 void main() {
   group(DowngradeAccountCommand, () {
@@ -47,11 +38,11 @@ void main() {
     }
 
     setUp(() {
-      codePushClientWrapper = _MockCodePushClientWrapper();
-      codePushClient = _MockCodePushClient();
-      logger = _MockLogger();
-      progress = _MockProgress();
-      shorebirdValidator = _MockShorebirdValidator();
+      codePushClientWrapper = MockCodePushClientWrapper();
+      codePushClient = MockCodePushClient();
+      logger = MockLogger();
+      progress = MockProgress();
+      shorebirdValidator = MockShorebirdValidator();
 
       when(
         () => codePushClientWrapper.codePushClient,

packages/shorebird_cli/test/src/commands/apps/create_apps_command_test.dart

@@ -9,14 +9,7 @@ import 'package:shorebird_cli/src/shorebird_validator.dart';
 import 'package:shorebird_code_push_client/shorebird_code_push_client.dart';
 import 'package:test/test.dart';
 
-class _MockArgResults extends Mock implements ArgResults {}
-
-class _MockCodePushClientWrapper extends Mock
-    implements CodePushClientWrapper {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockShorebirdValidator extends Mock implements ShorebirdValidator {}
+import '../../mocks.dart';
 
 void main() {
   group(CreateAppCommand, () {
@@ -41,10 +34,10 @@ void main() {
     }
 
     setUp(() {
-      argResults = _MockArgResults();
-      logger = _MockLogger();
-      codePushClientWrapper = _MockCodePushClientWrapper();
-      shorebirdValidator = _MockShorebirdValidator();
+      argResults = MockArgResults();
+      logger = MockLogger();
+      codePushClientWrapper = MockCodePushClientWrapper();
+      shorebirdValidator = MockShorebirdValidator();
 
       when(() => argResults['app-name']).thenReturn(appName);
       when(

packages/shorebird_cli/test/src/commands/build/build_aar_command_test.dart

@@ -10,19 +10,7 @@ import 'package:shorebird_cli/src/shorebird_env.dart';
 import 'package:shorebird_cli/src/shorebird_validator.dart';
 import 'package:test/test.dart';
 
-class _MockArgResults extends Mock implements ArgResults {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockProcessResult extends Mock implements ShorebirdProcessResult {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
-
-class _MockShorebirdProcess extends Mock implements ShorebirdProcess {}
-
-class _MockShorebirdValidator extends Mock implements ShorebirdValidator {}
+import '../../mocks.dart';
 
 void main() {
   group(BuildAarCommand, () {
@@ -52,14 +40,14 @@ void main() {
     }
 
     setUp(() {
-      argResults = _MockArgResults();
-      logger = _MockLogger();
-      flutterPubGetProcessResult = _MockProcessResult();
-      buildProcessResult = _MockProcessResult();
-      progress = _MockProgress();
-      shorebirdEnv = _MockShorebirdEnv();
-      shorebirdProcess = _MockShorebirdProcess();
-      shorebirdValidator = _MockShorebirdValidator();
+      argResults = MockArgResults();
+      logger = MockLogger();
+      flutterPubGetProcessResult = MockProcessResult();
+      buildProcessResult = MockProcessResult();
+      progress = MockProgress();
+      shorebirdEnv = MockShorebirdEnv();
+      shorebirdProcess = MockShorebirdProcess();
+      shorebirdValidator = MockShorebirdValidator();
 
       when(() => argResults['build-number']).thenReturn(buildNumber);
       when(() => argResults.rest).thenReturn([]);

packages/shorebird_cli/test/src/commands/build/build_apk_command_test.dart

@@ -13,24 +13,8 @@ import 'package:shorebird_cli/src/shorebird_validator.dart';
 import 'package:shorebird_cli/src/validators/validators.dart';
 import 'package:test/test.dart';
 
-class _MockArgResults extends Mock implements ArgResults {}
-
-class _MockDoctor extends Mock implements Doctor {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockProcessResult extends Mock implements ShorebirdProcessResult {}
-
-class _MockShorebirdFlutterValidator extends Mock
-    implements ShorebirdFlutterValidator {}
-
-class _MockShorebirdProcess extends Mock implements ShorebirdProcess {}
-
-class _MockShorebirdValidator extends Mock implements ShorebirdValidator {}
-
-class _FakeShorebirdProcess extends Fake implements ShorebirdProcess {}
+import '../../fakes.dart';
+import '../../mocks.dart';
 
 void main() {
   group(BuildApkCommand, () {
@@ -57,18 +41,18 @@ void main() {
     }
 
     setUpAll(() {
-      registerFallbackValue(_FakeShorebirdProcess());
+      registerFallbackValue(FakeShorebirdProcess());
     });
 
     setUp(() {
-      argResults = _MockArgResults();
-      doctor = _MockDoctor();
-      logger = _MockLogger();
-      shorebirdProcess = _MockShorebirdProcess();
-      buildProcessResult = _MockProcessResult();
-      flutterPubGetProcessResult = _MockProcessResult();
-      flutterValidator = _MockShorebirdFlutterValidator();
-      shorebirdValidator = _MockShorebirdValidator();
+      argResults = MockArgResults();
+      doctor = MockDoctor();
+      logger = MockLogger();
+      shorebirdProcess = MockShorebirdProcess();
+      buildProcessResult = MockProcessResult();
+      flutterPubGetProcessResult = MockProcessResult();
+      flutterValidator = MockShorebirdFlutterValidator();
+      shorebirdValidator = MockShorebirdValidator();
 
       when(
         () => shorebirdProcess.run(
@@ -88,7 +72,7 @@ void main() {
         ),
       ).thenAnswer((_) async => buildProcessResult);
       when(() => argResults.rest).thenReturn([]);
-      when(() => logger.progress(any())).thenReturn(_MockProgress());
+      when(() => logger.progress(any())).thenReturn(MockProgress());
       when(() => logger.info(any())).thenReturn(null);
       when(
         () => shorebirdValidator.validatePreconditions(

packages/shorebird_cli/test/src/commands/build/build_app_bundle_command_test.dart

@@ -13,24 +13,8 @@ import 'package:shorebird_cli/src/shorebird_validator.dart';
 import 'package:shorebird_cli/src/validators/validators.dart';
 import 'package:test/test.dart';
 
-class _MockArgResults extends Mock implements ArgResults {}
-
-class _MockDoctor extends Mock implements Doctor {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockProcessResult extends Mock implements ShorebirdProcessResult {}
-
-class _MockShorebirdFlutterValidator extends Mock
-    implements ShorebirdFlutterValidator {}
-
-class _MockShorebirdProcess extends Mock implements ShorebirdProcess {}
-
-class _MockShorebirdValidator extends Mock implements ShorebirdValidator {}
-
-class _FakeShorebirdProcess extends Fake implements ShorebirdProcess {}
+import '../../fakes.dart';
+import '../../mocks.dart';
 
 void main() {
   group(BuildAppBundleCommand, () {
@@ -58,18 +42,18 @@ void main() {
     }
 
     setUpAll(() {
-      registerFallbackValue(_FakeShorebirdProcess());
+      registerFallbackValue(FakeShorebirdProcess());
     });
 
     setUp(() {
-      argResults = _MockArgResults();
-      doctor = _MockDoctor();
-      logger = _MockLogger();
-      buildProcessResult = _MockProcessResult();
-      flutterPubGetProcessResult = _MockProcessResult();
-      flutterValidator = _MockShorebirdFlutterValidator();
-      shorebirdProcess = _MockShorebirdProcess();
-      shorebirdValidator = _MockShorebirdValidator();
+      argResults = MockArgResults();
+      doctor = MockDoctor();
+      logger = MockLogger();
+      buildProcessResult = MockProcessResult();
+      flutterPubGetProcessResult = MockProcessResult();
+      flutterValidator = MockShorebirdFlutterValidator();
+      shorebirdProcess = MockShorebirdProcess();
+      shorebirdValidator = MockShorebirdValidator();
 
       when(
         () => shorebirdProcess.run(
@@ -89,7 +73,7 @@ void main() {
         ),
       ).thenAnswer((_) async => buildProcessResult);
       when(() => argResults.rest).thenReturn([]);
-      when(() => logger.progress(any())).thenReturn(_MockProgress());
+      when(() => logger.progress(any())).thenReturn(MockProgress());
       when(() => logger.info(any())).thenReturn(null);
       when(
         () => doctor.androidCommandValidators,

packages/shorebird_cli/test/src/commands/build/build_ipa_command_test.dart

@@ -14,24 +14,8 @@ import 'package:shorebird_cli/src/shorebird_validator.dart';
 import 'package:shorebird_cli/src/validators/validators.dart';
 import 'package:test/test.dart';
 
-class _MockArgResults extends Mock implements ArgResults {}
-
-class _MockDoctor extends Mock implements Doctor {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockProcessResult extends Mock implements ShorebirdProcessResult {}
-
-class _MockShorebirdFlutterValidator extends Mock
-    implements ShorebirdFlutterValidator {}
-
-class _MockShorebirdProcess extends Mock implements ShorebirdProcess {}
-
-class _MockShorebirdValidator extends Mock implements ShorebirdValidator {}
-
-class _FakeShorebirdProcess extends Fake implements ShorebirdProcess {}
+import '../../fakes.dart';
+import '../../mocks.dart';
 
 void main() {
   group(BuildIpaCommand, () {
@@ -58,18 +42,18 @@ void main() {
     }
 
     setUpAll(() {
-      registerFallbackValue(_FakeShorebirdProcess());
+      registerFallbackValue(FakeShorebirdProcess());
     });
 
     setUp(() {
-      argResults = _MockArgResults();
-      doctor = _MockDoctor();
-      logger = _MockLogger();
-      shorebirdProcess = _MockShorebirdProcess();
-      buildProcessResult = _MockProcessResult();
-      flutterPubGetProcessResult = _MockProcessResult();
-      flutterValidator = _MockShorebirdFlutterValidator();
-      shorebirdValidator = _MockShorebirdValidator();
+      argResults = MockArgResults();
+      doctor = MockDoctor();
+      logger = MockLogger();
+      shorebirdProcess = MockShorebirdProcess();
+      buildProcessResult = MockProcessResult();
+      flutterPubGetProcessResult = MockProcessResult();
+      flutterValidator = MockShorebirdFlutterValidator();
+      shorebirdValidator = MockShorebirdValidator();
 
       when(
         () => shorebirdProcess.run(
@@ -90,7 +74,7 @@ void main() {
       ).thenAnswer((_) async => buildProcessResult);
       when(() => argResults['codesign']).thenReturn(true);
       when(() => argResults.rest).thenReturn([]);
-      when(() => logger.progress(any())).thenReturn(_MockProgress());
+      when(() => logger.progress(any())).thenReturn(MockProgress());
       when(() => logger.info(any())).thenReturn(null);
       when(() => doctor.iosCommandValidators).thenReturn([flutterValidator]);
       when(

packages/shorebird_cli/test/src/commands/cache/clean_cache_command_test.dart

@@ -11,15 +11,7 @@ import 'package:shorebird_cli/src/platform.dart';
 import 'package:shorebird_cli/src/shorebird_env.dart';
 import 'package:test/test.dart';
 
-class _MockCache extends Mock implements Cache {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockPlatform extends Mock implements Platform {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
+import '../../mocks.dart';
 
 void main() {
   group('cache clean', () {
@@ -43,11 +35,11 @@ void main() {
     }
 
     setUp(() {
-      cache = _MockCache();
-      logger = _MockLogger();
-      platform = _MockPlatform();
-      progress = _MockProgress();
-      shorebirdEnv = _MockShorebirdEnv();
+      cache = MockCache();
+      logger = MockLogger();
+      platform = MockPlatform();
+      progress = MockProgress();
+      shorebirdEnv = MockShorebirdEnv();
       command = runWithOverrides(CleanCacheCommand.new);
 
       when(() => logger.progress(any())).thenReturn(progress);

packages/shorebird_cli/test/src/commands/collaborators/add_collaborators_command_test.dart

@@ -11,20 +11,7 @@ import 'package:shorebird_cli/src/shorebird_validator.dart';
 import 'package:shorebird_code_push_client/shorebird_code_push_client.dart';
 import 'package:test/test.dart';
 
-class _MockArgResults extends Mock implements ArgResults {}
-
-class _MockCodePushClientWrapper extends Mock
-    implements CodePushClientWrapper {}
-
-class _MockCodePushClient extends Mock implements CodePushClient {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
-
-class _MockShorebirdValidator extends Mock implements ShorebirdValidator {}
+import '../../mocks.dart';
 
 void main() {
   group(AddCollaboratorsCommand, () {
@@ -54,13 +41,13 @@ void main() {
     }
 
     setUp(() {
-      argResults = _MockArgResults();
-      codePushClientWrapper = _MockCodePushClientWrapper();
-      codePushClient = _MockCodePushClient();
-      logger = _MockLogger();
-      progress = _MockProgress();
-      shorebirdEnv = _MockShorebirdEnv();
-      shorebirdValidator = _MockShorebirdValidator();
+      argResults = MockArgResults();
+      codePushClientWrapper = MockCodePushClientWrapper();
+      codePushClient = MockCodePushClient();
+      logger = MockLogger();
+      progress = MockProgress();
+      shorebirdEnv = MockShorebirdEnv();
+      shorebirdValidator = MockShorebirdValidator();
 
       when(() => argResults['app-id']).thenReturn(appId);
       when(() => argResults['email']).thenReturn(email);

packages/shorebird_cli/test/src/commands/collaborators/delete_collaborators_command_test.dart

@@ -14,20 +14,7 @@ import 'package:shorebird_cli/src/shorebird_validator.dart';
 import 'package:shorebird_code_push_client/shorebird_code_push_client.dart';
 import 'package:test/test.dart';
 
-class _MockArgResults extends Mock implements ArgResults {}
-
-class _MockCodePushClientWrapper extends Mock
-    implements CodePushClientWrapper {}
-
-class _MockCodePushClient extends Mock implements CodePushClient {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
-
-class _MockShorebirdValidator extends Mock implements ShorebirdValidator {}
+import '../../mocks.dart';
 
 void main() {
   group(DeleteCollaboratorsCommand, () {
@@ -62,13 +49,13 @@ void main() {
     }
 
     setUp(() {
-      argResults = _MockArgResults();
-      codePushClientWrapper = _MockCodePushClientWrapper();
-      codePushClient = _MockCodePushClient();
-      logger = _MockLogger();
-      progress = _MockProgress();
-      shorebirdEnv = _MockShorebirdEnv();
-      shorebirdValidator = _MockShorebirdValidator();
+      argResults = MockArgResults();
+      codePushClientWrapper = MockCodePushClientWrapper();
+      codePushClient = MockCodePushClient();
+      logger = MockLogger();
+      progress = MockProgress();
+      shorebirdEnv = MockShorebirdEnv();
+      shorebirdValidator = MockShorebirdValidator();
 
       when(() => argResults['app-id']).thenReturn(appId);
       when(() => argResults['email']).thenReturn(email);

packages/shorebird_cli/test/src/commands/collaborators/list_collaborators_command_test.dart

@@ -11,18 +11,7 @@ import 'package:shorebird_cli/src/shorebird_validator.dart';
 import 'package:shorebird_code_push_client/shorebird_code_push_client.dart';
 import 'package:test/test.dart';
 
-class _MockArgResults extends Mock implements ArgResults {}
-
-class _MockCodePushClientWrapper extends Mock
-    implements CodePushClientWrapper {}
-
-class _MockCodePushClient extends Mock implements CodePushClient {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
-
-class _MockShorebirdValidator extends Mock implements ShorebirdValidator {}
+import '../../mocks.dart';
 
 void main() {
   group(ListCollaboratorsCommand, () {
@@ -50,12 +39,12 @@ void main() {
     }
 
     setUp(() {
-      argResults = _MockArgResults();
-      codePushClientWrapper = _MockCodePushClientWrapper();
-      codePushClient = _MockCodePushClient();
-      logger = _MockLogger();
-      shorebirdEnv = _MockShorebirdEnv();
-      shorebirdValidator = _MockShorebirdValidator();
+      argResults = MockArgResults();
+      codePushClientWrapper = MockCodePushClientWrapper();
+      codePushClient = MockCodePushClient();
+      logger = MockLogger();
+      shorebirdEnv = MockShorebirdEnv();
+      shorebirdValidator = MockShorebirdValidator();
 
       when(() => argResults['app-id']).thenReturn(appId);
       when(

packages/shorebird_cli/test/src/commands/doctor_command_test.dart

@@ -14,23 +14,7 @@ import 'package:shorebird_cli/src/validators/validators.dart';
 import 'package:shorebird_cli/src/version.dart';
 import 'package:test/test.dart';
 
-class _MockArgResults extends Mock implements ArgResults {}
-
-class _MockAndroidStudio extends Mock implements AndroidStudio {}
-
-class _MockAndroidSdk extends Mock implements AndroidSdk {}
-
-class _MockDoctor extends Mock implements Doctor {}
-
-class _MockJava extends Mock implements Java {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
-
-class _MockShorebirdFlutter extends Mock implements ShorebirdFlutter {}
-
-class _MockValidator extends Mock implements Validator {}
+import '../mocks.dart';
 
 void main() {
   group('doctor', () {
@@ -64,15 +48,15 @@ void main() {
     }
 
     setUp(() {
-      argResults = _MockArgResults();
-      androidStudio = _MockAndroidStudio();
-      androidSdk = _MockAndroidSdk();
-      doctor = _MockDoctor();
-      java = _MockJava();
-      logger = _MockLogger();
-      shorebirdEnv = _MockShorebirdEnv();
-      shorebirdFlutter = _MockShorebirdFlutter();
-      validator = _MockValidator();
+      argResults = MockArgResults();
+      androidStudio = MockAndroidStudio();
+      androidSdk = MockAndroidSdk();
+      doctor = MockDoctor();
+      java = MockJava();
+      logger = MockLogger();
+      shorebirdEnv = MockShorebirdEnv();
+      shorebirdFlutter = MockShorebirdFlutter();
+      validator = MockValidator();
 
       when(() => argResults['verbose']).thenReturn(false);
       when(() => argResults['fix']).thenReturn(false);

packages/shorebird_cli/test/src/commands/flutter/versions/flutter_versions_list_command_test.dart

@@ -8,11 +8,7 @@ import 'package:shorebird_cli/src/logger.dart';
 import 'package:shorebird_cli/src/shorebird_flutter.dart';
 import 'package:test/test.dart';
 
-class _MockLogger extends Mock implements Logger {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockShorebirdFlutter extends Mock implements ShorebirdFlutter {}
+import '../../../mocks.dart';
 
 void main() {
   group(FlutterVersionsListCommand, () {
@@ -32,9 +28,9 @@ void main() {
     }
 
     setUp(() {
-      progress = _MockProgress();
-      logger = _MockLogger();
-      shorebirdFlutter = _MockShorebirdFlutter();
+      progress = MockProgress();
+      logger = MockLogger();
+      shorebirdFlutter = MockShorebirdFlutter();
       command = runWithOverrides(FlutterVersionsListCommand.new);
 
       when(() => logger.progress(any())).thenReturn(progress);

packages/shorebird_cli/test/src/commands/flutter/versions/flutter_versions_use_command_test.dart

@@ -7,13 +7,7 @@ import 'package:shorebird_cli/src/logger.dart';
 import 'package:shorebird_cli/src/shorebird_flutter.dart';
 import 'package:test/test.dart';
 
-class _MockArgResults extends Mock implements ArgResults {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockShorebirdFlutter extends Mock implements ShorebirdFlutter {}
+import '../../../mocks.dart';
 
 void main() {
   group(FlutterVersionsUseCommand, () {
@@ -37,11 +31,11 @@ void main() {
     }
 
     setUp(() {
-      argResults = _MockArgResults();
+      argResults = MockArgResults();
       when(() => argResults.rest).thenReturn([version]);
-      progress = _MockProgress();
-      logger = _MockLogger();
-      shorebirdFlutter = _MockShorebirdFlutter();
+      progress = MockProgress();
+      logger = MockLogger();
+      shorebirdFlutter = MockShorebirdFlutter();
       command = runWithOverrides(FlutterVersionsUseCommand.new)
         ..testArgResults = argResults;
 

packages/shorebird_cli/test/src/commands/init_command_test.dart

@@ -20,30 +20,7 @@ import 'package:shorebird_cli/src/xcodebuild.dart';
 import 'package:shorebird_code_push_client/shorebird_code_push_client.dart';
 import 'package:test/test.dart';
 
-class _MockArgResults extends Mock implements ArgResults {}
-
-class _MockCodePushClientWrapper extends Mock
-    implements CodePushClientWrapper {}
-
-class _MockDoctor extends Mock implements Doctor {}
-
-class _MockGradlew extends Mock implements Gradlew {}
-
-class _MockFile extends Mock implements File {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockPlatform extends Mock implements Platform {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
-
-class _MockShorebirdYaml extends Mock implements ShorebirdYaml {}
-
-class _MockShorebirdValidator extends Mock implements ShorebirdValidator {}
-
-class _MockXcodeBuild extends Mock implements XcodeBuild {}
+import '../mocks.dart';
 
 void main() {
   group(InitCommand, () {
@@ -90,19 +67,19 @@ environment:
     }
 
     setUp(() {
-      argResults = _MockArgResults();
-      doctor = _MockDoctor();
-      gradlew = _MockGradlew();
-      codePushClientWrapper = _MockCodePushClientWrapper();
-      shorebirdYaml = _MockShorebirdYaml();
-      shorebirdYamlFile = _MockFile();
-      pubspecYamlFile = _MockFile();
-      logger = _MockLogger();
-      platform = _MockPlatform();
-      progress = _MockProgress();
-      shorebirdEnv = _MockShorebirdEnv();
-      shorebirdValidator = _MockShorebirdValidator();
-      xcodeBuild = _MockXcodeBuild();
+      argResults = MockArgResults();
+      doctor = MockDoctor();
+      gradlew = MockGradlew();
+      codePushClientWrapper = MockCodePushClientWrapper();
+      shorebirdYaml = MockShorebirdYaml();
+      shorebirdYamlFile = MockFile();
+      pubspecYamlFile = MockFile();
+      logger = MockLogger();
+      platform = MockPlatform();
+      progress = MockProgress();
+      shorebirdEnv = MockShorebirdEnv();
+      shorebirdValidator = MockShorebirdValidator();
+      xcodeBuild = MockXcodeBuild();
 
       when(
         () => codePushClientWrapper.createApp(appName: any(named: 'appName')),

packages/shorebird_cli/test/src/commands/login_ci_command_test.dart

@@ -1,4 +1,3 @@
-import 'package:googleapis_auth/googleapis_auth.dart';
 import 'package:http/http.dart' as http;
 import 'package:mason_logger/mason_logger.dart';
 import 'package:mocktail/mocktail.dart';
@@ -8,13 +7,7 @@ import 'package:shorebird_cli/src/commands/commands.dart';
 import 'package:shorebird_cli/src/logger.dart';
 import 'package:test/test.dart';
 
-class _MockAccessCredentials extends Mock implements AccessCredentials {}
-
-class _MockAuth extends Mock implements Auth {}
-
-class _MockHttpClient extends Mock implements http.Client {}
-
-class _MockLogger extends Mock implements Logger {}
+import '../mocks.dart';
 
 void main() {
   group(LoginCiCommand, () {
@@ -36,9 +29,9 @@ void main() {
     }
 
     setUp(() {
-      auth = _MockAuth();
-      httpClient = _MockHttpClient();
-      logger = _MockLogger();
+      auth = MockAuth();
+      httpClient = MockHttpClient();
+      logger = MockLogger();
 
       when(() => auth.client).thenReturn(httpClient);
       command = runWithOverrides(LoginCiCommand.new);
@@ -73,7 +66,7 @@ void main() {
 
     test('exits with code 0 when logged in successfully', () async {
       const token = 'shorebird-token';
-      final credentials = _MockAccessCredentials();
+      final credentials = MockAccessCredentials();
       when(() => credentials.refreshToken).thenReturn(token);
       when(() => auth.loginCI(any())).thenAnswer((_) async => credentials);
       when(() => auth.email).thenReturn(email);

packages/shorebird_cli/test/src/commands/login_command_test.dart

@@ -10,11 +10,7 @@ import 'package:shorebird_cli/src/commands/login_command.dart';
 import 'package:shorebird_cli/src/logger.dart';
 import 'package:test/test.dart';
 
-class _MockAuth extends Mock implements Auth {}
-
-class _MockHttpClient extends Mock implements http.Client {}
-
-class _MockLogger extends Mock implements Logger {}
+import '../mocks.dart';
 
 void main() {
   group(LoginCommand, () {
@@ -38,9 +34,9 @@ void main() {
 
     setUp(() {
       applicationConfigHome = Directory.systemTemp.createTempSync();
-      auth = _MockAuth();
-      httpClient = _MockHttpClient();
-      logger = _MockLogger();
+      auth = MockAuth();
+      httpClient = MockHttpClient();
+      logger = MockLogger();
 
       when(() => auth.client).thenReturn(httpClient);
       when(() => auth.credentialsFilePath).thenReturn(

packages/shorebird_cli/test/src/commands/logout_command_test.dart

@@ -7,13 +7,7 @@ import 'package:shorebird_cli/src/commands/logout_command.dart';
 import 'package:shorebird_cli/src/logger.dart';
 import 'package:test/test.dart';
 
-class _MockAuth extends Mock implements Auth {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockHttpClient extends Mock implements http.Client {}
-
-class _MockProgress extends Mock implements Progress {}
+import '../mocks.dart';
 
 void main() {
   group(LogoutCommand, () {
@@ -33,12 +27,12 @@ void main() {
     }
 
     setUp(() {
-      auth = _MockAuth();
-      httpClient = _MockHttpClient();
-      logger = _MockLogger();
+      auth = MockAuth();
+      httpClient = MockHttpClient();
+      logger = MockLogger();
 
       when(() => auth.client).thenReturn(httpClient);
-      when(() => logger.progress(any())).thenReturn(_MockProgress());
+      when(() => logger.progress(any())).thenReturn(MockProgress());
 
       command = runWithOverrides(LogoutCommand.new);
     });
@@ -56,7 +50,7 @@ void main() {
     test('exits with code 0 when logged out successfully', () async {
       when(() => auth.isAuthenticated).thenReturn(true);
 
-      final progress = _MockProgress();
+      final progress = MockProgress();
       when(() => progress.complete(any())).thenAnswer((invocation) {});
       when(() => logger.progress(any())).thenReturn(progress);
 

packages/shorebird_cli/test/src/commands/patch/patch_aar_command_test.dart

@@ -24,42 +24,8 @@ import 'package:shorebird_cli/src/shorebird_validator.dart';
 import 'package:shorebird_code_push_client/shorebird_code_push_client.dart';
 import 'package:test/test.dart';
 
-class _FakeBaseRequest extends Fake implements http.BaseRequest {}
-
-class _MockAndroidArchiveDiffer extends Mock implements AndroidArchiveDiffer {}
-
-class _MockArgResults extends Mock implements ArgResults {}
-
-class _MockAuth extends Mock implements Auth {}
-
-class _MockCache extends Mock implements Cache {}
-
-class _MockCodePushClientWrapper extends Mock
-    implements CodePushClientWrapper {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockPatchDiffChecker extends Mock implements PatchDiffChecker {}
-
-class _MockPlatform extends Mock implements Platform {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockProcessResult extends Mock implements ShorebirdProcessResult {}
-
-class _MockProcessWrapper extends Mock implements ProcessWrapper {}
-
-class _MockHttpClient extends Mock implements http.Client {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
-
-class _MockShorebirdFlutter extends Mock implements ShorebirdFlutter {}
-
-class _MockShorebirdProcess extends Mock implements ShorebirdProcess {}
-
-class _MockShorebirdValidator extends Mock implements ShorebirdValidator {}
-
-class _FakeShorebirdProcess extends Fake implements ShorebirdProcess {}
+import '../../fakes.dart';
+import '../../mocks.dart';
 
 void main() {
   group(PatchAarCommand, () {
@@ -177,32 +143,32 @@ void main() {
       registerFallbackValue(File(''));
       registerFallbackValue(FileSetDiff.empty());
       registerFallbackValue(Uri.parse('https://example.com'));
-      registerFallbackValue(_FakeBaseRequest());
-      registerFallbackValue(_FakeShorebirdProcess());
+      registerFallbackValue(FakeBaseRequest());
+      registerFallbackValue(FakeShorebirdProcess());
     });
 
     setUp(() {
-      archiveDiffer = _MockAndroidArchiveDiffer();
-      argResults = _MockArgResults();
-      auth = _MockAuth();
-      codePushClientWrapper = _MockCodePushClientWrapper();
+      archiveDiffer = MockAndroidArchiveDiffer();
+      argResults = MockArgResults();
+      auth = MockAuth();
+      codePushClientWrapper = MockCodePushClientWrapper();
       shorebirdRoot = Directory.systemTemp.createTempSync();
       flutterDirectory = Directory(
         p.join(shorebirdRoot.path, 'bin', 'cache', 'flutter'),
       );
-      patchDiffChecker = _MockPatchDiffChecker();
-      platform = _MockPlatform();
-      progress = _MockProgress();
-      logger = _MockLogger();
-      flutterBuildProcessResult = _MockProcessResult();
-      flutterPubGetProcessResult = _MockProcessResult();
-      patchProcessResult = _MockProcessResult();
-      httpClient = _MockHttpClient();
-      cache = _MockCache();
-      shorebirdEnv = _MockShorebirdEnv();
-      shorebirdFlutter = _MockShorebirdFlutter();
-      shorebirdProcess = _MockShorebirdProcess();
-      shorebirdValidator = _MockShorebirdValidator();
+      patchDiffChecker = MockPatchDiffChecker();
+      platform = MockPlatform();
+      progress = MockProgress();
+      logger = MockLogger();
+      flutterBuildProcessResult = MockProcessResult();
+      flutterPubGetProcessResult = MockProcessResult();
+      patchProcessResult = MockProcessResult();
+      httpClient = MockHttpClient();
+      cache = MockCache();
+      shorebirdEnv = MockShorebirdEnv();
+      shorebirdFlutter = MockShorebirdFlutter();
+      shorebirdProcess = MockShorebirdProcess();
+      shorebirdValidator = MockShorebirdValidator();
 
       registerFallbackValue(ReleasePlatform.android);
 
@@ -574,7 +540,7 @@ Please re-run the release command for this version or create a new release.'''),
       );
       const otherRevision = 'other-revision';
       when(() => shorebirdEnv.flutterRevision).thenReturn(otherRevision);
-      final processWrapper = _MockProcessWrapper();
+      final processWrapper = MockProcessWrapper();
       when(
         () => processWrapper.run(
           any(),

packages/shorebird_cli/test/src/commands/patch/patch_android_command_test.dart

@@ -28,49 +28,8 @@ import 'package:shorebird_cli/src/validators/validators.dart';
 import 'package:shorebird_code_push_client/shorebird_code_push_client.dart';
 import 'package:test/test.dart';
 
-class _FakeBaseRequest extends Fake implements http.BaseRequest {}
-
-class _MockAndroidArchiveDiffer extends Mock implements AndroidArchiveDiffer {}
-
-class _MockArgResults extends Mock implements ArgResults {}
-
-class _MockAuth extends Mock implements Auth {}
-
-class _MockBundleTool extends Mock implements Bundletool {}
-
-class _MockCache extends Mock implements Cache {}
-
-class _MockCodePushClientWrapper extends Mock
-    implements CodePushClientWrapper {}
-
-class _MockDoctor extends Mock implements Doctor {}
-
-class _MockJava extends Mock implements Java {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockPatchDiffChecker extends Mock implements PatchDiffChecker {}
-
-class _MockPlatform extends Mock implements Platform {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockProcessResult extends Mock implements ShorebirdProcessResult {}
-
-class _MockHttpClient extends Mock implements http.Client {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
-
-class _MockShorebirdFlutter extends Mock implements ShorebirdFlutter {}
-
-class _MockShorebirdFlutterValidator extends Mock
-    implements ShorebirdFlutterValidator {}
-
-class _MockShorebirdProcess extends Mock implements ShorebirdProcess {}
-
-class _MockShorebirdValidator extends Mock implements ShorebirdValidator {}
-
-class _FakeShorebirdProcess extends Fake implements ShorebirdProcess {}
+import '../../fakes.dart';
+import '../../mocks.dart';
 
 void main() {
   group(PatchAndroidCommand, () {
@@ -203,36 +162,36 @@ flutter:
       registerFallbackValue(FileSetDiff.empty());
       registerFallbackValue(Uri.parse('https://example.com'));
       registerFallbackValue(ReleasePlatform.android);
-      registerFallbackValue(_FakeBaseRequest());
-      registerFallbackValue(_FakeShorebirdProcess());
+      registerFallbackValue(FakeBaseRequest());
+      registerFallbackValue(FakeShorebirdProcess());
     });
 
     setUp(() {
-      archiveDiffer = _MockAndroidArchiveDiffer();
-      argResults = _MockArgResults();
-      auth = _MockAuth();
-      bundletool = _MockBundleTool();
-      codePushClientWrapper = _MockCodePushClientWrapper();
-      doctor = _MockDoctor();
-      java = _MockJava();
+      archiveDiffer = MockAndroidArchiveDiffer();
+      argResults = MockArgResults();
+      auth = MockAuth();
+      bundletool = MockBundleTool();
+      codePushClientWrapper = MockCodePushClientWrapper();
+      doctor = MockDoctor();
+      java = MockJava();
       shorebirdRoot = Directory.systemTemp.createTempSync();
       flutterDirectory = Directory(
         p.join(shorebirdRoot.path, 'bin', 'cache', 'flutter'),
       );
-      patchDiffChecker = _MockPatchDiffChecker();
-      platform = _MockPlatform();
-      progress = _MockProgress();
-      logger = _MockLogger();
-      flutterBuildProcessResult = _MockProcessResult();
-      flutterPubGetProcessResult = _MockProcessResult();
-      patchProcessResult = _MockProcessResult();
-      httpClient = _MockHttpClient();
-      flutterValidator = _MockShorebirdFlutterValidator();
-      cache = _MockCache();
-      shorebirdEnv = _MockShorebirdEnv();
-      shorebirdProcess = _MockShorebirdProcess();
-      shorebirdFlutter = _MockShorebirdFlutter();
-      shorebirdValidator = _MockShorebirdValidator();
+      patchDiffChecker = MockPatchDiffChecker();
+      platform = MockPlatform();
+      progress = MockProgress();
+      logger = MockLogger();
+      flutterBuildProcessResult = MockProcessResult();
+      flutterPubGetProcessResult = MockProcessResult();
+      patchProcessResult = MockProcessResult();
+      httpClient = MockHttpClient();
+      flutterValidator = MockShorebirdFlutterValidator();
+      cache = MockCache();
+      shorebirdEnv = MockShorebirdEnv();
+      shorebirdProcess = MockShorebirdProcess();
+      shorebirdFlutter = MockShorebirdFlutter();
+      shorebirdValidator = MockShorebirdValidator();
       command = runWithOverrides(
         () => PatchAndroidCommand(
           archiveDiffer: archiveDiffer,

packages/shorebird_cli/test/src/commands/patch/patch_ios_command_test.dart

@@ -26,43 +26,8 @@ import 'package:shorebird_cli/src/validators/validators.dart';
 import 'package:shorebird_code_push_client/shorebird_code_push_client.dart';
 import 'package:test/test.dart';
 
-class _FakeBaseRequest extends Fake implements http.BaseRequest {}
-
-class _MockArgResults extends Mock implements ArgResults {}
-
-class _MockAuth extends Mock implements Auth {}
-
-class _MockCodePushClientWrapper extends Mock
-    implements CodePushClientWrapper {}
-
-class _MockDoctor extends Mock implements Doctor {}
-
-class _MockIpaDiffer extends Mock implements IosArchiveDiffer {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockPatchDiffChecker extends Mock implements PatchDiffChecker {}
-
-class _MockPlatform extends Mock implements Platform {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockProcessResult extends Mock implements ShorebirdProcessResult {}
-
-class _MockHttpClient extends Mock implements http.Client {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
-
-class _MockShorebirdFlutter extends Mock implements ShorebirdFlutter {}
-
-class _MockShorebirdFlutterValidator extends Mock
-    implements ShorebirdFlutterValidator {}
-
-class _MockShorebirdProcess extends Mock implements ShorebirdProcess {}
-
-class _MockShorebirdValidator extends Mock implements ShorebirdValidator {}
-
-class _FakeShorebirdProcess extends Fake implements ShorebirdProcess {}
+import '../../fakes.dart';
+import '../../mocks.dart';
 
 void main() {
   const flutterRevision = '83305b5088e6fe327fb3334a73ff190828d85713';
@@ -235,15 +200,15 @@ flutter:
       registerFallbackValue(FileSetDiff.empty());
       registerFallbackValue(ReleasePlatform.ios);
       registerFallbackValue(Uri.parse('https://example.com'));
-      registerFallbackValue(_FakeBaseRequest());
-      registerFallbackValue(_FakeShorebirdProcess());
+      registerFallbackValue(FakeBaseRequest());
+      registerFallbackValue(FakeShorebirdProcess());
     });
 
     setUp(() {
-      argResults = _MockArgResults();
-      auth = _MockAuth();
-      codePushClientWrapper = _MockCodePushClientWrapper();
-      doctor = _MockDoctor();
+      argResults = MockArgResults();
+      auth = MockAuth();
+      codePushClientWrapper = MockCodePushClientWrapper();
+      doctor = MockDoctor();
       shorebirdRoot = Directory.systemTemp.createTempSync();
       flutterDirectory = Directory(
         p.join(shorebirdRoot.path, 'bin', 'cache', 'flutter'),
@@ -259,20 +224,20 @@ flutter:
           'gen_snapshot_arm64',
         ),
       );
-      archiveDiffer = _MockIpaDiffer();
-      progress = _MockProgress();
-      logger = _MockLogger();
-      platform = _MockPlatform();
-      aotBuildProcessResult = _MockProcessResult();
-      flutterBuildProcessResult = _MockProcessResult();
-      flutterPubGetProcessResult = _MockProcessResult();
-      httpClient = _MockHttpClient();
-      patchDiffChecker = _MockPatchDiffChecker();
-      shorebirdEnv = _MockShorebirdEnv();
-      shorebirdFlutter = _MockShorebirdFlutter();
-      flutterValidator = _MockShorebirdFlutterValidator();
-      shorebirdProcess = _MockShorebirdProcess();
-      shorebirdValidator = _MockShorebirdValidator();
+      archiveDiffer = MockIosArchiveDiffer();
+      progress = MockProgress();
+      logger = MockLogger();
+      platform = MockPlatform();
+      aotBuildProcessResult = MockProcessResult();
+      flutterBuildProcessResult = MockProcessResult();
+      flutterPubGetProcessResult = MockProcessResult();
+      httpClient = MockHttpClient();
+      patchDiffChecker = MockPatchDiffChecker();
+      shorebirdEnv = MockShorebirdEnv();
+      shorebirdFlutter = MockShorebirdFlutter();
+      flutterValidator = MockShorebirdFlutterValidator();
+      shorebirdProcess = MockShorebirdProcess();
+      shorebirdValidator = MockShorebirdValidator();
 
       when(() => argResults['arch']).thenReturn(arch);
       when(() => argResults['dry-run']).thenReturn(false);

packages/shorebird_cli/test/src/commands/patch/patch_ios_framework_command_test.dart

@@ -23,39 +23,7 @@ import 'package:shorebird_cli/src/validators/validators.dart';
 import 'package:shorebird_code_push_client/shorebird_code_push_client.dart';
 import 'package:test/test.dart';
 
-class _MockArgResults extends Mock implements ArgResults {}
-
-class _MockAuth extends Mock implements Auth {}
-
-class _MockCodePushClientWrapper extends Mock
-    implements CodePushClientWrapper {}
-
-class _MockDoctor extends Mock implements Doctor {}
-
-class _MockIosArchiveDiffer extends Mock implements IosArchiveDiffer {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockPatchDiffChecker extends Mock implements PatchDiffChecker {}
-
-class _MockPlatform extends Mock implements Platform {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockProcessResult extends Mock implements ShorebirdProcessResult {}
-
-class _MockProcessWrapper extends Mock implements ProcessWrapper {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
-
-class _MockShorebirdFlutterValidator extends Mock
-    implements ShorebirdFlutterValidator {}
-
-class _MockShorebirdFlutter extends Mock implements ShorebirdFlutter {}
-
-class _MockShorebirdProcess extends Mock implements ShorebirdProcess {}
-
-class _MockShorebirdValidator extends Mock implements ShorebirdValidator {}
+import '../../mocks.dart';
 
 void main() {
   group(PatchIosFrameworkCommand, () {
@@ -186,12 +154,12 @@ flutter:
     });
 
     setUp(() {
-      argResults = _MockArgResults();
-      archiveDiffer = _MockIosArchiveDiffer();
-      codePushClientWrapper = _MockCodePushClientWrapper();
-      doctor = _MockDoctor();
-      patchDiffChecker = _MockPatchDiffChecker();
-      platform = _MockPlatform();
+      argResults = MockArgResults();
+      archiveDiffer = MockIosArchiveDiffer();
+      codePushClientWrapper = MockCodePushClientWrapper();
+      doctor = MockDoctor();
+      patchDiffChecker = MockPatchDiffChecker();
+      platform = MockPlatform();
       shorebirdRoot = Directory.systemTemp.createTempSync();
       flutterDirectory = Directory(
         p.join(shorebirdRoot.path, 'bin', 'cache', 'flutter'),
@@ -207,17 +175,17 @@ flutter:
           'gen_snapshot_arm64',
         ),
       );
-      auth = _MockAuth();
-      progress = _MockProgress();
-      logger = _MockLogger();
-      aotBuildProcessResult = _MockProcessResult();
-      flutterBuildProcessResult = _MockProcessResult();
-      flutterPubGetProcessResult = _MockProcessResult();
-      shorebirdEnv = _MockShorebirdEnv();
-      shorebirdFlutter = _MockShorebirdFlutter();
-      flutterValidator = _MockShorebirdFlutterValidator();
-      shorebirdProcess = _MockShorebirdProcess();
-      shorebirdValidator = _MockShorebirdValidator();
+      auth = MockAuth();
+      progress = MockProgress();
+      logger = MockLogger();
+      aotBuildProcessResult = MockProcessResult();
+      flutterBuildProcessResult = MockProcessResult();
+      flutterPubGetProcessResult = MockProcessResult();
+      shorebirdEnv = MockShorebirdEnv();
+      shorebirdFlutter = MockShorebirdFlutter();
+      flutterValidator = MockShorebirdFlutterValidator();
+      shorebirdProcess = MockShorebirdProcess();
+      shorebirdValidator = MockShorebirdValidator();
 
       when(
         () => shorebirdProcess.run(
@@ -512,7 +480,7 @@ Please re-run the release command for this version or create a new release.'''),
       );
       const otherRevision = 'other-revision';
       when(() => shorebirdEnv.flutterRevision).thenReturn(otherRevision);
-      final processWrapper = _MockProcessWrapper();
+      final processWrapper = MockProcessWrapper();
       when(
         () => processWrapper.run(
           any(),

packages/shorebird_cli/test/src/commands/preview_command_test.dart

@@ -20,40 +20,7 @@ import 'package:shorebird_cli/src/shorebird_validator.dart';
 import 'package:shorebird_code_push_client/shorebird_code_push_client.dart';
 import 'package:test/test.dart';
 
-class _MockAdb extends Mock implements Adb {}
-
-class _MockAppMetadata extends Mock implements AppMetadata {}
-
-class _MockArgResults extends Mock implements ArgResults {}
-
-class _MockAuth extends Mock implements Auth {}
-
-class _MockBundletool extends Mock implements Bundletool {}
-
-class _MockCache extends Mock implements Cache {}
-
-class _MockCodePushClientWrapper extends Mock
-    implements CodePushClientWrapper {}
-
-class _MockHttpClient extends Mock implements HttpClient {}
-
-class _MockHttpClientRequest extends Mock implements HttpClientRequest {}
-
-class _MockHttpClientResponse extends Mock implements HttpClientResponse {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockProcess extends Mock implements Process {}
-
-class _MockRelease extends Mock implements Release {}
-
-class _MockReleaseArtifact extends Mock implements ReleaseArtifact {}
-
-class _MockIOSDeploy extends Mock implements IOSDeploy {}
-
-class _MockShorebirdValidator extends Mock implements ShorebirdValidator {}
+import '../mocks.dart';
 
 void main() {
   group(PreviewCommand, () {
@@ -101,20 +68,20 @@ void main() {
     });
 
     setUp(() {
-      app = _MockAppMetadata();
-      argResults = _MockArgResults();
-      auth = _MockAuth();
-      cache = _MockCache();
-      codePushClientWrapper = _MockCodePushClientWrapper();
-      httpClient = _MockHttpClient();
-      httpClientRequest = _MockHttpClientRequest();
-      httpClientResponse = _MockHttpClientResponse();
-      logger = _MockLogger();
+      app = MockAppMetadata();
+      argResults = MockArgResults();
+      auth = MockAuth();
+      cache = MockCache();
+      codePushClientWrapper = MockCodePushClientWrapper();
+      httpClient = MockIoHttpClient();
+      httpClientRequest = MockHttpClientRequest();
+      httpClientResponse = MockHttpClientResponse();
+      logger = MockLogger();
       previewDirectory = Directory.systemTemp.createTempSync();
-      progress = _MockProgress();
-      release = _MockRelease();
-      releaseArtifact = _MockReleaseArtifact();
-      shorebirdValidator = _MockShorebirdValidator();
+      progress = MockProgress();
+      release = MockRelease();
+      releaseArtifact = MockReleaseArtifact();
+      shorebirdValidator = MockShorebirdValidator();
       command = PreviewCommand()..testArgResults = argResults;
 
       when(() => argResults['app-id']).thenReturn(appId);
@@ -231,9 +198,9 @@ void main() {
       }
 
       setUp(() {
-        adb = _MockAdb();
-        bundletool = _MockBundletool();
-        process = _MockProcess();
+        adb = MockAdb();
+        bundletool = MockBundleTool();
+        process = MockProcess();
 
         when(() => argResults['platform']).thenReturn(platform.name);
         when(
@@ -573,7 +540,7 @@ void main() {
       }
 
       setUp(() {
-        iosDeploy = _MockIOSDeploy();
+        iosDeploy = MockIOSDeploy();
         when(() => argResults['platform']).thenReturn(platform.name);
         when(
           () => httpClient.getUrl(any()),

packages/shorebird_cli/test/src/commands/release/release_aar_command_test.dart

@@ -21,34 +21,8 @@ import 'package:shorebird_cli/src/shorebird_validator.dart';
 import 'package:shorebird_code_push_client/shorebird_code_push_client.dart';
 import 'package:test/test.dart';
 
-class _MockArgResults extends Mock implements ArgResults {}
-
-class _MockHttpClient extends Mock implements http.Client {}
-
-class _MockAuth extends Mock implements Auth {}
-
-class _MockJava extends Mock implements Java {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockPlatform extends Mock implements Platform {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockProcessResult extends Mock implements ShorebirdProcessResult {}
-
-class _MockCodePushClientWrapper extends Mock
-    implements CodePushClientWrapper {}
-
-class _MockShorebirdProcess extends Mock implements ShorebirdProcess {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
-
-class _MockShorebirdValidator extends Mock implements ShorebirdValidator {}
-
-class _FakeRelease extends Fake implements Release {}
-
-class _FakeShorebirdProcess extends Fake implements ShorebirdProcess {}
+import '../../fakes.dart';
+import '../../mocks.dart';
 
 void main() {
   group(ReleaseAarCommand, () {
@@ -138,25 +112,25 @@ void main() {
     setUpAll(() {
       registerFallbackValue(ReleasePlatform.android);
       registerFallbackValue(ReleaseStatus.draft);
-      registerFallbackValue(_FakeRelease());
-      registerFallbackValue(_FakeShorebirdProcess());
+      registerFallbackValue(FakeRelease());
+      registerFallbackValue(FakeShorebirdProcess());
     });
 
     setUp(() {
-      argResults = _MockArgResults();
-      httpClient = _MockHttpClient();
-      auth = _MockAuth();
-      codePushClientWrapper = _MockCodePushClientWrapper();
-      java = _MockJava();
-      platform = _MockPlatform();
-      progress = _MockProgress();
-      logger = _MockLogger();
-      flutterBuildProcessResult = _MockProcessResult();
-      flutterPubGetProcessResult = _MockProcessResult();
-      shorebirdProcess = _MockShorebirdProcess();
+      argResults = MockArgResults();
+      httpClient = MockHttpClient();
+      auth = MockAuth();
+      codePushClientWrapper = MockCodePushClientWrapper();
+      java = MockJava();
+      platform = MockPlatform();
+      progress = MockProgress();
+      logger = MockLogger();
+      flutterBuildProcessResult = MockProcessResult();
+      flutterPubGetProcessResult = MockProcessResult();
+      shorebirdProcess = MockShorebirdProcess();
       shorebirdRoot = Directory.systemTemp.createTempSync();
-      shorebirdEnv = _MockShorebirdEnv();
-      shorebirdValidator = _MockShorebirdValidator();
+      shorebirdEnv = MockShorebirdEnv();
+      shorebirdValidator = MockShorebirdValidator();
 
       when(() => auth.client).thenReturn(httpClient);
       when(() => argResults['build-number']).thenReturn(buildNumber);

packages/shorebird_cli/test/src/commands/release/release_android_command_test.dart

@@ -24,43 +24,8 @@ import 'package:shorebird_cli/src/validators/validators.dart';
 import 'package:shorebird_code_push_client/shorebird_code_push_client.dart';
 import 'package:test/test.dart';
 
-class _MockArgResults extends Mock implements ArgResults {}
-
-class _MockHttpClient extends Mock implements http.Client {}
-
-class _MockAuth extends Mock implements Auth {}
-
-class _MockBundleTool extends Mock implements Bundletool {}
-
-class _MockCache extends Mock implements Cache {}
-
-class _MockCodePushClientWrapper extends Mock
-    implements CodePushClientWrapper {}
-
-class _MockDoctor extends Mock implements Doctor {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockPlatform extends Mock implements Platform {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockProcessResult extends Mock implements ShorebirdProcessResult {}
-
-class _MockShorebirdFlutterValidator extends Mock
-    implements ShorebirdFlutterValidator {}
-
-class _MockShorebirdProcess extends Mock implements ShorebirdProcess {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
-
-class _MockShorebirdValidator extends Mock implements ShorebirdValidator {}
-
-class _MockJava extends Mock implements Java {}
-
-class _FakeRelease extends Fake implements Release {}
-
-class _FakeShorebirdProcess extends Fake implements ShorebirdProcess {}
+import '../../fakes.dart';
+import '../../mocks.dart';
 
 void main() {
   group(ReleaseAndroidCommand, () {
@@ -128,29 +93,29 @@ void main() {
     setUpAll(() {
       registerFallbackValue(ReleasePlatform.android);
       registerFallbackValue(ReleaseStatus.draft);
-      registerFallbackValue(_FakeRelease());
-      registerFallbackValue(_FakeShorebirdProcess());
+      registerFallbackValue(FakeRelease());
+      registerFallbackValue(FakeShorebirdProcess());
     });
 
     setUp(() {
-      argResults = _MockArgResults();
-      bundletool = _MockBundleTool();
-      codePushClientWrapper = _MockCodePushClientWrapper();
-      doctor = _MockDoctor();
-      httpClient = _MockHttpClient();
-      platform = _MockPlatform();
+      argResults = MockArgResults();
+      bundletool = MockBundleTool();
+      codePushClientWrapper = MockCodePushClientWrapper();
+      doctor = MockDoctor();
+      httpClient = MockHttpClient();
+      platform = MockPlatform();
       shorebirdRoot = Directory.systemTemp.createTempSync();
-      auth = _MockAuth();
-      cache = _MockCache();
-      java = _MockJava();
-      progress = _MockProgress();
-      logger = _MockLogger();
-      flutterBuildProcessResult = _MockProcessResult();
-      flutterPubGetProcessResult = _MockProcessResult();
-      flutterValidator = _MockShorebirdFlutterValidator();
-      shorebirdProcess = _MockShorebirdProcess();
-      shorebirdEnv = _MockShorebirdEnv();
-      shorebirdValidator = _MockShorebirdValidator();
+      auth = MockAuth();
+      cache = MockCache();
+      java = MockJava();
+      progress = MockProgress();
+      logger = MockLogger();
+      flutterBuildProcessResult = MockProcessResult();
+      flutterPubGetProcessResult = MockProcessResult();
+      flutterValidator = MockShorebirdFlutterValidator();
+      shorebirdProcess = MockShorebirdProcess();
+      shorebirdEnv = MockShorebirdEnv();
+      shorebirdValidator = MockShorebirdValidator();
 
       when(() => shorebirdEnv.getShorebirdYaml()).thenReturn(shorebirdYaml);
       when(() => shorebirdEnv.shorebirdRoot).thenReturn(shorebirdRoot);

packages/shorebird_cli/test/src/commands/release/release_ios_command_test.dart

@@ -21,35 +21,8 @@ import 'package:shorebird_cli/src/validators/validators.dart';
 import 'package:shorebird_code_push_client/shorebird_code_push_client.dart';
 import 'package:test/test.dart';
 
-class _MockArgResults extends Mock implements ArgResults {}
-
-class _MockAuth extends Mock implements Auth {}
-
-class _MockCodePushClientWrapper extends Mock
-    implements CodePushClientWrapper {}
-
-class _MockDoctor extends Mock implements Doctor {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockPlatform extends Mock implements Platform {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockProcessResult extends Mock implements ShorebirdProcessResult {}
-
-class _MockShorebirdFlutterValidator extends Mock
-    implements ShorebirdFlutterValidator {}
-
-class _MockShorebirdProcess extends Mock implements ShorebirdProcess {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
-
-class _MockShorebirdValidator extends Mock implements ShorebirdValidator {}
-
-class _FakeRelease extends Fake implements Release {}
-
-class _FakeShorebirdProcess extends Fake implements ShorebirdProcess {}
+import '../../fakes.dart';
+import '../../mocks.dart';
 
 void main() {
   group(ReleaseIosCommand, () {
@@ -192,25 +165,25 @@ flutter:
     setUpAll(() {
       registerFallbackValue(ReleasePlatform.ios);
       registerFallbackValue(ReleaseStatus.draft);
-      registerFallbackValue(_FakeRelease());
-      registerFallbackValue(_FakeShorebirdProcess());
+      registerFallbackValue(FakeRelease());
+      registerFallbackValue(FakeShorebirdProcess());
     });
 
     setUp(() {
-      argResults = _MockArgResults();
-      codePushClientWrapper = _MockCodePushClientWrapper();
-      doctor = _MockDoctor();
-      platform = _MockPlatform();
+      argResults = MockArgResults();
+      codePushClientWrapper = MockCodePushClientWrapper();
+      doctor = MockDoctor();
+      platform = MockPlatform();
       shorebirdRoot = Directory.systemTemp.createTempSync();
-      auth = _MockAuth();
-      progress = _MockProgress();
-      logger = _MockLogger();
-      flutterBuildProcessResult = _MockProcessResult();
-      flutterPubGetProcessResult = _MockProcessResult();
-      flutterValidator = _MockShorebirdFlutterValidator();
-      shorebirdProcess = _MockShorebirdProcess();
-      shorebirdEnv = _MockShorebirdEnv();
-      shorebirdValidator = _MockShorebirdValidator();
+      auth = MockAuth();
+      progress = MockProgress();
+      logger = MockLogger();
+      flutterBuildProcessResult = MockProcessResult();
+      flutterPubGetProcessResult = MockProcessResult();
+      flutterValidator = MockShorebirdFlutterValidator();
+      shorebirdProcess = MockShorebirdProcess();
+      shorebirdEnv = MockShorebirdEnv();
+      shorebirdValidator = MockShorebirdValidator();
 
       when(() => shorebirdEnv.getShorebirdYaml()).thenReturn(shorebirdYaml);
       when(() => shorebirdEnv.shorebirdRoot).thenReturn(shorebirdRoot);

packages/shorebird_cli/test/src/commands/release/release_ios_framework_command_test.dart

@@ -20,35 +20,8 @@ import 'package:shorebird_cli/src/validators/validators.dart';
 import 'package:shorebird_code_push_client/shorebird_code_push_client.dart';
 import 'package:test/test.dart';
 
-class _MockArgResults extends Mock implements ArgResults {}
-
-class _MockAuth extends Mock implements Auth {}
-
-class _MockCodePushClientWrapper extends Mock
-    implements CodePushClientWrapper {}
-
-class _MockDoctor extends Mock implements Doctor {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockPlatform extends Mock implements Platform {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockProcessResult extends Mock implements ShorebirdProcessResult {}
-
-class _MockShorebirdFlutterValidator extends Mock
-    implements ShorebirdFlutterValidator {}
-
-class _MockShorebirdProcess extends Mock implements ShorebirdProcess {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
-
-class _MockShorebirdValidator extends Mock implements ShorebirdValidator {}
-
-class _FakeRelease extends Fake implements Release {}
-
-class _FakeShorebirdProcess extends Fake implements ShorebirdProcess {}
+import '../../fakes.dart';
+import '../../mocks.dart';
 
 void main() {
   group(ReleaseIosFrameworkCommand, () {
@@ -126,25 +99,25 @@ flutter:
       registerFallbackValue(Directory(''));
       registerFallbackValue(ReleasePlatform.ios);
       registerFallbackValue(ReleaseStatus.draft);
-      registerFallbackValue(_FakeRelease());
-      registerFallbackValue(_FakeShorebirdProcess());
+      registerFallbackValue(FakeRelease());
+      registerFallbackValue(FakeShorebirdProcess());
     });
 
     setUp(() {
-      argResults = _MockArgResults();
-      codePushClientWrapper = _MockCodePushClientWrapper();
-      doctor = _MockDoctor();
-      platform = _MockPlatform();
+      argResults = MockArgResults();
+      codePushClientWrapper = MockCodePushClientWrapper();
+      doctor = MockDoctor();
+      platform = MockPlatform();
       shorebirdRoot = Directory.systemTemp.createTempSync();
-      auth = _MockAuth();
-      progress = _MockProgress();
-      logger = _MockLogger();
-      flutterBuildProcessResult = _MockProcessResult();
-      flutterPubGetProcessResult = _MockProcessResult();
-      flutterValidator = _MockShorebirdFlutterValidator();
-      shorebirdProcess = _MockShorebirdProcess();
-      shorebirdEnv = _MockShorebirdEnv();
-      shorebirdValidator = _MockShorebirdValidator();
+      auth = MockAuth();
+      progress = MockProgress();
+      logger = MockLogger();
+      flutterBuildProcessResult = MockProcessResult();
+      flutterPubGetProcessResult = MockProcessResult();
+      flutterValidator = MockShorebirdFlutterValidator();
+      shorebirdProcess = MockShorebirdProcess();
+      shorebirdEnv = MockShorebirdEnv();
+      shorebirdValidator = MockShorebirdValidator();
 
       when(() => shorebirdEnv.getShorebirdYaml()).thenReturn(shorebirdYaml);
       when(() => shorebirdEnv.shorebirdRoot).thenReturn(shorebirdRoot);

packages/shorebird_cli/test/src/commands/run_command_test.dart

@@ -14,23 +14,7 @@ import 'package:shorebird_cli/src/shorebird_validator.dart';
 import 'package:shorebird_cli/src/validators/validators.dart';
 import 'package:test/test.dart';
 
-class _MockArgResults extends Mock implements ArgResults {}
-
-class _MockDoctor extends Mock implements Doctor {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockProcess extends Mock implements Process {}
-
-class _MockShorebirdProcess extends Mock implements ShorebirdProcess {}
-
-class _MockIOSink extends Mock implements IOSink {}
-
-class _MockShorebirdValidator extends Mock implements ShorebirdValidator {}
-
-class _MockValidator extends Mock implements Validator {}
+import '../mocks.dart';
 
 void main() {
   group(RunCommand, () {
@@ -61,14 +45,14 @@ void main() {
     });
 
     setUp(() {
-      argResults = _MockArgResults();
-      doctor = _MockDoctor();
-      logger = _MockLogger();
-      process = _MockProcess();
-      shorebirdProcess = _MockShorebirdProcess();
-      ioSink = _MockIOSink();
-      shorebirdValidator = _MockShorebirdValidator();
-      validator = _MockValidator();
+      argResults = MockArgResults();
+      doctor = MockDoctor();
+      logger = MockLogger();
+      process = MockProcess();
+      shorebirdProcess = MockShorebirdProcess();
+      ioSink = MockIOSink();
+      shorebirdValidator = MockShorebirdValidator();
+      validator = MockValidator();
 
       when(
         () => shorebirdProcess.start(
@@ -79,7 +63,7 @@ void main() {
       ).thenAnswer((_) async => process);
       when(() => argResults.rest).thenReturn([]);
       when(() => doctor.allValidators).thenReturn([validator]);
-      when(() => logger.progress(any())).thenReturn(_MockProgress());
+      when(() => logger.progress(any())).thenReturn(MockProgress());
       when(() => ioSink.addStream(any())).thenAnswer((_) async {});
       when(
         () => shorebirdValidator.validatePreconditions(
@@ -132,7 +116,7 @@ Please use "shorebird preview" instead.'''),
     test('exits with code when running the app fails', () async {
       final tempDir = Directory.systemTemp.createTempSync();
 
-      final progress = _MockProgress();
+      final progress = MockProgress();
       when(() => logger.progress(any())).thenReturn(progress);
 
       const error = 'oops something went wrong';
@@ -158,7 +142,7 @@ Please use "shorebird preview" instead.'''),
     test('exits with code 0 when running the app succeeds', () async {
       final tempDir = Directory.systemTemp.createTempSync();
 
-      final progress = _MockProgress();
+      final progress = MockProgress();
       when(() => logger.progress(any())).thenReturn(progress);
 
       const output = 'some output';
@@ -184,7 +168,7 @@ Please use "shorebird preview" instead.'''),
     test('passes additional args when specified', () async {
       final tempDir = Directory.systemTemp.createTempSync();
 
-      final progress = _MockProgress();
+      final progress = MockProgress();
       when(() => logger.progress(any())).thenReturn(progress);
 
       const deviceId = 'test-device-id';

packages/shorebird_cli/test/src/commands/upgrade_command_test.dart

@@ -8,11 +8,7 @@ import 'package:shorebird_cli/src/logger.dart';
 import 'package:shorebird_cli/src/shorebird_version.dart';
 import 'package:test/test.dart';
 
-class _MockLogger extends Mock implements Logger {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockShorebirdVersion extends Mock implements ShorebirdVersion {}
+import '../mocks.dart';
 
 void main() {
   const currentShorebirdRevision = 'revision-1';
@@ -34,11 +30,11 @@ void main() {
     }
 
     setUp(() {
-      final progress = _MockProgress();
+      final progress = MockProgress();
       final progressLogs = <String>[];
 
-      logger = _MockLogger();
-      shorebirdVersion = _MockShorebirdVersion();
+      logger = MockLogger();
+      shorebirdVersion = MockShorebirdVersion();
       command = runWithOverrides(UpgradeCommand.new);
 
       when(
@@ -121,7 +117,7 @@ void main() {
     test(
       'updates when newer version exists',
       () async {
-        when(() => logger.progress(any())).thenReturn(_MockProgress());
+        when(() => logger.progress(any())).thenReturn(MockProgress());
 
         final result = await runWithOverrides(command.run);
 
@@ -136,7 +132,7 @@ void main() {
       () async {
         when(shorebirdVersion.fetchLatestGitHash)
             .thenAnswer((_) async => currentShorebirdRevision);
-        when(() => logger.progress(any())).thenReturn(_MockProgress());
+        when(() => logger.progress(any())).thenReturn(MockProgress());
 
         final result = await runWithOverrides(command.run);
 

packages/shorebird_cli/test/src/doctor_test.dart

@@ -6,11 +6,7 @@ import 'package:shorebird_cli/src/logger.dart';
 import 'package:shorebird_cli/src/validators/validators.dart';
 import 'package:test/test.dart';
 
-class _MockLogger extends Mock implements Logger {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockValidator extends Mock implements Validator {}
+import 'mocks.dart';
 
 void main() {
   group(Doctor, () {
@@ -40,11 +36,11 @@ void main() {
     }
 
     setUp(() {
-      logger = _MockLogger();
-      progress = _MockProgress();
-      noIssuesValidator = _MockValidator();
-      warningValidator = _MockValidator();
-      errorValidator = _MockValidator();
+      logger = MockLogger();
+      progress = MockProgress();
+      noIssuesValidator = MockValidator();
+      warningValidator = MockValidator();
+      errorValidator = MockValidator();
 
       doctor = Doctor();
 
@@ -138,7 +134,7 @@ void main() {
 
         setUp(() {
           wasFixCalled = false;
-          fixableWarningValidator = _MockValidator();
+          fixableWarningValidator = MockValidator();
 
           when(fixableWarningValidator.validate).thenAnswer(
             (_) async => [fixableValidationWarning],

packages/shorebird_cli/test/src/fakes.dart

@@ -0,0 +1,10 @@
+import 'package:http/http.dart' as http;
+import 'package:mocktail/mocktail.dart';
+import 'package:shorebird_cli/src/process.dart';
+import 'package:shorebird_code_push_client/shorebird_code_push_client.dart';
+
+class FakeBaseRequest extends Fake implements http.BaseRequest {}
+
+class FakeRelease extends Fake implements Release {}
+
+class FakeShorebirdProcess extends Fake implements ShorebirdProcess {}

packages/shorebird_cli/test/src/git_test.dart

@@ -7,10 +7,7 @@ import 'package:shorebird_cli/src/git.dart';
 import 'package:shorebird_cli/src/process.dart';
 import 'package:test/test.dart';
 
-class _MockShorebirdProcess extends Mock implements ShorebirdProcess {}
-
-class _MockShorebirdProcessResult extends Mock
-    implements ShorebirdProcessResult {}
+import 'mocks.dart';
 
 void main() {
   group(Git, () {
@@ -28,8 +25,8 @@ void main() {
     }
 
     setUp(() {
-      processResult = _MockShorebirdProcessResult();
-      process = _MockShorebirdProcess();
+      processResult = MockShorebirdProcessResult();
+      process = MockShorebirdProcess();
       git = runWithOverrides(Git.new);
 
       when(

packages/shorebird_cli/test/src/gradlew_test.dart

@@ -11,13 +11,7 @@ import 'package:shorebird_cli/src/platform.dart';
 import 'package:shorebird_cli/src/process.dart';
 import 'package:test/test.dart';
 
-class _MockJava extends Mock implements Java {}
-
-class _MockPlatform extends Mock implements Platform {}
-
-class _MockProcess extends Mock implements ShorebirdProcess {}
-
-class _MockProcessResult extends Mock implements ShorebirdProcessResult {}
+import 'mocks.dart';
 
 void main() {
   group(Gradlew, () {
@@ -41,10 +35,10 @@ void main() {
     }
 
     setUp(() {
-      java = _MockJava();
-      platform = _MockPlatform();
-      process = _MockProcess();
-      result = _MockProcessResult();
+      java = MockJava();
+      platform = MockPlatform();
+      process = MockShorebirdProcess();
+      result = MockProcessResult();
       gradlew = runWithOverrides(Gradlew.new);
 
       when(() => java.home).thenReturn(javaHome);

packages/shorebird_cli/test/src/http_client/logging_client_test.dart

@@ -8,11 +8,8 @@ import 'package:shorebird_cli/src/http_client/http_client.dart';
 import 'package:shorebird_cli/src/logger.dart';
 import 'package:test/test.dart';
 
-class _FakeBaseRequest extends Fake implements http.BaseRequest {}
-
-class _MockHttpClient extends Mock implements http.Client {}
-
-class _MockLogger extends Mock implements Logger {}
+import '../fakes.dart';
+import '../mocks.dart';
 
 void main() {
   group(LoggingClient, () {
@@ -30,12 +27,12 @@ void main() {
     }
 
     setUpAll(() {
-      registerFallbackValue(_FakeBaseRequest());
+      registerFallbackValue(FakeBaseRequest());
     });
 
     setUp(() {
-      httpClient = _MockHttpClient();
-      logger = _MockLogger();
+      httpClient = MockHttpClient();
+      logger = MockLogger();
       loggingClient = LoggingClient(httpClient: httpClient);
 
       when(() => httpClient.send(any())).thenAnswer(

packages/shorebird_cli/test/src/http_client/retrying_client_test.dart

@@ -2,16 +2,15 @@ import 'dart:io';
 
 import 'package:http/http.dart' as http;
 import 'package:http/retry.dart';
-import 'package:mocktail/mocktail.dart';
 import 'package:shorebird_cli/src/http_client/retrying_client.dart';
 import 'package:test/test.dart';
 
-class _MockHttpClient extends Mock implements http.Client {}
+import '../mocks.dart';
 
 void main() {
   group('retryingHttpClient', () {
     test('returns a RetryClient', () {
-      final client = retryingHttpClient(_MockHttpClient());
+      final client = retryingHttpClient(MockHttpClient());
       expect(client, isA<RetryClient>());
     });
 

packages/shorebird_cli/test/src/ios_deploy_test.dart

@@ -14,21 +14,7 @@ import 'package:shorebird_cli/src/process.dart';
 import 'package:shorebird_cli/src/shorebird_env.dart';
 import 'package:test/test.dart';
 
-class _MockLogger extends Mock implements Logger {}
-
-class _MockPlatform extends Mock implements Platform {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockShorebirdProcess extends Mock implements ShorebirdProcess {}
-
-class _MockProcess extends Mock implements Process {}
-
-class _MockIOSink extends Mock implements IOSink {}
-
-class _MockProcessSignal extends Mock implements ProcessSignal {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
+import 'mocks.dart';
 
 void main() {
   group(IOSDeploy, () {
@@ -54,13 +40,13 @@ void main() {
     }
 
     setUp(() {
-      logger = _MockLogger();
-      platform = _MockPlatform();
-      shorebirdProcess = _MockShorebirdProcess();
-      process = _MockProcess();
-      progress = _MockProgress();
-      ioSink = _MockIOSink();
-      shorebirdEnv = _MockShorebirdEnv();
+      logger = MockLogger();
+      platform = MockPlatform();
+      shorebirdProcess = MockShorebirdProcess();
+      process = MockProcess();
+      progress = MockProgress();
+      ioSink = MockIOSink();
+      shorebirdEnv = MockShorebirdEnv();
       iosDeploy = IOSDeploy();
 
       final tempDir = Directory.systemTemp.createTempSync();
@@ -278,7 +264,7 @@ void main() {
       });
 
       test('kills process on sigint', () async {
-        final signal = _MockProcessSignal();
+        final signal = MockProcessSignal();
         final controller = StreamController<ProcessSignal>();
         iosDeploy = IOSDeploy(sigint: signal);
         when(signal.watch).thenAnswer((_) => controller.stream);

packages/shorebird_cli/test/src/java_test.dart

@@ -9,9 +9,7 @@ import 'package:shorebird_cli/src/java.dart';
 import 'package:shorebird_cli/src/platform.dart';
 import 'package:test/test.dart';
 
-class _MockAndroidStudio extends Mock implements AndroidStudio {}
-
-class _MockPlatform extends Mock implements Platform {}
+import 'mocks.dart';
 
 void main() {
   group(Java, () {
@@ -36,8 +34,8 @@ void main() {
     }
 
     setUp(() {
-      androidStudio = _MockAndroidStudio();
-      platform = _MockPlatform();
+      androidStudio = MockAndroidStudio();
+      platform = MockPlatform();
       java = Java();
     });
 

packages/shorebird_cli/test/src/mocks.dart

@@ -0,0 +1,126 @@
+import 'dart:io';
+
+import 'package:args/args.dart';
+import 'package:googleapis_auth/auth_io.dart';
+import 'package:http/http.dart' as http;
+import 'package:mason_logger/mason_logger.dart';
+import 'package:mocktail/mocktail.dart';
+import 'package:platform/platform.dart';
+import 'package:shorebird_cli/src/adb.dart';
+import 'package:shorebird_cli/src/android_sdk.dart';
+import 'package:shorebird_cli/src/android_studio.dart';
+import 'package:shorebird_cli/src/archive_analysis/archive_analysis.dart';
+import 'package:shorebird_cli/src/archive_analysis/archive_differ.dart';
+import 'package:shorebird_cli/src/auth/auth.dart';
+import 'package:shorebird_cli/src/bundletool.dart';
+import 'package:shorebird_cli/src/cache.dart' show Cache;
+import 'package:shorebird_cli/src/code_push_client_wrapper.dart';
+import 'package:shorebird_cli/src/config/config.dart';
+import 'package:shorebird_cli/src/doctor.dart';
+import 'package:shorebird_cli/src/git.dart';
+import 'package:shorebird_cli/src/gradlew.dart';
+import 'package:shorebird_cli/src/ios_deploy.dart';
+import 'package:shorebird_cli/src/java.dart';
+import 'package:shorebird_cli/src/patch_diff_checker.dart';
+import 'package:shorebird_cli/src/process.dart';
+import 'package:shorebird_cli/src/shorebird_env.dart';
+import 'package:shorebird_cli/src/shorebird_flutter.dart';
+import 'package:shorebird_cli/src/shorebird_validator.dart';
+import 'package:shorebird_cli/src/shorebird_version.dart';
+import 'package:shorebird_cli/src/validators/validators.dart';
+import 'package:shorebird_cli/src/xcodebuild.dart';
+import 'package:shorebird_code_push_client/shorebird_code_push_client.dart';
+
+class MockAccessCredentials extends Mock implements AccessCredentials {}
+
+class MockAdb extends Mock implements Adb {}
+
+class MockAndroidArchiveDiffer extends Mock implements AndroidArchiveDiffer {}
+
+class MockAndroidSdk extends Mock implements AndroidSdk {}
+
+class MockAndroidStudio extends Mock implements AndroidStudio {}
+
+class MockAppMetadata extends Mock implements AppMetadata {}
+
+class MockArchiveDiffer extends Mock implements ArchiveDiffer {}
+
+class MockArgResults extends Mock implements ArgResults {}
+
+class MockAuth extends Mock implements Auth {}
+
+class MockBundleTool extends Mock implements Bundletool {}
+
+class MockCache extends Mock implements Cache {}
+
+class MockCodePushClient extends Mock implements CodePushClient {}
+
+class MockCodePushClientWrapper extends Mock implements CodePushClientWrapper {}
+
+class MockDoctor extends Mock implements Doctor {}
+
+class MockFile extends Mock implements File {}
+
+class MockFileSetDiff extends Mock implements FileSetDiff {}
+
+class MockGit extends Mock implements Git {}
+
+class MockGradlew extends Mock implements Gradlew {}
+
+class MockHttpClient extends Mock implements http.Client {}
+
+class MockHttpClientRequest extends Mock implements HttpClientRequest {}
+
+class MockHttpClientResponse extends Mock implements HttpClientResponse {}
+
+class MockIoHttpClient extends Mock implements HttpClient {}
+
+class MockIOSDeploy extends Mock implements IOSDeploy {}
+
+class MockIOSink extends Mock implements IOSink {}
+
+class MockIosArchiveDiffer extends Mock implements IosArchiveDiffer {}
+
+class MockJava extends Mock implements Java {}
+
+class MockLogger extends Mock implements Logger {}
+
+class MockPatchDiffChecker extends Mock implements PatchDiffChecker {}
+
+class MockPlatform extends Mock implements Platform {}
+
+class MockProcessResult extends Mock implements ShorebirdProcessResult {}
+
+class MockProcessSignal extends Mock implements ProcessSignal {}
+
+class MockProcessWrapper extends Mock implements ProcessWrapper {}
+
+class MockProcess extends Mock implements Process {}
+
+class MockProgress extends Mock implements Progress {}
+
+class MockRelease extends Mock implements Release {}
+
+class MockReleaseArtifact extends Mock implements ReleaseArtifact {}
+
+class MockShorebirdEnv extends Mock implements ShorebirdEnv {}
+
+class MockShorebirdFlutter extends Mock implements ShorebirdFlutter {}
+
+class MockShorebirdFlutterValidator extends Mock
+    implements ShorebirdFlutterValidator {}
+
+class MockShorebirdProcess extends Mock implements ShorebirdProcess {}
+
+class MockShorebirdProcessResult extends Mock
+    implements ShorebirdProcessResult {}
+
+class MockShorebirdValidator extends Mock implements ShorebirdValidator {}
+
+class MockShorebirdVersion extends Mock implements ShorebirdVersion {}
+
+class MockShorebirdYaml extends Mock implements ShorebirdYaml {}
+
+class MockValidator extends Mock implements Validator {}
+
+class MockXcodeBuild extends Mock implements XcodeBuild {}

packages/shorebird_cli/test/src/patch_diff_checker_test.dart

@@ -12,19 +12,8 @@ import 'package:shorebird_cli/src/patch_diff_checker.dart';
 import 'package:shorebird_cli/src/shorebird_env.dart';
 import 'package:test/test.dart';
 
-class _FakeBaseRequest extends Fake implements http.BaseRequest {}
-
-class _MockArchiveDiffer extends Mock implements ArchiveDiffer {}
-
-class _MockFileSetDiff extends Mock implements FileSetDiff {}
-
-class _MockHttpClient extends Mock implements http.Client {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockProgress extends Mock implements Progress {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
+import 'fakes.dart';
+import 'mocks.dart';
 
 void main() {
   group(PatchDiffChecker, () {
@@ -54,17 +43,17 @@ void main() {
 
     setUpAll(() {
       registerFallbackValue(FileSetDiff.empty());
-      registerFallbackValue(_FakeBaseRequest());
+      registerFallbackValue(FakeBaseRequest());
     });
 
     setUp(() {
-      archiveDiffer = _MockArchiveDiffer();
-      assetsFileSetDiff = _MockFileSetDiff();
-      nativeFileSetDiff = _MockFileSetDiff();
-      httpClient = _MockHttpClient();
-      logger = _MockLogger();
-      progress = _MockProgress();
-      shorebirdEnv = _MockShorebirdEnv();
+      archiveDiffer = MockArchiveDiffer();
+      assetsFileSetDiff = MockFileSetDiff();
+      nativeFileSetDiff = MockFileSetDiff();
+      httpClient = MockHttpClient();
+      logger = MockLogger();
+      progress = MockProgress();
+      shorebirdEnv = MockShorebirdEnv();
       patchDiffChecker = PatchDiffChecker(httpClient: httpClient);
 
       when(() => archiveDiffer.changedFiles(any(), any()))

packages/shorebird_cli/test/src/shorebird_env_test.dart

@@ -9,7 +9,7 @@ import 'package:shorebird_cli/src/platform.dart';
 import 'package:shorebird_cli/src/shorebird_env.dart';
 import 'package:test/test.dart';
 
-class _MockPlatform extends Mock implements Platform {}
+import 'mocks.dart';
 
 void main() {
   group(ShorebirdEnv, () {
@@ -38,7 +38,7 @@ void main() {
       )
         ..createSync(recursive: true)
         ..writeAsStringSync(flutterRevision, flush: true);
-      platform = _MockPlatform();
+      platform = MockPlatform();
       shorebirdEnv = runWithOverrides(ShorebirdEnv.new);
 
       when(() => platform.environment).thenReturn(const {});

packages/shorebird_cli/test/src/shorebird_flutter_test.dart

@@ -10,14 +10,7 @@ import 'package:shorebird_cli/src/shorebird_env.dart';
 import 'package:shorebird_cli/src/shorebird_flutter.dart';
 import 'package:test/test.dart';
 
-class _MockGit extends Mock implements Git {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
-
-class _MockShorebirdProcess extends Mock implements ShorebirdProcess {}
-
-class _MockShorebirdProcessResult extends Mock
-    implements ShorebirdProcessResult {}
+import 'mocks.dart';
 
 void main() {
   group(ShorebirdFlutter, () {
@@ -44,10 +37,10 @@ void main() {
     setUp(() {
       shorebirdRoot = Directory.systemTemp.createTempSync();
       flutterDirectory = Directory(p.join(shorebirdRoot.path, 'flutter'));
-      git = _MockGit();
-      shorebirdEnv = _MockShorebirdEnv();
-      process = _MockShorebirdProcess();
-      processResult = _MockShorebirdProcessResult();
+      git = MockGit();
+      shorebirdEnv = MockShorebirdEnv();
+      process = MockShorebirdProcess();
+      processResult = MockShorebirdProcessResult();
       shorebirdFlutter = runWithOverrides(ShorebirdFlutter.new);
 
       when(

packages/shorebird_cli/test/src/shorebird_process_test.dart

@@ -7,13 +7,7 @@ import 'package:shorebird_cli/src/process.dart';
 import 'package:shorebird_cli/src/shorebird_env.dart';
 import 'package:test/test.dart';
 
-class _MockProcess extends Mock implements Process {}
-
-class _MockProcessResult extends Mock implements ShorebirdProcessResult {}
-
-class _MockProcessWrapper extends Mock implements ProcessWrapper {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
+import 'mocks.dart';
 
 void main() {
   group('ShorebirdProcess', () {
@@ -37,10 +31,10 @@ void main() {
     }
 
     setUp(() {
-      processWrapper = _MockProcessWrapper();
-      runProcessResult = _MockProcessResult();
-      startProcess = _MockProcess();
-      shorebirdEnv = _MockShorebirdEnv();
+      processWrapper = MockProcessWrapper();
+      runProcessResult = MockProcessResult();
+      startProcess = MockProcess();
+      shorebirdEnv = MockShorebirdEnv();
       shorebirdProcess = runWithOverrides(
         () => ShorebirdProcess(processWrapper: processWrapper),
       );

packages/shorebird_cli/test/src/shorebird_validator_test.dart

@@ -10,15 +10,7 @@ import 'package:shorebird_cli/src/shorebird_validator.dart';
 import 'package:shorebird_cli/src/validators/validators.dart';
 import 'package:test/test.dart';
 
-class _MockAuth extends Mock implements Auth {}
-
-class _MockLogger extends Mock implements Logger {}
-
-class _MockPlatform extends Mock implements Platform {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
-
-class _MockValidator extends Mock implements Validator {}
+import 'mocks.dart';
 
 void main() {
   group(ShorebirdValidator, () {
@@ -42,11 +34,11 @@ void main() {
     }
 
     setUp(() {
-      auth = _MockAuth();
-      logger = _MockLogger();
-      platform = _MockPlatform();
-      shorebirdEnv = _MockShorebirdEnv();
-      validator = _MockValidator();
+      auth = MockAuth();
+      logger = MockLogger();
+      platform = MockPlatform();
+      shorebirdEnv = MockShorebirdEnv();
+      validator = MockValidator();
       shorebirdValidator = runWithOverrides(ShorebirdValidator.new);
     });
 

packages/shorebird_cli/test/src/shorebird_version_test.dart

@@ -7,7 +7,7 @@ import 'package:shorebird_cli/src/git.dart';
 import 'package:shorebird_cli/src/shorebird_version.dart';
 import 'package:test/test.dart';
 
-class _MockGit extends Mock implements Git {}
+import 'mocks.dart';
 
 void main() {
   group(ShorebirdVersion, () {
@@ -27,7 +27,7 @@ void main() {
     }
 
     setUp(() {
-      git = _MockGit();
+      git = MockGit();
       shorebirdVersionManager = ShorebirdVersion();
 
       when(

packages/shorebird_cli/test/src/validators/shorebird_flutter_validator_test.dart

@@ -10,11 +10,7 @@ import 'package:shorebird_cli/src/shorebird_flutter.dart';
 import 'package:shorebird_cli/src/validators/validators.dart';
 import 'package:test/test.dart';
 
-class _MockPlatform extends Mock implements Platform {}
-
-class _MockShorebirdEnv extends Mock implements ShorebirdEnv {}
-
-class _MockShorebirdFlutter extends Mock implements ShorebirdFlutter {}
+import '../mocks.dart';
 
 void main() {
   group(ShorebirdFlutterValidator, () {
@@ -49,9 +45,9 @@ void main() {
 
     setUp(() {
       tempDir = setupTempDirectory();
-      platform = _MockPlatform();
-      shorebirdEnv = _MockShorebirdEnv();
-      shorebirdFlutter = _MockShorebirdFlutter();
+      platform = MockPlatform();
+      shorebirdEnv = MockShorebirdEnv();
+      shorebirdFlutter = MockShorebirdFlutter();
 
       when(() => shorebirdEnv.flutterRevision).thenReturn(flutterRevision);
       when(

packages/shorebird_cli/test/src/validators/shorebird_version_validator_test.dart

@@ -6,7 +6,7 @@ import 'package:shorebird_cli/src/shorebird_version.dart';
 import 'package:shorebird_cli/src/validators/validators.dart';
 import 'package:test/test.dart';
 
-class _MockShorebirdVersion extends Mock implements ShorebirdVersion {}
+import '../mocks.dart';
 
 void main() {
   group('ShorebirdVersionValidator', () {
@@ -23,7 +23,7 @@ void main() {
     }
 
     setUp(() {
-      shorebirdVersion = _MockShorebirdVersion();
+      shorebirdVersion = MockShorebirdVersion();
       validator = ShorebirdVersionValidator();
 
       when(

packages/shorebird_cli/test/src/xcodebuild_test.dart

@@ -8,7 +8,7 @@ import 'package:shorebird_cli/src/process.dart';
 import 'package:shorebird_cli/src/xcodebuild.dart';
 import 'package:test/test.dart';
 
-class _MockProcess extends Mock implements ShorebirdProcess {}
+import 'mocks.dart';
 
 void main() {
   group(XcodeBuild, () {
@@ -31,7 +31,7 @@ void main() {
     }
 
     setUp(() {
-      process = _MockProcess();
+      process = MockShorebirdProcess();
       xcodeBuild = runWithOverrides(XcodeBuild.new);
     });