firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Android Studio version string nullablity, fake AndroidStudio in test (#113295)

Browse Source
This commit is contained in:
Jenn Magder 2022-10-12 11:32:55 -07:00 committed by GitHub
parent 71200c0775
commit 2f03dda55e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/flutter_tools/lib/src/android/android_studio.dart
View File

@ -49,7 +49,7 @@ class AndroidStudio implements Comparable<AndroidStudio> {
return null; return null;
} }
final String versionString = plistValues[PlistParser.kCFBundleShortVersionStringKey] as String; final String? versionString = plistValues[PlistParser.kCFBundleShortVersionStringKey] as String?;
Version? version; Version? version;
if (versionString != null) { if (versionString != null) {

7
packages/flutter_tools/test/general.shard/analytics_test.dart
View File

@ -4,6 +4,7 @@
import 'package:args/command_runner.dart'; import 'package:args/command_runner.dart';
import 'package:file/memory.dart'; import 'package:file/memory.dart';
import 'package:flutter_tools/src/android/android_studio.dart';
import 'package:flutter_tools/src/android/android_workflow.dart'; import 'package:flutter_tools/src/android/android_workflow.dart';
import 'package:flutter_tools/src/base/config.dart'; import 'package:flutter_tools/src/base/config.dart';
import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/file_system.dart';
@ -153,6 +154,7 @@ void main() {
late TestUsage testUsage; late TestUsage testUsage;
late FakeClock fakeClock; late FakeClock fakeClock;
late FakeDoctor doctor; late FakeDoctor doctor;
late FakeAndroidStudio androidStudio;
setUp(() { setUp(() {
memoryFileSystem = MemoryFileSystem.test(); memoryFileSystem = MemoryFileSystem.test();
@ -160,6 +162,7 @@ void main() {
testUsage = TestUsage(); testUsage = TestUsage();
fakeClock = FakeClock(); fakeClock = FakeClock();
doctor = FakeDoctor(); doctor = FakeDoctor();
androidStudio = FakeAndroidStudio();
}); });
testUsingContext('flutter commands send timing events', () async { testUsingContext('flutter commands send timing events', () async {
@ -175,6 +178,7 @@ void main() {
), ),
)); ));
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
AndroidStudio: () => androidStudio,
SystemClock: () => fakeClock, SystemClock: () => fakeClock,
Doctor: () => doctor, Doctor: () => doctor,
Usage: () => testUsage, Usage: () => testUsage,
@ -194,6 +198,7 @@ void main() {
), ),
)); ));
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
AndroidStudio: () => androidStudio,
SystemClock: () => fakeClock, SystemClock: () => fakeClock,
Doctor: () => doctor, Doctor: () => doctor,
Usage: () => testUsage, Usage: () => testUsage,
@ -375,6 +380,8 @@ class FakeDoctor extends Fake implements Doctor {
} }
} }
class FakeAndroidStudio extends Fake implements AndroidStudio {}
class FakeClock extends Fake implements SystemClock { class FakeClock extends Fake implements SystemClock {
List<int> times = <int>[]; List<int> times = <int>[];