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
4b25e80c
Unverified
Commit
4b25e80c
authored
Aug 02, 2022
by
Christopher Fujino
Committed by
GitHub
Aug 02, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[flutter_tools] Migrate more tool tests to null-safety (#108639)
parent
fd0da75c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
35 deletions
+30
-35
update_packages.dart
packages/flutter_tools/lib/src/commands/update_packages.dart
+1
-1
config_test.dart
...utter_tools/test/commands.shard/hermetic/config_test.dart
+5
-7
pub_get_test.dart
...tter_tools/test/commands.shard/hermetic/pub_get_test.dart
+5
-8
update_packages_test.dart
...ls/test/commands.shard/hermetic/update_packages_test.dart
+19
-19
No files found.
packages/flutter_tools/lib/src/commands/update_packages.dart
View file @
4b25e80c
...
...
@@ -1439,7 +1439,7 @@ String generateFakePubspec(
/// It ends up holding the full graph of dependencies, and the version number for
/// each one.
class
PubDependencyTree
{
final
Map
<
String
,
String
?>
_versions
=
<
String
,
String
>{};
final
Map
<
String
,
String
?>
_versions
=
<
String
,
String
?
>{};
final
Map
<
String
,
Set
<
String
>>
_dependencyTree
=
<
String
,
Set
<
String
>>{};
/// Handles the output from "pub deps --style=compact".
...
...
packages/flutter_tools/test/commands.shard/hermetic/config_test.dart
View file @
4b25e80c
...
...
@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// @dart = 2.8
import
'dart:convert'
;
import
'package:args/command_runner.dart'
;
...
...
@@ -23,10 +21,10 @@ import '../../src/context.dart';
import
'../../src/test_flutter_command_runner.dart'
;
void
main
(
)
{
FakeAndroidStudio
fakeAndroidStudio
;
FakeAndroidSdk
fakeAndroidSdk
;
FakeFlutterVersion
fakeFlutterVersion
;
TestUsage
testUsage
;
late
FakeAndroidStudio
fakeAndroidStudio
;
late
FakeAndroidSdk
fakeAndroidSdk
;
late
FakeFlutterVersion
fakeFlutterVersion
;
late
TestUsage
testUsage
;
setUpAll
(()
{
Cache
.
disableLocking
();
...
...
@@ -288,7 +286,7 @@ class FakeAndroidSdk extends Fake implements AndroidSdk {
class
FakeFlutterVersion
extends
Fake
implements
FlutterVersion
{
@override
String
channel
;
late
String
channel
;
@override
void
ensureVersionFile
()
{}
...
...
packages/flutter_tools/test/commands.shard/hermetic/pub_get_test.dart
View file @
4b25e80c
...
...
@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// @dart = 2.8
import
'package:args/command_runner.dart'
;
import
'package:file/memory.dart'
;
import
'package:flutter_tools/src/base/file_system.dart'
;
...
...
@@ -12,15 +10,14 @@ import 'package:flutter_tools/src/commands/packages.dart';
import
'package:flutter_tools/src/dart/pub.dart'
;
import
'package:flutter_tools/src/project.dart'
;
import
'package:flutter_tools/src/reporting/reporting.dart'
;
import
'package:meta/meta.dart'
;
import
'package:test/fake.dart'
;
import
'../../src/context.dart'
;
import
'../../src/test_flutter_command_runner.dart'
;
void
main
(
)
{
FileSystem
fileSystem
;
FakePub
pub
;
late
FileSystem
fileSystem
;
late
FakePub
pub
;
setUp
(()
{
Cache
.
disableLocking
();
...
...
@@ -124,13 +121,13 @@ class FakePub extends Fake implements Pub {
@override
Future
<
void
>
get
({
@
required
PubContext
context
,
String
directory
,
required
PubContext
context
,
String
?
directory
,
bool
skipIfAbsent
=
false
,
bool
upgrade
=
false
,
bool
offline
=
false
,
bool
generateSyntheticPackage
=
false
,
String
flutterRootOverride
,
String
?
flutterRootOverride
,
bool
checkUpToDate
=
false
,
bool
shouldSkipThirdPartyGenerator
=
true
,
bool
printProgress
=
true
,
...
...
packages/flutter_tools/test/commands.shard/hermetic/update_packages_test.dart
View file @
4b25e80c
...
...
@@ -2,15 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// @dart = 2.8
import
'package:file/file.dart'
;
import
'package:file/memory.dart'
;
import
'package:flutter_tools/src/base/file_system.dart'
;
import
'package:flutter_tools/src/cache.dart'
;
import
'package:flutter_tools/src/commands/update_packages.dart'
;
import
'package:flutter_tools/src/dart/pub.dart'
;
import
'package:meta/meta.dart'
;
import
'package:test/fake.dart'
;
import
'package:yaml/yaml.dart'
;
...
...
@@ -85,10 +82,10 @@ void main() {
});
group
(
'update-packages'
,
()
{
FileSystem
fileSystem
;
Directory
flutterSdk
;
Directory
flutter
;
FakePub
pub
;
late
FileSystem
fileSystem
;
late
Directory
flutterSdk
;
late
Directory
flutter
;
late
FakePub
pub
;
setUpAll
(()
{
Cache
.
disableLocking
();
...
...
@@ -209,7 +206,6 @@ void main() {
isTransitive:
false
,
),
],
doUpgrade:
false
,
);
final
YamlMap
pubspec
=
loadYaml
(
pubspecSource
)
as
YamlMap
;
expect
((
pubspec
[
'dependencies'
]
as
YamlMap
)[
'foo'
],
prevVersion
);
...
...
@@ -226,18 +222,20 @@ class FakePub extends Fake implements Pub {
@override
Future
<
void
>
get
({
@
required
PubContext
context
,
String
directory
,
required
PubContext
context
,
String
?
directory
,
bool
skipIfAbsent
=
false
,
bool
upgrade
=
false
,
bool
offline
=
false
,
bool
generateSyntheticPackage
=
false
,
String
flutterRootOverride
,
String
?
flutterRootOverride
,
bool
checkUpToDate
=
false
,
bool
shouldSkipThirdPartyGenerator
=
true
,
bool
printProgress
=
true
,
})
async
{
pubGetDirectories
.
add
(
directory
);
if
(
directory
!=
null
)
{
pubGetDirectories
.
add
(
directory
);
}
fileSystem
.
directory
(
directory
).
childFile
(
'pubspec.lock'
)
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
'''
...
...
@@ -264,14 +262,16 @@ sdks:
@override
Future
<
void
>
batch
(
List
<
String
>
arguments
,
{
@
required
PubContext
context
,
String
directory
,
MessageFilter
filter
,
required
PubContext
context
,
String
?
directory
,
MessageFilter
?
filter
,
String
failureMessage
=
'pub failed'
,
@
required
bool
retry
,
bool
showTraceForErrors
,
required
bool
retry
,
bool
?
showTraceForErrors
,
})
async
{
pubBatchDirectories
.
add
(
directory
);
if
(
directory
!=
null
)
{
pubBatchDirectories
.
add
(
directory
);
}
'''
Dart SDK 2.16.0-144.0.dev
...
...
@@ -290,6 +290,6 @@ dev dependencies:
transitive dependencies:
- platform 3.1.0
- process 4.2.4 [file path platform]
'''
.
split
(
'
\n
'
).
forEach
(
filter
);
'''
.
split
(
'
\n
'
).
forEach
(
filter
!
);
}
}
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