Skip to content

Commit 23e4173

Browse files
authored
Swap Mocks to Fakes in config_test (flutter#76274)
1 parent 86d6d17 commit 23e4173

File tree

7 files changed

+56
-47
lines changed

7 files changed

+56
-47
lines changed

packages/flutter_tools/test/commands.shard/hermetic/build_linux_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import 'package:flutter_tools/src/commands/build_linux.dart';
1919
import 'package:flutter_tools/src/features.dart';
2020
import 'package:flutter_tools/src/project.dart';
2121
import 'package:flutter_tools/src/reporting/reporting.dart';
22-
import 'package:mockito/mockito.dart';
2322
import 'package:process/process.dart';
23+
import 'package:test/fake.dart';
2424

2525
import '../../src/common.dart';
2626
import '../../src/context.dart';

packages/flutter_tools/test/commands.shard/hermetic/config_test.dart

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,25 @@ import 'package:flutter_tools/src/commands/config.dart';
1717
import 'package:flutter_tools/src/globals.dart' as globals;
1818
import 'package:flutter_tools/src/reporting/reporting.dart';
1919
import 'package:flutter_tools/src/version.dart';
20-
import 'package:mockito/mockito.dart';
20+
import 'package:test/fake.dart';
2121

2222
import '../../src/common.dart';
2323
import '../../src/context.dart';
2424

2525
void main() {
26-
MockAndroidStudio mockAndroidStudio;
27-
MockAndroidSdk mockAndroidSdk;
28-
MockFlutterVersion mockFlutterVersion;
26+
FakeAndroidStudio fakeAndroidStudio;
27+
FakeAndroidSdk fakeAndroidSdk;
28+
FakeFlutterVersion fakeFlutterVersion;
2929
TestUsage testUsage;
3030

3131
setUpAll(() {
3232
Cache.disableLocking();
3333
});
3434

3535
setUp(() {
36-
mockAndroidStudio = MockAndroidStudio();
37-
mockAndroidSdk = MockAndroidSdk();
38-
mockFlutterVersion = MockFlutterVersion();
36+
fakeAndroidStudio = FakeAndroidStudio();
37+
fakeAndroidSdk = FakeAndroidSdk();
38+
fakeFlutterVersion = FakeFlutterVersion();
3939
testUsage = TestUsage();
4040
});
4141

@@ -61,8 +61,8 @@ void main() {
6161
expect(jsonObject['android-sdk'], isNotNull);
6262
verifyNoAnalytics();
6363
}, overrides: <Type, Generator>{
64-
AndroidStudio: () => mockAndroidStudio,
65-
AndroidSdk: () => mockAndroidSdk,
64+
AndroidStudio: () => fakeAndroidStudio,
65+
AndroidSdk: () => fakeAndroidSdk,
6666
Usage: () => testUsage,
6767
});
6868

@@ -134,8 +134,8 @@ void main() {
134134
expect(globals.config.getValue('enable-macos-desktop'), false);
135135
verifyNoAnalytics();
136136
}, overrides: <Type, Generator>{
137-
AndroidStudio: () => mockAndroidStudio,
138-
AndroidSdk: () => mockAndroidSdk,
137+
AndroidStudio: () => fakeAndroidStudio,
138+
AndroidSdk: () => fakeAndroidSdk,
139139
Usage: () => testUsage,
140140
});
141141

@@ -157,7 +157,7 @@ void main() {
157157
});
158158

159159
testUsingContext('displays which config settings are available on stable', () async {
160-
when(mockFlutterVersion.channel).thenReturn('stable');
160+
fakeFlutterVersion.channel = 'stable';
161161
final ConfigCommand configCommand = ConfigCommand();
162162
final CommandRunner<void> commandRunner = createTestCommandRunner(configCommand);
163163

@@ -191,9 +191,9 @@ void main() {
191191
);
192192
verifyNoAnalytics();
193193
}, overrides: <Type, Generator>{
194-
AndroidStudio: () => mockAndroidStudio,
195-
AndroidSdk: () => mockAndroidSdk,
196-
FlutterVersion: () => mockFlutterVersion,
194+
AndroidStudio: () => fakeAndroidStudio,
195+
AndroidSdk: () => fakeAndroidSdk,
196+
FlutterVersion: () => fakeFlutterVersion,
197197
Usage: () => testUsage,
198198
});
199199

@@ -265,14 +265,23 @@ void main() {
265265
});
266266
}
267267

268-
class MockAndroidStudio extends Mock implements AndroidStudio, Comparable<AndroidStudio> {
268+
class FakeAndroidStudio extends Fake implements AndroidStudio, Comparable<AndroidStudio> {
269269
@override
270270
String get directory => 'path/to/android/stdio';
271271
}
272272

273-
class MockAndroidSdk extends Mock implements AndroidSdk {
273+
class FakeAndroidSdk extends Fake implements AndroidSdk {
274274
@override
275275
Directory get directory => globals.fs.directory('path/to/android/sdk');
276276
}
277277

278-
class MockFlutterVersion extends Mock implements FlutterVersion {}
278+
class FakeFlutterVersion extends Fake implements FlutterVersion {
279+
@override
280+
String channel;
281+
282+
@override
283+
void ensureVersionFile() {}
284+
285+
@override
286+
Future<void> checkFlutterVersionFreshness() async {}
287+
}

packages/flutter_tools/test/general.shard/artifact_updater_test.dart

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import 'package:flutter_tools/src/base/os.dart';
1515
import 'package:flutter_tools/src/base/platform.dart';
1616
import 'package:flutter_tools/src/base/terminal.dart';
1717
import 'package:flutter_tools/src/cache.dart';
18-
import 'package:mockito/mockito.dart';
18+
import 'package:test/fake.dart';
1919

2020
import '../src/common.dart';
2121
import '../src/fake_http_client.dart';
@@ -25,7 +25,7 @@ final Platform testPlatform = FakePlatform(environment: const <String, String>{}
2525

2626
void main() {
2727
testWithoutContext('ArtifactUpdater can download a zip archive', () async {
28-
final MockOperatingSystemUtils operatingSystemUtils = MockOperatingSystemUtils();
28+
final FakeOperatingSystemUtils operatingSystemUtils = FakeOperatingSystemUtils();
2929
final MemoryFileSystem fileSystem = MemoryFileSystem.test();
3030
final BufferLogger logger = BufferLogger.test();
3131
final ArtifactUpdater artifactUpdater = ArtifactUpdater(
@@ -48,7 +48,7 @@ void main() {
4848
});
4949

5050
testWithoutContext('ArtifactUpdater can download a zip archive and delete stale files', () async {
51-
final MockOperatingSystemUtils operatingSystemUtils = MockOperatingSystemUtils();
51+
final FakeOperatingSystemUtils operatingSystemUtils = FakeOperatingSystemUtils();
5252
final MemoryFileSystem fileSystem = MemoryFileSystem.test();
5353
final BufferLogger logger = BufferLogger.test();
5454
final ArtifactUpdater artifactUpdater = ArtifactUpdater(
@@ -78,7 +78,7 @@ void main() {
7878

7979
testWithoutContext('ArtifactUpdater will not validate the md5 hash if the '
8080
'x-goog-hash header is present but missing an md5 entry', () async {
81-
final MockOperatingSystemUtils operatingSystemUtils = MockOperatingSystemUtils();
81+
final FakeOperatingSystemUtils operatingSystemUtils = FakeOperatingSystemUtils();
8282
final MemoryFileSystem fileSystem = MemoryFileSystem.test();
8383
final BufferLogger logger = BufferLogger.test();
8484

@@ -109,7 +109,7 @@ void main() {
109109

110110
testWithoutContext('ArtifactUpdater will validate the md5 hash if the '
111111
'x-goog-hash header is present', () async {
112-
final MockOperatingSystemUtils operatingSystemUtils = MockOperatingSystemUtils();
112+
final FakeOperatingSystemUtils operatingSystemUtils = FakeOperatingSystemUtils();
113113
final MemoryFileSystem fileSystem = MemoryFileSystem.test();
114114
final BufferLogger logger = BufferLogger.test();
115115

@@ -144,7 +144,7 @@ void main() {
144144

145145
testWithoutContext('ArtifactUpdater will validate the md5 hash if the '
146146
'x-goog-hash header is present and throw if it does not match', () async {
147-
final MockOperatingSystemUtils operatingSystemUtils = MockOperatingSystemUtils();
147+
final FakeOperatingSystemUtils operatingSystemUtils = FakeOperatingSystemUtils();
148148
final MemoryFileSystem fileSystem = MemoryFileSystem.test();
149149
final BufferLogger logger = BufferLogger.test();
150150

@@ -184,7 +184,7 @@ void main() {
184184
});
185185

186186
testWithoutContext('ArtifactUpdater will restart the status ticker if it needs to retry the download', () async {
187-
final MockOperatingSystemUtils operatingSystemUtils = MockOperatingSystemUtils();
187+
final FakeOperatingSystemUtils operatingSystemUtils = FakeOperatingSystemUtils();
188188
final MemoryFileSystem fileSystem = MemoryFileSystem.test();
189189
final Logger logger = StdoutLogger(
190190
terminal: Terminal.test(supportsColor: true),
@@ -214,7 +214,7 @@ void main() {
214214
});
215215

216216
testWithoutContext('ArtifactUpdater will re-attempt on a non-200 response', () async {
217-
final MockOperatingSystemUtils operatingSystemUtils = MockOperatingSystemUtils();
217+
final FakeOperatingSystemUtils operatingSystemUtils = FakeOperatingSystemUtils();
218218
final MemoryFileSystem fileSystem = MemoryFileSystem.test();
219219
final BufferLogger logger = BufferLogger.test();
220220

@@ -242,7 +242,7 @@ void main() {
242242
});
243243

244244
testWithoutContext('ArtifactUpdater will tool exit on an ArgumentError from http client with base url override', () async {
245-
final MockOperatingSystemUtils operatingSystemUtils = MockOperatingSystemUtils();
245+
final FakeOperatingSystemUtils operatingSystemUtils = FakeOperatingSystemUtils();
246246
final MemoryFileSystem fileSystem = MemoryFileSystem.test();
247247
final BufferLogger logger = BufferLogger.test();
248248
final ArtifactUpdater artifactUpdater = ArtifactUpdater(
@@ -272,7 +272,7 @@ void main() {
272272
});
273273

274274
testWithoutContext('ArtifactUpdater will rethrow on an ArgumentError from http client without base url override', () async {
275-
final MockOperatingSystemUtils operatingSystemUtils = MockOperatingSystemUtils();
275+
final FakeOperatingSystemUtils operatingSystemUtils = FakeOperatingSystemUtils();
276276
final MemoryFileSystem fileSystem = MemoryFileSystem.test();
277277
final BufferLogger logger = BufferLogger.test();
278278
final ArtifactUpdater artifactUpdater = ArtifactUpdater(
@@ -298,7 +298,7 @@ void main() {
298298
});
299299

300300
testWithoutContext('ArtifactUpdater will re-download a file if unzipping fails', () async {
301-
final MockOperatingSystemUtils operatingSystemUtils = MockOperatingSystemUtils();
301+
final FakeOperatingSystemUtils operatingSystemUtils = FakeOperatingSystemUtils();
302302
final MemoryFileSystem fileSystem = MemoryFileSystem.test();
303303
final BufferLogger logger = BufferLogger.test();
304304
final ArtifactUpdater artifactUpdater = ArtifactUpdater(
@@ -322,7 +322,7 @@ void main() {
322322
});
323323

324324
testWithoutContext('ArtifactUpdater will de-download a file if unzipping fails on windows', () async {
325-
final MockOperatingSystemUtils operatingSystemUtils = MockOperatingSystemUtils(windows: true);
325+
final FakeOperatingSystemUtils operatingSystemUtils = FakeOperatingSystemUtils(windows: true);
326326
final MemoryFileSystem fileSystem = MemoryFileSystem.test();
327327
final BufferLogger logger = BufferLogger.test();
328328
final ArtifactUpdater artifactUpdater = ArtifactUpdater(
@@ -346,7 +346,7 @@ void main() {
346346
});
347347

348348
testWithoutContext('ArtifactUpdater will bail with a tool exit if unzipping fails more than twice', () async {
349-
final MockOperatingSystemUtils operatingSystemUtils = MockOperatingSystemUtils();
349+
final FakeOperatingSystemUtils operatingSystemUtils = FakeOperatingSystemUtils();
350350
final MemoryFileSystem fileSystem = MemoryFileSystem.test();
351351
final BufferLogger logger = BufferLogger.test();
352352
final ArtifactUpdater artifactUpdater = ArtifactUpdater(
@@ -370,7 +370,7 @@ void main() {
370370
});
371371

372372
testWithoutContext('ArtifactUpdater will bail if unzipping fails more than twice on Windows', () async {
373-
final MockOperatingSystemUtils operatingSystemUtils = MockOperatingSystemUtils(windows: true);
373+
final FakeOperatingSystemUtils operatingSystemUtils = FakeOperatingSystemUtils(windows: true);
374374
final MemoryFileSystem fileSystem = MemoryFileSystem.test();
375375
final BufferLogger logger = BufferLogger.test();
376376
final ArtifactUpdater artifactUpdater = ArtifactUpdater(
@@ -394,7 +394,7 @@ void main() {
394394
});
395395

396396
testWithoutContext('ArtifactUpdater can download a tar archive', () async {
397-
final MockOperatingSystemUtils operatingSystemUtils = MockOperatingSystemUtils();
397+
final FakeOperatingSystemUtils operatingSystemUtils = FakeOperatingSystemUtils();
398398
final MemoryFileSystem fileSystem = MemoryFileSystem.test();
399399
final BufferLogger logger = BufferLogger.test();
400400
final ArtifactUpdater artifactUpdater = ArtifactUpdater(
@@ -416,7 +416,7 @@ void main() {
416416
});
417417

418418
testWithoutContext('ArtifactUpdater will delete downloaded files if they exist.', () async {
419-
final MockOperatingSystemUtils operatingSystemUtils = MockOperatingSystemUtils();
419+
final FakeOperatingSystemUtils operatingSystemUtils = FakeOperatingSystemUtils();
420420
final MemoryFileSystem fileSystem = MemoryFileSystem.test();
421421
final BufferLogger logger = BufferLogger.test();
422422
final ArtifactUpdater artifactUpdater = ArtifactUpdater(
@@ -441,8 +441,8 @@ void main() {
441441
});
442442
}
443443

444-
class MockOperatingSystemUtils extends Mock implements OperatingSystemUtils {
445-
MockOperatingSystemUtils({this.windows = false});
444+
class FakeOperatingSystemUtils extends Fake implements OperatingSystemUtils {
445+
FakeOperatingSystemUtils({this.windows = false});
446446

447447
int failures = 0;
448448
final bool windows;

packages/flutter_tools/test/general.shard/base/signals_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import 'dart:io' as io;
99

1010
import 'package:flutter_tools/src/base/io.dart';
1111
import 'package:flutter_tools/src/base/signals.dart';
12-
import 'package:mockito/mockito.dart';
12+
import 'package:test/fake.dart';
1313

1414
import '../../src/common.dart';
1515

packages/flutter_tools/test/general.shard/macos/application_package_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ void main() {
2626
final Map<Type, Generator> overrides = <Type, Generator>{
2727
FileSystem: () => MemoryFileSystem.test(),
2828
ProcessManager: () => FakeProcessManager.any(),
29-
PlistParser: () => MockPlistUtils(),
29+
PlistParser: () => FakePlistUtils(),
3030
Platform: _kNoColorTerminalPlatform,
3131
OperatingSystemUtils: () => os,
3232
};
@@ -204,7 +204,7 @@ final Map<Type, Generator> noColorTerminalOverride = <Type, Generator>{
204204
Platform: _kNoColorTerminalPlatform,
205205
};
206206

207-
class MockPlistUtils extends Mock implements PlistParser {
207+
class FakePlistUtils extends Fake implements PlistParser {
208208
@override
209209
Map<String, dynamic> parseFile(String plistFilePath) {
210210
final File file = globals.fs.file(plistFilePath);

packages/flutter_tools/test/general.shard/terminal_handler_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,9 +362,9 @@ class MockDevice extends Mock implements Device {
362362

363363
class MockResidentRunner extends Mock implements ResidentRunner {}
364364
class MockFlutterDevice extends Mock implements FlutterDevice {}
365-
class MockResidentCompiler extends Mock implements ResidentCompiler {}
365+
class FakeResidentCompiler extends Fake implements ResidentCompiler {}
366366

367-
class TestRunner extends Mock implements ResidentRunner {
367+
class TestRunner extends Fake implements ResidentRunner {
368368
bool hasHelpBeenPrinted = false;
369369
String receivedCommand;
370370

packages/flutter_tools/test/general.shard/vmservice_test.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ void main() {
115115
});
116116

117117
testUsingContext('VmService registers flutterMemoryInfo service', () async {
118-
final MockDevice mockDevice = MockDevice();
118+
final FakeDevice mockDevice = FakeDevice();
119119

120120
final MockVMService mockVMService = MockVMService();
121121
setUpVmService(
@@ -183,7 +183,7 @@ void main() {
183183

184184
verify(mockVMService.registerService('flutterVersion', 'Flutter Tools')).called(1);
185185
}, overrides: <Type, Generator>{
186-
FlutterVersion: () => MockFlutterVersion(),
186+
FlutterVersion: () => FakeFlutterVersion(),
187187
});
188188

189189
testUsingContext('VMService prints messages for connection failures', () {
@@ -467,11 +467,11 @@ void main() {
467467
});
468468
}
469469

470-
class MockDevice extends Mock implements Device {}
471470
class MockVMService extends Mock implements vm_service.VmService {}
472-
class MockFlutterVersion extends Mock implements FlutterVersion {
471+
class FakeDevice extends Fake implements Device {}
472+
class FakeFlutterVersion extends Fake implements FlutterVersion {
473473
@override
474-
Map<String, Object> toJson() => const <String, Object>{'Mock': 'Version'};
474+
Map<String, Object> toJson() => const <String, Object>{'Fake': 'Version'};
475475
}
476476

477477
/// A [WebSocketConnector] that always throws an [io.SocketException].

0 commit comments

Comments
 (0)