Skip to content

Commit 03c5667

Browse files
christopherfujinochristopherfujino
authored
[flutter_tools] Remove fromPlatform from tests (flutter#54152)
1 parent 59b2c5a commit 03c5667

19 files changed

+62
-61
lines changed

‎packages/flutter_tools/test/commands.shard/hermetic/doctor_test.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ import '../../src/common.dart';
3333
import '../../src/context.dart';
3434
import '../../src/testbed.dart';
3535

36-
final Generator _kNoColorOutputPlatform = () => FakePlatform.fromPlatform(const LocalPlatform())
37-
..localeName = 'en_US.UTF-8'
38-
..stdoutSupportsAnsi = false;
36+
final Generator _kNoColorOutputPlatform = () => FakePlatform(
37+
localeName: 'en_US.UTF-8',
38+
stdoutSupportsAnsi: false,
39+
);
3940

4041
final Map<Type, Generator> noColorTerminalOverride = <Type, Generator>{
4142
Platform: _kNoColorOutputPlatform,

‎packages/flutter_tools/test/commands.shard/permeable/analyze_once_test.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ import 'package:process/process.dart';
2020
import '../../src/common.dart';
2121
import '../../src/context.dart';
2222

23-
final Platform _kNoColorTerminalPlatform = FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false;
23+
final Platform _kNoColorTerminalPlatform = FakePlatform(
24+
stdoutSupportsAnsi: false);
2425

2526
void main() {
2627
String analyzerSeparator;

‎packages/flutter_tools/test/commands.shard/permeable/create_test.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import '../../src/testbed.dart';
3131

3232
const String frameworkRevision = '12345678';
3333
const String frameworkChannel = 'omega';
34+
// TODO(fujino): replace FakePlatform.fromPlatform() with FakePlatform()
3435
final Generator _kNoColorTerminalPlatform = () => FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false;
3536
final Map<Type, Generator> noColorTerminalOverride = <Type, Generator>{
3637
Platform: _kNoColorTerminalPlatform,

‎packages/flutter_tools/test/general.shard/android/android_studio_test.dart

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,17 @@ const Map<String, dynamic> macStudioInfoPlist = <String, dynamic>{
3232
class MockPlistUtils extends Mock implements PlistParser {}
3333

3434
Platform linuxPlatform() {
35-
return FakePlatform.fromPlatform(const LocalPlatform())
36-
..operatingSystem = 'linux'
37-
..environment = <String, String>{'HOME': homeLinux};
35+
return FakePlatform(
36+
operatingSystem: 'linux',
37+
environment: <String, String>{'HOME': homeLinux},
38+
);
3839
}
3940

4041
Platform macPlatform() {
41-
return FakePlatform.fromPlatform(const LocalPlatform())
42-
..operatingSystem = 'macos'
43-
..environment = <String, String>{'HOME': homeMac};
42+
return FakePlatform(
43+
operatingSystem: 'macos',
44+
environment: <String, String>{'HOME': homeMac},
45+
);
4446
}
4547

4648
void main() {

‎packages/flutter_tools/test/general.shard/android/android_studio_validator_test.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ import '../../src/context.dart';
1818
const String home = '/home/me';
1919

2020
Platform linuxPlatform() {
21-
return FakePlatform.fromPlatform(const LocalPlatform())
22-
..operatingSystem = 'linux'
23-
..environment = <String, String>{'HOME': home};
21+
return FakePlatform(
22+
operatingSystem: 'linux',
23+
environment: <String, String>{'HOME': home}
24+
);
2425
}
2526

2627
void main() {

‎packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -601,9 +601,10 @@ bool testErrorMessage(String errorMessage, GradleHandledError error) {
601601
}
602602

603603
Platform fakePlatform(String name) {
604-
return FakePlatform
605-
.fromPlatform(const LocalPlatform())
606-
..operatingSystem = name;
604+
return FakePlatform(
605+
environment: <String, String>{},
606+
operatingSystem: name,
607+
);
607608
}
608609

609610
class FakeGradleUtils extends GradleUtils {

‎packages/flutter_tools/test/general.shard/android/gradle_test.dart

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2633,9 +2633,11 @@ FlutterProject generateFakeAppBundle(String directoryName, String fileName) {
26332633
}
26342634

26352635
FakePlatform fakePlatform(String name) {
2636-
return FakePlatform.fromPlatform(const LocalPlatform())
2637-
..operatingSystem = name
2638-
..stdoutSupportsAnsi = false;
2636+
return FakePlatform(
2637+
environment: <String, String>{'HOME': '/path/to/home'},
2638+
operatingSystem: name,
2639+
stdoutSupportsAnsi: false,
2640+
);
26392641
}
26402642

26412643
class FakeGradleUtils extends GradleUtils {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import 'package:platform/platform.dart';
2525
import '../src/common.dart';
2626
import '../src/context.dart';
2727

28-
final Generator _kNoColorTerminalPlatform = () => FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false;
28+
final Generator _kNoColorTerminalPlatform = () => FakePlatform(stdoutSupportsAnsi: false);
2929
final Map<Type, Generator> noColorTerminalOverride = <Type, Generator>{
3030
Platform: _kNoColorTerminalPlatform,
3131
};

‎packages/flutter_tools/test/general.shard/base/logger_test.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import 'package:quiver/testing/async.dart';
1515
import '../../src/common.dart';
1616
import '../../src/mocks.dart' as mocks;
1717

18-
final Platform _kNoAnsiPlatform = FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false;
18+
final Platform _kNoAnsiPlatform = FakePlatform(stdoutSupportsAnsi: false);
1919
final String red = RegExp.escape(AnsiTerminal.red);
2020
final String bold = RegExp.escape(AnsiTerminal.bold);
2121
final String resetBold = RegExp.escape(AnsiTerminal.resetBold);
@@ -54,7 +54,7 @@ void main() {
5454
final BufferLogger mockLogger = BufferLogger(
5555
terminal: AnsiTerminal(
5656
stdio: mocks.MockStdio(),
57-
platform: FakePlatform()..stdoutSupportsAnsi = true,
57+
platform: FakePlatform(stdoutSupportsAnsi: true),
5858
),
5959
outputPreferences: OutputPreferences.test(showColor: true),
6060
);
@@ -250,8 +250,8 @@ void main() {
250250
AnsiStatus ansiStatus;
251251

252252
setUp(() {
253-
platform = FakePlatform.fromPlatform(testPlatform)..stdoutSupportsAnsi = false;
254-
ansiPlatform = FakePlatform.fromPlatform(testPlatform)..stdoutSupportsAnsi = true;
253+
platform = FakePlatform(stdoutSupportsAnsi: false);
254+
ansiPlatform = FakePlatform(stdoutSupportsAnsi: true);
255255

256256
terminal = AnsiTerminal(
257257
stdio: mockStdio,
@@ -749,7 +749,7 @@ void main() {
749749
final Logger logger = StdoutLogger(
750750
terminal: AnsiTerminal(
751751
stdio: mockStdio,
752-
platform: FakePlatform()..stdoutSupportsAnsi = true,
752+
platform: FakePlatform(stdoutSupportsAnsi: true),
753753
),
754754
stdio: mockStdio,
755755
outputPreferences: OutputPreferences.test(showColor: true),

‎packages/flutter_tools/test/general.shard/base/net_test.dart

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ void main() {
2525
testLogger = BufferLogger(
2626
terminal: AnsiTerminal(
2727
stdio: MockStdio(),
28-
platform: FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false,
28+
platform: FakePlatform(stdoutSupportsAnsi: false),
2929
),
3030
outputPreferences: OutputPreferences.test(),
3131
);
@@ -35,7 +35,7 @@ void main() {
3535
return Net(
3636
httpClientFactory: () => client,
3737
logger: testLogger,
38-
platform: FakePlatform.fromPlatform(const LocalPlatform()),
38+
platform: FakePlatform(),
3939
);
4040
}
4141

@@ -160,10 +160,11 @@ void main() {
160160
ArgumentError('test exception handling'),
161161
),
162162
logger: testLogger,
163-
platform: FakePlatform.fromPlatform(const LocalPlatform())
164-
..environment = <String, String>{
163+
platform: FakePlatform(
164+
environment: <String, String>{
165165
'FLUTTER_STORAGE_BASE_URL': 'example.invalid',
166166
},
167+
),
167168
);
168169
String error;
169170
FakeAsync().run((FakeAsync time) {

‎packages/flutter_tools/test/general.shard/base/process_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void main() {
8585
mockLogger = BufferLogger(
8686
terminal: AnsiTerminal(
8787
stdio: MockStdio(),
88-
platform: FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false,
88+
platform: FakePlatform(stdoutSupportsAnsi: false),
8989
),
9090
outputPreferences: OutputPreferences(wrapText: true, wrapColumn: 40),
9191
);
@@ -248,7 +248,7 @@ void main() {
248248
testLogger = BufferLogger(
249249
terminal: AnsiTerminal(
250250
stdio: MockStdio(),
251-
platform: FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false,
251+
platform: FakePlatform(stdinSupportsAnsi: false),
252252
),
253253
outputPreferences: OutputPreferences(wrapText: true, wrapColumn: 40),
254254
);

‎packages/flutter_tools/test/general.shard/base/user_messages_test.dart

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@ import '../../src/common.dart';
1111
typedef _InstallationMessage = String Function(Platform);
1212

1313
void main() {
14-
final FakePlatform macPlatform = FakePlatform.fromPlatform(const LocalPlatform());
15-
macPlatform.operatingSystem = 'macos';
16-
final FakePlatform linuxPlatform = FakePlatform.fromPlatform(const LocalPlatform());
17-
linuxPlatform.operatingSystem = 'linux';
18-
final FakePlatform windowsPlatform = FakePlatform.fromPlatform(const LocalPlatform());
19-
windowsPlatform.operatingSystem = 'windows';
14+
final FakePlatform macPlatform = FakePlatform(operatingSystem: 'macos');
15+
final FakePlatform linuxPlatform = FakePlatform(operatingSystem: 'linux');
16+
final FakePlatform windowsPlatform = FakePlatform(operatingSystem: 'windows');
2017

2118
void _checkInstallationURL(_InstallationMessage message) {
2219
expect(message(macPlatform), contains('https://flutter.dev/docs/get-started/install/macos#android-setup'));

‎packages/flutter_tools/test/general.shard/build_system/targets/icon_tree_shaker_test.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ import '../../../src/common.dart';
2323
import '../../../src/context.dart';
2424
import '../../../src/mocks.dart' as mocks;
2525

26-
final Platform _kNoAnsiPlatform =
27-
FakePlatform.fromPlatform(const LocalPlatform())
28-
..stdoutSupportsAnsi = false;
26+
final Platform _kNoAnsiPlatform = FakePlatform(stdoutSupportsAnsi: false);
2927

3028
void main() {
3129
BufferLogger logger;

‎packages/flutter_tools/test/general.shard/ios/devices_test.dart

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,9 @@ import '../../src/context.dart';
2828
import '../../src/mocks.dart';
2929

3030
void main() {
31-
final FakePlatform macPlatform = FakePlatform.fromPlatform(const LocalPlatform());
32-
macPlatform.operatingSystem = 'macos';
33-
final FakePlatform linuxPlatform = FakePlatform.fromPlatform(const LocalPlatform());
34-
linuxPlatform.operatingSystem = 'linux';
35-
final FakePlatform windowsPlatform = FakePlatform.fromPlatform(const LocalPlatform());
36-
windowsPlatform.operatingSystem = 'windows';
31+
final FakePlatform macPlatform = FakePlatform(operatingSystem: 'macos');
32+
final FakePlatform linuxPlatform = FakePlatform(operatingSystem: 'linux');
33+
final FakePlatform windowsPlatform = FakePlatform(operatingSystem: 'windows');
3734

3835
group('IOSDevice', () {
3936
final List<Platform> unsupportedPlatforms = <Platform>[linuxPlatform, windowsPlatform];

‎packages/flutter_tools/test/general.shard/ios/mac_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import 'package:process/process.dart';
2323
import '../../src/common.dart';
2424
import '../../src/context.dart';
2525

26-
final Generator _kNoColorTerminalPlatform = () => FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false;
26+
final Generator _kNoColorTerminalPlatform = () => FakePlatform(stdoutSupportsAnsi: false);
2727
final Map<Type, Generator> noColorTerminalOverride = <Type, Generator>{
2828
Platform: _kNoColorTerminalPlatform,
2929
};

‎packages/flutter_tools/test/general.shard/ios/simulators_test.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@ void main() {
4444
MemoryFileSystem fileSystem;
4545

4646
setUp(() {
47-
osx = FakePlatform.fromPlatform(const LocalPlatform());
48-
osx.operatingSystem = 'macos';
47+
osx = FakePlatform(
48+
environment: <String, String>{},
49+
operatingSystem: 'macos',
50+
);
4951
fileSystem = MemoryFileSystem();
5052
fsUtils = FileSystemUtils(fileSystem: fileSystem, platform: osx);
5153
});

‎packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void main() {
3636

3737
setUp(() {
3838
processManager = mocks.MockProcessManager();
39-
platform = fakePlatform('macos');
39+
platform = FakePlatform(operatingSystem: 'macos');
4040
fileSystem = MemoryFileSystem();
4141
fileSystem.file(xcodebuild).createSync(recursive: true);
4242
terminal = MockAnsiTerminal();
@@ -125,7 +125,7 @@ void main() {
125125
});
126126

127127
testWithoutContext('xcodebuild isInstalled is false when not on MacOS', () {
128-
final Platform platform = fakePlatform('notMacOS');
128+
final Platform platform = FakePlatform(operatingSystem: 'notMacOS');
129129
xcodeProjectInterpreter = XcodeProjectInterpreter(
130130
logger: logger,
131131
fileSystem: fileSystem,
@@ -175,6 +175,7 @@ void main() {
175175
});
176176

177177
testWithoutContext('xcodebuild build settings is empty when xcodebuild failed to get the build settings', () async {
178+
platform.environment = Map<String, String>.unmodifiable(<String, String>{});
178179
when(processManager.runSync(
179180
argThat(contains(xcodebuild)),
180181
workingDirectory: anyNamed('workingDirectory'),
@@ -190,6 +191,7 @@ void main() {
190191
flakes: 1,
191192
delay: delay + const Duration(seconds: 1),
192193
);
194+
platform.environment = Map<String, String>.unmodifiable(<String, String>{});
193195

194196
expect(await xcodeProjectInterpreter.getBuildSettings(
195197
'', '', timeout: delay),
@@ -422,7 +424,7 @@ Information about project "Runner":
422424
FakePlatform platform;
423425

424426
setUp(() {
425-
platform = fakePlatform('ignored');
427+
platform = FakePlatform();
426428
});
427429

428430
testWithoutContext('environment variables as Xcode build settings', () {
@@ -447,7 +449,7 @@ Information about project "Runner":
447449
fs = MemoryFileSystem();
448450
mockArtifacts = MockLocalEngineArtifacts();
449451
mockProcessManager = MockProcessManager();
450-
macOS = fakePlatform('macos');
452+
macOS = FakePlatform(operatingSystem: 'macos');
451453
fs.file(xcodebuild).createSync(recursive: true);
452454
});
453455

@@ -803,10 +805,6 @@ flutter:
803805
});
804806
}
805807

806-
FakePlatform fakePlatform(String name) {
807-
return FakePlatform.fromPlatform(const LocalPlatform())..operatingSystem = name;
808-
}
809-
810808
class MockLocalEngineArtifacts extends Mock implements LocalEngineArtifacts {}
811809
class MockProcessManager extends Mock implements ProcessManager {}
812810
class MockXcodeProjectInterpreter extends Mock implements XcodeProjectInterpreter {}

‎packages/flutter_tools/test/general.shard/macos/xcode_test.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,7 @@ void main() {
253253
});
254254

255255
group('available devices', () {
256-
final FakePlatform macPlatform = FakePlatform.fromPlatform(const LocalPlatform());
257-
macPlatform.operatingSystem = 'macos';
256+
final FakePlatform macPlatform = FakePlatform(operatingSystem: 'macos');
258257

259258
testWithoutContext('Xcode not installed', () async {
260259
when(mockXcode.isInstalledAndMeetsVersionCheck).thenReturn(false);
@@ -447,8 +446,7 @@ void main() {
447446
});
448447

449448
group('diagnostics', () {
450-
final FakePlatform macPlatform = FakePlatform.fromPlatform(const LocalPlatform());
451-
macPlatform.operatingSystem = 'macos';
449+
final FakePlatform macPlatform = FakePlatform(operatingSystem: 'macos');
452450

453451
testWithoutContext('Xcode not installed', () async {
454452
when(mockXcode.isInstalledAndMeetsVersionCheck).thenReturn(false);

‎packages/flutter_tools/test/src/mocks.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import 'package:process/process.dart';
2929

3030
import 'common.dart';
3131

32+
// TODO(fujino): replace FakePlatform.fromPlatform() with FakePlatform()
3233
final Generator kNoColorTerminalPlatform = () {
3334
return FakePlatform.fromPlatform(
3435
const LocalPlatform()

0 commit comments

Comments
 (0)