Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
2f03dda5
Unverified
Commit
2f03dda5
authored
Oct 12, 2022
by
Jenn Magder
Committed by
GitHub
Oct 12, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Android Studio version string nullablity, fake AndroidStudio in test (#113295)
parent
71200c07
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
android_studio.dart
packages/flutter_tools/lib/src/android/android_studio.dart
+1
-1
analytics_test.dart
...ages/flutter_tools/test/general.shard/analytics_test.dart
+7
-0
No files found.
packages/flutter_tools/lib/src/android/android_studio.dart
View file @
2f03dda5
...
...
@@ -49,7 +49,7 @@ class AndroidStudio implements Comparable<AndroidStudio> {
return
null
;
}
final
String
versionString
=
plistValues
[
PlistParser
.
kCFBundleShortVersionStringKey
]
as
String
;
final
String
?
versionString
=
plistValues
[
PlistParser
.
kCFBundleShortVersionStringKey
]
as
String
?
;
Version
?
version
;
if
(
versionString
!=
null
)
{
...
...
packages/flutter_tools/test/general.shard/analytics_test.dart
View file @
2f03dda5
...
...
@@ -4,6 +4,7 @@
import
'package:args/command_runner.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/base/config.dart'
;
import
'package:flutter_tools/src/base/file_system.dart'
;
...
...
@@ -153,6 +154,7 @@ void main() {
late
TestUsage
testUsage
;
late
FakeClock
fakeClock
;
late
FakeDoctor
doctor
;
late
FakeAndroidStudio
androidStudio
;
setUp
(()
{
memoryFileSystem
=
MemoryFileSystem
.
test
();
...
...
@@ -160,6 +162,7 @@ void main() {
testUsage
=
TestUsage
();
fakeClock
=
FakeClock
();
doctor
=
FakeDoctor
();
androidStudio
=
FakeAndroidStudio
();
});
testUsingContext
(
'flutter commands send timing events'
,
()
async
{
...
...
@@ -175,6 +178,7 @@ void main() {
),
));
},
overrides:
<
Type
,
Generator
>{
AndroidStudio:
()
=>
androidStudio
,
SystemClock:
()
=>
fakeClock
,
Doctor:
()
=>
doctor
,
Usage:
()
=>
testUsage
,
...
...
@@ -194,6 +198,7 @@ void main() {
),
));
},
overrides:
<
Type
,
Generator
>{
AndroidStudio:
()
=>
androidStudio
,
SystemClock:
()
=>
fakeClock
,
Doctor:
()
=>
doctor
,
Usage:
()
=>
testUsage
,
...
...
@@ -375,6 +380,8 @@ class FakeDoctor extends Fake implements Doctor {
}
}
class
FakeAndroidStudio
extends
Fake
implements
AndroidStudio
{}
class
FakeClock
extends
Fake
implements
SystemClock
{
List
<
int
>
times
=
<
int
>[];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment