Skip to content

F
Front-End
Unverified Commit 6599271b authored by Ian Hickson's avatar Ian Hickson Committed by GitHub
Browse files
Options

Revert matcher package (#18614) 

The new matcher package deprecates isInstanceOf which seems eggregious.
parent 0f2e50bb
Hide whitespace changes
Inline Side-by-side
Showing with 232 additions and 225 deletions
dev/automated_tests/pubspec.yaml
View file @ 6599271b
......@@ -25,7 +25,7 @@ dependencies:
json_rpc_2: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
kernel: 0.3.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
logging: 0.11.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
meta: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
mime: 0.9.6+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
multi_server_socket: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -48,7 +48,7 @@ dependencies:
stream_channel: 1.6.7+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
string_scanner: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
term_glyph: 1.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
typed_data: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
utf: 0.9.0+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
vector_math: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -60,4 +60,4 @@ dependencies:
flutter:
uses-material-design: true
# PUBSPEC CHECKSUM: ab16
# PUBSPEC CHECKSUM: e214
dev/benchmarks/complex_layout/pubspec.yaml
View file @ 6599271b
......@@ -47,7 +47,7 @@ dev_dependencies:
js: 0.6.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
kernel: 0.3.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
logging: 0.11.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
mime: 0.9.6+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
multi_server_socket: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
node_preamble: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -64,7 +64,7 @@ dev_dependencies:
source_maps: 0.10.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
string_scanner: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
term_glyph: 1.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
utf: 0.9.0+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
watcher: 0.9.7+8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
yaml: 2.1.14 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -75,4 +75,4 @@ flutter:
- packages/flutter_gallery_assets/people/square/ali.png
- packages/flutter_gallery_assets/places/india_chettinad_silk_maker.png
# PUBSPEC CHECKSUM: 05ce
# PUBSPEC CHECKSUM: 3ccc
dev/benchmarks/microbenchmarks/pubspec.yaml
View file @ 6599271b
......@@ -19,7 +19,7 @@ dependencies:
convert: 2.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
crypto: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
csslib: 0.14.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
dart_style: 1.0.14 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
dart_style: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
front_end: 0.1.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
glob: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
html: 0.13.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -34,7 +34,7 @@ dependencies:
json_rpc_2: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
kernel: 0.3.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
logging: 0.11.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
mime: 0.9.6+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
multi_server_socket: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
node_preamble: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -57,7 +57,7 @@ dependencies:
stream_channel: 1.6.7+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
string_scanner: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
term_glyph: 1.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
typed_data: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
utf: 0.9.0+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
vector_math: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -69,4 +69,4 @@ dependencies:
flutter:
uses-material-design: true
# PUBSPEC CHECKSUM: a202
# PUBSPEC CHECKSUM: fecb
dev/bots/analyze-sample-code.dart
View file @ 6599271b
......@@ -180,7 +180,7 @@ Future<Null> main() async {
buffer.add('import \'dart:math\' as math;');
buffer.add('import \'dart:typed_data\';');
buffer.add('import \'dart:ui\' as ui;');
buffer.add('import \'package:flutter_test/flutter_test.dart\' hide TypeMatcher;');
buffer.add('import \'package:flutter_test/flutter_test.dart\';');
for (FileSystemEntity file in flutterPackage.listSync(recursive: false, followLinks: false)) {
if (file is File && path.extension(file.path) == '.dart') {
buffer.add('');
......
dev/bots/pubspec.yaml
View file @ 6599271b
......@@ -20,7 +20,7 @@ dependencies:
typed_data: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
dev_dependencies:
test: 0.12.42
test: 0.12.41
mockito: 3.0.0-alpha+5
analyzer: 0.31.2-alpha.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -37,7 +37,7 @@ dev_dependencies:
json_rpc_2: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
kernel: 0.3.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
logging: 0.11.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
mime: 0.9.6+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
multi_server_socket: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
node_preamble: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -61,4 +61,4 @@ dev_dependencies:
web_socket_channel: 1.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
yaml: 2.1.14 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
# PUBSPEC CHECKSUM: ca9f
# PUBSPEC CHECKSUM: 049d
dev/bots/test/prepare_package_test.dart
View file @ 6599271b
......@@ -25,7 +25,7 @@ void main() {
expectAsync1((List<String> commandLine) async {
return processRunner.runProcess(commandLine);
})(<String>['this_executable_better_not_exist_2857632534321']),
throwsA(const TypeMatcher<ProcessRunnerException>()));
throwsA(const isInstanceOf<ProcessRunnerException>()));
try {
await processRunner.runProcess(<String>['this_executable_better_not_exist_2857632534321']);
} on ProcessRunnerException catch (e) {
......@@ -62,7 +62,7 @@ void main() {
expectAsync1((List<String> commandLine) async {
return processRunner.runProcess(commandLine);
})(<String>['echo', 'test']),
throwsA(const TypeMatcher<ProcessRunnerException>()));
throwsA(const isInstanceOf<ProcessRunnerException>()));
});
});
group('ArchiveCreator for $platformName', () {
......@@ -204,7 +204,7 @@ void main() {
};
processManager.fakeResults = calls;
expect(expectAsync0(creator.initializeRepo),
throwsA(const TypeMatcher<ProcessRunnerException>()));
throwsA(const isInstanceOf<ProcessRunnerException>()));
});
});
......
dev/devicelab/pubspec.yaml
View file @ 6599271b
......@@ -25,7 +25,7 @@ dependencies:
crypto: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
intl: 0.15.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
json_rpc_2: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
petitparser: 1.7.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
pub_semver: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
source_span: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -36,7 +36,7 @@ dependencies:
dev_dependencies:
# See packages/flutter_test/pubspec.yaml for why we're pinning this version.
test: 0.12.42
test: 0.12.41
analyzer: 0.31.2-alpha.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
boolean_selector: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -70,4 +70,4 @@ dev_dependencies:
watcher: 0.9.7+8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
yaml: 2.1.14 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
# PUBSPEC CHECKSUM: dbe1
# PUBSPEC CHECKSUM: fcdf
dev/integration_tests/ui/pubspec.yaml
View file @ 6599271b
......@@ -18,7 +18,7 @@ dependencies:
file: 5.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
intl: 0.15.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
json_rpc_2: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
meta: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
path: 1.6.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
petitparser: 1.7.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -35,7 +35,7 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
test: 0.12.42
test: 0.12.41
analyzer: 0.31.2-alpha.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
boolean_selector: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -73,4 +73,4 @@ dev_dependencies:
flutter:
uses-material-design: true
# PUBSPEC CHECKSUM: d14d
# PUBSPEC CHECKSUM: c84b
dev/manual_tests/pubspec.yaml
View file @ 6599271b
......@@ -34,7 +34,7 @@ dev_dependencies:
json_rpc_2: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
kernel: 0.3.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
logging: 0.11.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
mime: 0.9.6+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
multi_server_socket: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
node_preamble: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -56,7 +56,7 @@ dev_dependencies:
stream_channel: 1.6.7+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
string_scanner: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
term_glyph: 1.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
utf: 0.9.0+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
vm_service_client: 0.2.4+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
watcher: 0.9.7+8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -66,4 +66,4 @@ dev_dependencies:
flutter:
uses-material-design: true
# PUBSPEC CHECKSUM: 3094
# PUBSPEC CHECKSUM: 3f92
dev/tools/pubspec.yaml
View file @ 6599271b
......@@ -23,7 +23,7 @@ dependencies:
typed_data: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
dev_dependencies:
test: 0.12.42
test: 0.12.41
mockito: 3.0.0-alpha+5
analyzer: 0.31.2-alpha.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -38,7 +38,7 @@ dev_dependencies:
json_rpc_2: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
kernel: 0.3.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
logging: 0.11.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
mime: 0.9.6+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
multi_server_socket: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
node_preamble: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -62,4 +62,4 @@ dev_dependencies:
web_socket_channel: 1.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
yaml: 2.1.14 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
# PUBSPEC CHECKSUM: 2473
# PUBSPEC CHECKSUM: 5d71
dev/tools/vitool/pubspec.yaml
View file @ 6599271b
......@@ -13,7 +13,7 @@ dependencies:
xml: 3.0.0
collection: 1.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
path: 1.6.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
petitparser: 1.7.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
stack_trace: 1.9.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -60,7 +60,7 @@ dev_dependencies:
stream_channel: 1.6.7+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
string_scanner: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
term_glyph: 1.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
typed_data: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
utf: 0.9.0+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
vm_service_client: 0.2.4+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -68,4 +68,4 @@ dev_dependencies:
web_socket_channel: 1.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
yaml: 2.1.14 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
# PUBSPEC CHECKSUM: ec0b
# PUBSPEC CHECKSUM: e309
dev/tools/vitool/test/vitool_test.dart
View file @ 6599271b
......@@ -16,7 +16,7 @@ void main() {
test('parsePixels', () {
expect(parsePixels('23px'), 23);
expect(parsePixels('9px'), 9);
expect(() { parsePixels('9pt'); }, throwsA(const TypeMatcher<ArgumentError>()));
expect(() { parsePixels('9pt'); }, throwsA(isInstanceOf<ArgumentError>()));
});
test('parsePoints', () {
......
examples/catalog/pubspec.yaml
View file @ 6599271b
......@@ -37,7 +37,7 @@ dev_dependencies:
json_rpc_2: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
kernel: 0.3.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
logging: 0.11.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
mime: 0.9.6+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
multi_server_socket: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
node_preamble: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -58,7 +58,7 @@ dev_dependencies:
stream_channel: 1.6.7+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
string_scanner: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
term_glyph: 1.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
utf: 0.9.0+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
vm_service_client: 0.2.4+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
watcher: 0.9.7+8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -68,4 +68,4 @@ dev_dependencies:
flutter:
uses-material-design: true
# PUBSPEC CHECKSUM: 038c
# PUBSPEC CHECKSUM: 3a8a
examples/flutter_gallery/pubspec.yaml
View file @ 6599271b
......@@ -48,7 +48,7 @@ dev_dependencies:
json_rpc_2: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
kernel: 0.3.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
logging: 0.11.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
mime: 0.9.6+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
multi_server_socket: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
node_preamble: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -69,7 +69,7 @@ dev_dependencies:
stack_trace: 1.9.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
stream_channel: 1.6.7+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
term_glyph: 1.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
utf: 0.9.0+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
vm_service_client: 0.2.4+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
watcher: 0.9.7+8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -197,4 +197,4 @@ flutter:
- asset: packages/flutter_gallery_assets/fonts/private/googlesans/GoogleSansDisplay-Regular.ttf
weight: 400
# PUBSPEC CHECKSUM: e439
# PUBSPEC CHECKSUM: 6137
examples/hello_world/pubspec.yaml
View file @ 6599271b
......@@ -32,7 +32,7 @@ dev_dependencies:
json_rpc_2: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
kernel: 0.3.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
logging: 0.11.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
mime: 0.9.6+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
multi_server_socket: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
node_preamble: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -54,7 +54,7 @@ dev_dependencies:
stream_channel: 1.6.7+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
string_scanner: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
term_glyph: 1.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
utf: 0.9.0+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
vm_service_client: 0.2.4+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
watcher: 0.9.7+8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -64,4 +64,4 @@ dev_dependencies:
flutter:
uses-material-design: true
# PUBSPEC CHECKSUM: ab16
# PUBSPEC CHECKSUM: e214
examples/layers/pubspec.yaml
View file @ 6599271b
......@@ -31,7 +31,7 @@ dev_dependencies:
json_rpc_2: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
kernel: 0.3.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
logging: 0.11.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
mime: 0.9.6+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
multi_server_socket: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
node_preamble: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -53,7 +53,7 @@ dev_dependencies:
stream_channel: 1.6.7+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
string_scanner: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
term_glyph: 1.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
utf: 0.9.0+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
vm_service_client: 0.2.4+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
watcher: 0.9.7+8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -65,4 +65,4 @@ flutter:
- services/data.json
uses-material-design: true
# PUBSPEC CHECKSUM: ab16
# PUBSPEC CHECKSUM: e214
examples/platform_channel/pubspec.yaml
View file @ 6599271b
......@@ -36,7 +36,7 @@ dev_dependencies:
json_rpc_2: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
kernel: 0.3.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
logging: 0.11.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
mime: 0.9.6+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
multi_server_socket: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
node_preamble: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -58,7 +58,7 @@ dev_dependencies:
stream_channel: 1.6.7+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
string_scanner: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
term_glyph: 1.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
utf: 0.9.0+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
vm_service_client: 0.2.4+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
watcher: 0.9.7+8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -68,4 +68,4 @@ dev_dependencies:
flutter:
uses-material-design: true
# PUBSPEC CHECKSUM: 038c
# PUBSPEC CHECKSUM: 3a8a
examples/platform_channel_swift/pubspec.yaml
View file @ 6599271b
......@@ -36,7 +36,7 @@ dev_dependencies:
json_rpc_2: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
kernel: 0.3.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
logging: 0.11.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
mime: 0.9.6+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
multi_server_socket: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
node_preamble: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -58,7 +58,7 @@ dev_dependencies:
stream_channel: 1.6.7+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
string_scanner: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
term_glyph: 1.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
utf: 0.9.0+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
vm_service_client: 0.2.4+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
watcher: 0.9.7+8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -68,4 +68,4 @@ dev_dependencies:
flutter:
uses-material-design: true
# PUBSPEC CHECKSUM: 038c
# PUBSPEC CHECKSUM: 3a8a
examples/stocks/pubspec.yaml
View file @ 6599271b
......@@ -18,14 +18,14 @@ dependencies:
convert: 2.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
crypto: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
csslib: 0.14.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
dart_style: 1.0.14 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
dart_style: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
front_end: 0.1.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
glob: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
html: 0.13.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
http_parser: 3.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
kernel: 0.3.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
logging: 0.11.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
meta: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
package_config: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
path: 1.6.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -67,11 +67,11 @@ dev_dependencies:
source_maps: 0.10.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
stream_channel: 1.6.7+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
term_glyph: 1.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
vm_service_client: 0.2.4+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
web_socket_channel: 1.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
flutter:
uses-material-design: true
# PUBSPEC CHECKSUM: 50fc
# PUBSPEC CHECKSUM: 7fc6
packages/flutter/pubspec.yaml
View file @ 6599271b
......@@ -41,7 +41,7 @@ dev_dependencies:
json_rpc_2: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
kernel: 0.3.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
logging: 0.11.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
mime: 0.9.6+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
multi_server_socket: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
node_preamble: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -65,7 +65,7 @@ dev_dependencies:
stream_channel: 1.6.7+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
string_scanner: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
term_glyph: 1.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
utf: 0.9.0+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
vm_service_client: 0.2.4+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
watcher: 0.9.7+8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -75,4 +75,4 @@ dev_dependencies:
environment:
sdk: '>=1.19.0 <2.0.0'
# PUBSPEC CHECKSUM: d4af
# PUBSPEC CHECKSUM: b1ad
packages/flutter/test/cupertino/nav_bar_test.dart
View file @ 6599271b
......@@ -6,7 +6,7 @@ import 'dart:io';
import 'package:flutter/cupertino.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter_test/flutter_test.dart' hide TypeMatcher;
import 'package:flutter_test/flutter_test.dart';
import '../widgets/semantics_tester.dart';
......
packages/flutter/test/foundation/consolidate_response_test.dart
View file @ 6599271b
......@@ -86,7 +86,7 @@ void main() {
when(response.contentLength).thenReturn(-1);
expect(consolidateHttpClientResponseBytes(response),
throwsA(const TypeMatcher<Exception>()));
throwsA(const isInstanceOf<Exception>()));
});
});
}
......
packages/flutter/test/material/app_builder_test.dart
View file @ 6599271b
......@@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/material.dart' hide TypeMatcher;
import 'package:flutter/material.dart';
void main() {
testWidgets('builder doesn\'t get called if app doesn\'t change', (WidgetTester tester) async {
......@@ -17,7 +17,7 @@ void main() {
log.add('build');
expect(Theme.of(context).primaryColor, Colors.green);
expect(Directionality.of(context), TextDirection.ltr);
expect(child, const TypeMatcher<Navigator>());
expect(child, isInstanceOf<Navigator>());
return const Placeholder();
},
);
......
packages/flutter/test/material/app_test.dart
View file @ 6599271b
......@@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/material.dart' hide TypeMatcher;
import 'package:flutter/material.dart';
class StateMarker extends StatefulWidget {
const StateMarker({ Key key, this.child }) : super(key: key);
......@@ -397,7 +397,7 @@ void main() {
color: const Color(0xFF112233),
home: const Placeholder(),
));
expect(key.currentState, const TypeMatcher<NavigatorState>());
expect(key.currentState, isInstanceOf<NavigatorState>());
await tester.pumpWidget(new MaterialApp(
color: const Color(0xFF112233),
home: const Placeholder(),
......@@ -408,6 +408,6 @@ void main() {
color: const Color(0xFF112233),
home: const Placeholder(),
));
expect(key.currentState, const TypeMatcher<NavigatorState>());
expect(key.currentState, isInstanceOf<NavigatorState>());
});
}
packages/flutter/test/material/chip_theme_test.dart
View file @ 6599271b
......@@ -4,7 +4,7 @@
import 'dart:ui' show window;
import 'package:flutter/material.dart' hide TypeMatcher;
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/painting.dart';
......@@ -167,7 +167,7 @@ void main() {
expect(lightTheme.secondarySelectedColor, equals(customColor1.withAlpha(0x3d)));
expect(lightTheme.labelPadding, equals(const EdgeInsets.symmetric(horizontal: 8.0)));
expect(lightTheme.padding, equals(const EdgeInsets.all(4.0)));
expect(lightTheme.shape, equals(const TypeMatcher<StadiumBorder>()));
expect(lightTheme.shape, equals(isInstanceOf<StadiumBorder>()));
expect(lightTheme.labelStyle.color, equals(Colors.black.withAlpha(0xde)));
expect(lightTheme.secondaryLabelStyle.color, equals(customColor1.withAlpha(0xde)));
expect(lightTheme.brightness, equals(Brightness.light));
......@@ -185,7 +185,7 @@ void main() {
expect(darkTheme.secondarySelectedColor, equals(customColor1.withAlpha(0x3d)));
expect(darkTheme.labelPadding, equals(const EdgeInsets.symmetric(horizontal: 8.0)));
expect(darkTheme.padding, equals(const EdgeInsets.all(4.0)));
expect(darkTheme.shape, equals(const TypeMatcher<StadiumBorder>()));
expect(darkTheme.shape, equals(isInstanceOf<StadiumBorder>()));
expect(darkTheme.labelStyle.color, equals(Colors.white.withAlpha(0xde)));
expect(darkTheme.secondaryLabelStyle.color, equals(customColor1.withAlpha(0xde)));
expect(darkTheme.brightness, equals(Brightness.dark));
......@@ -203,7 +203,7 @@ void main() {
expect(customTheme.secondarySelectedColor, equals(customColor2.withAlpha(0x3d)));
expect(customTheme.labelPadding, equals(const EdgeInsets.symmetric(horizontal: 8.0)));
expect(customTheme.padding, equals(const EdgeInsets.all(4.0)));
expect(customTheme.shape, equals(const TypeMatcher<StadiumBorder>()));
expect(customTheme.shape, equals(isInstanceOf<StadiumBorder>()));
expect(customTheme.labelStyle.color, equals(customColor1.withAlpha(0xde)));
expect(customTheme.secondaryLabelStyle.color, equals(customColor2.withAlpha(0xde)));
expect(customTheme.brightness, equals(Brightness.light));
......@@ -229,7 +229,7 @@ void main() {
expect(lerp.secondarySelectedColor, equals(middleGrey.withAlpha(0x3d)));
expect(lerp.labelPadding, equals(const EdgeInsets.all(4.0)));
expect(lerp.padding, equals(const EdgeInsets.all(3.0)));
expect(lerp.shape, equals(const TypeMatcher<StadiumBorder>()));
expect(lerp.shape, equals(isInstanceOf<StadiumBorder>()));
expect(lerp.labelStyle.color, equals(middleGrey.withAlpha(0xde)));
expect(lerp.secondaryLabelStyle.color, equals(middleGrey.withAlpha(0xde)));
expect(lerp.brightness, equals(Brightness.light));
......@@ -244,7 +244,7 @@ void main() {
expect(lerpANull25.secondarySelectedColor, equals(Colors.white.withAlpha(0x0f)));
expect(lerpANull25.labelPadding, equals(const EdgeInsets.only(left: 0.0, top: 2.0, right: 0.0, bottom: 2.0)));
expect(lerpANull25.padding, equals(const EdgeInsets.all(0.5)));
expect(lerpANull25.shape, equals(const TypeMatcher<StadiumBorder>()));
expect(lerpANull25.shape, equals(isInstanceOf<StadiumBorder>()));
expect(lerpANull25.labelStyle.color, equals(Colors.black.withAlpha(0x38)));
expect(lerpANull25.secondaryLabelStyle.color, equals(Colors.white.withAlpha(0x38)));
expect(lerpANull25.brightness, equals(Brightness.light));
......@@ -257,7 +257,7 @@ void main() {
expect(lerpANull75.secondarySelectedColor, equals(Colors.white.withAlpha(0x2e)));
expect(lerpANull75.labelPadding, equals(const EdgeInsets.only(left: 0.0, top: 6.0, right: 0.0, bottom: 6.0)));
expect(lerpANull75.padding, equals(const EdgeInsets.all(1.5)));
expect(lerpANull75.shape, equals(const TypeMatcher<StadiumBorder>()));
expect(lerpANull75.shape, equals(isInstanceOf<StadiumBorder>()));
expect(lerpANull75.labelStyle.color, equals(Colors.black.withAlpha(0xa7)));
expect(lerpANull75.secondaryLabelStyle.color, equals(Colors.white.withAlpha(0xa7)));
expect(lerpANull75.brightness, equals(Brightness.light));
......@@ -270,7 +270,7 @@ void main() {
expect(lerpBNull25.secondarySelectedColor, equals(Colors.black.withAlpha(0x2e)));
expect(lerpBNull25.labelPadding, equals(const EdgeInsets.only(left: 6.0, top: 0.0, right: 6.0, bottom: 0.0)));
expect(lerpBNull25.padding, equals(const EdgeInsets.all(3.0)));
expect(lerpBNull25.shape, equals(const TypeMatcher<StadiumBorder>()));
expect(lerpBNull25.shape, equals(isInstanceOf<StadiumBorder>()));
expect(lerpBNull25.labelStyle.color, equals(Colors.white.withAlpha(0xa7)));
expect(lerpBNull25.secondaryLabelStyle.color, equals(Colors.black.withAlpha(0xa7)));
expect(lerpBNull25.brightness, equals(Brightness.dark));
......@@ -283,7 +283,7 @@ void main() {
expect(lerpBNull75.secondarySelectedColor, equals(Colors.black.withAlpha(0x0f)));
expect(lerpBNull75.labelPadding, equals(const EdgeInsets.only(left: 2.0, top: 0.0, right: 2.0, bottom: 0.0)));
expect(lerpBNull75.padding, equals(const EdgeInsets.all(1.0)));
expect(lerpBNull75.shape, equals(const TypeMatcher<StadiumBorder>()));
expect(lerpBNull75.shape, equals(isInstanceOf<StadiumBorder>()));
expect(lerpBNull75.labelStyle.color, equals(Colors.white.withAlpha(0x38)));
expect(lerpBNull75.secondaryLabelStyle.color, equals(Colors.black.withAlpha(0x38)));
expect(lerpBNull75.brightness, equals(Brightness.light));
......
packages/flutter/test/material/page_test.dart
View file @ 6599271b
......@@ -4,7 +4,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter_test/flutter_test.dart' hide TypeMatcher;
import 'package:flutter_test/flutter_test.dart';
import '../rendering/mock_canvas.dart';
......
packages/flutter/test/material/popup_menu_test.dart
View file @ 6599271b
......@@ -5,7 +5,7 @@
import 'dart:ui' show window, SemanticsFlag;
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/material.dart' hide TypeMatcher;
import 'package:flutter/material.dart';
import '../widgets/semantics_tester.dart';
......@@ -179,7 +179,7 @@ void main() {
icon: const Icon(Icons.view_carousel),
itemBuilder: simplePopupMenuItemBuilder,
);
}, throwsA(const TypeMatcher<AssertionError>()));
}, throwsA(isInstanceOf<AssertionError>()));
});
testWidgets('PopupMenuButton creates IconButton when given an icon', (WidgetTester tester) async {
......
packages/flutter/test/material/slider_theme_test.dart
View file @ 6599271b
......@@ -4,7 +4,7 @@
import 'dart:ui' show window;
import 'package:flutter/material.dart' hide TypeMatcher;
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/painting.dart';
......@@ -125,8 +125,8 @@ void main() {
expect(sliderTheme.disabledThumbColor, equals(customColor2.withAlpha(0x52)));
expect(sliderTheme.overlayColor, equals(customColor1.withAlpha(0x29)));
expect(sliderTheme.valueIndicatorColor, equals(customColor1.withAlpha(0xff)));
expect(sliderTheme.thumbShape, equals(const TypeMatcher<RoundSliderThumbShape>()));
expect(sliderTheme.valueIndicatorShape, equals(const TypeMatcher<PaddleSliderValueIndicatorShape>()));
expect(sliderTheme.thumbShape, equals(isInstanceOf<RoundSliderThumbShape>()));
expect(sliderTheme.valueIndicatorShape, equals(isInstanceOf<PaddleSliderValueIndicatorShape>()));
expect(sliderTheme.showValueIndicator, equals(ShowValueIndicator.onlyForDiscrete));
expect(sliderTheme.valueIndicatorTextStyle.color, equals(customColor4));
});
......
packages/flutter/test/painting/border_rtl_test.dart
View file @ 6599271b
......@@ -467,7 +467,7 @@ void main() {
);
expect(
const BorderDirectional(start: magenta3) + const BorderDirectional(start: yellow2),
isNot(const TypeMatcher<BorderDirectional>()), // see shape_border_test.dart for better tests of this case
isNot(isInstanceOf<BorderDirectional>()), // see shape_border_test.dart for better tests of this case
);
const BorderDirectional b3 = const BorderDirectional(top: magenta3);
const BorderDirectional b6 = const BorderDirectional(top: magenta6);
......
packages/flutter/test/painting/border_test.dart
View file @ 6599271b
......@@ -75,7 +75,7 @@ void main() {
);
expect(
const Border(left: magenta3) + const Border(left: yellow2),
isNot(const TypeMatcher<Border>()), // see shape_border_test.dart for better tests of this case
isNot(isInstanceOf<Border>()), // see shape_border_test.dart for better tests of this case
);
const Border b3 = const Border(top: magenta3);
const Border b6 = const Border(top: magenta6);
......
packages/flutter/test/painting/decoration_test.dart
View file @ 6599271b
......@@ -227,10 +227,10 @@ void main() {
final Invocation call = canvas.invocations.singleWhere((Invocation call) => call.memberName == #drawImageNine);
expect(call.isMethod, isTrue);
expect(call.positionalArguments, hasLength(4));
expect(call.positionalArguments[0], const TypeMatcher<TestImage>());
expect(call.positionalArguments[0], const isInstanceOf<TestImage>());
expect(call.positionalArguments[1], new Rect.fromLTRB(10.0, 20.0, 40.0, 60.0));
expect(call.positionalArguments[2], new Rect.fromLTRB(0.0, 0.0, 100.0, 100.0));
expect(call.positionalArguments[3], const TypeMatcher<Paint>());
expect(call.positionalArguments[3], const isInstanceOf<Paint>());
expect(call.positionalArguments[3].isAntiAlias, false);
expect(call.positionalArguments[3].colorFilter, colorFilter);
expect(call.positionalArguments[3].filterQuality, FilterQuality.low);
......@@ -342,9 +342,9 @@ void main() {
});
test('Decoration.lerp with unrelated decorations', () {
expect(Decoration.lerp(const FlutterLogoDecoration(), const BoxDecoration(), 0.0), const TypeMatcher<FlutterLogoDecoration>()); // ignore: CONST_EVAL_THROWS_EXCEPTION
expect(Decoration.lerp(const FlutterLogoDecoration(), const BoxDecoration(), 0.25), const TypeMatcher<FlutterLogoDecoration>()); // ignore: CONST_EVAL_THROWS_EXCEPTION
expect(Decoration.lerp(const FlutterLogoDecoration(), const BoxDecoration(), 0.75), const TypeMatcher<BoxDecoration>()); // ignore: CONST_EVAL_THROWS_EXCEPTION
expect(Decoration.lerp(const FlutterLogoDecoration(), const BoxDecoration(), 1.0), const TypeMatcher<BoxDecoration>()); // ignore: CONST_EVAL_THROWS_EXCEPTION
expect(Decoration.lerp(const FlutterLogoDecoration(), const BoxDecoration(), 0.0), const isInstanceOf<FlutterLogoDecoration>()); // ignore: CONST_EVAL_THROWS_EXCEPTION
expect(Decoration.lerp(const FlutterLogoDecoration(), const BoxDecoration(), 0.25), const isInstanceOf<FlutterLogoDecoration>()); // ignore: CONST_EVAL_THROWS_EXCEPTION
expect(Decoration.lerp(const FlutterLogoDecoration(), const BoxDecoration(), 0.75), const isInstanceOf<BoxDecoration>()); // ignore: CONST_EVAL_THROWS_EXCEPTION
expect(Decoration.lerp(const FlutterLogoDecoration(), const BoxDecoration(), 1.0), const isInstanceOf<BoxDecoration>()); // ignore: CONST_EVAL_THROWS_EXCEPTION
});
}
packages/flutter/test/painting/edge_insets_test.dart
View file @ 6599271b
......@@ -175,7 +175,7 @@ void main() {
test('EdgeInsetsGeometry operators', () {
final EdgeInsetsGeometry a = const EdgeInsetsDirectional.fromSTEB(1.0, 2.0, 3.0, 5.0).add(EdgeInsets.zero);
expect(a, isNot(const TypeMatcher<EdgeInsetsDirectional>()));
expect(a, isNot(isInstanceOf<EdgeInsetsDirectional>()));
expect(a * 2.0, const EdgeInsetsDirectional.fromSTEB(2.0, 4.0, 6.0, 10.0));
expect(a / 2.0, const EdgeInsetsDirectional.fromSTEB(0.5, 1.0, 1.5, 2.5));
expect(a % 2.0, const EdgeInsetsDirectional.fromSTEB(1.0, 0.0, 1.0, 1.0));
......
packages/flutter/test/rendering/box_constraints_test.dart
View file @ 6599271b
......@@ -153,9 +153,9 @@ void main() {
minHeight: 20.0,
maxHeight: 30.0,
);
expect(() => BoxConstraints.lerp(constraints1, constraints2, 0.5), throwsA(const TypeMatcher<AssertionError>()));
expect(() => BoxConstraints.lerp(constraints1, constraints3, 0.5), throwsA(const TypeMatcher<AssertionError>()));
expect(() => BoxConstraints.lerp(constraints2, constraints3, 0.5), throwsA(const TypeMatcher<AssertionError>()));
expect(() => BoxConstraints.lerp(constraints1, constraints2, 0.5), throwsA(const isInstanceOf<AssertionError>()));
expect(() => BoxConstraints.lerp(constraints1, constraints3, 0.5), throwsA(const isInstanceOf<AssertionError>()));
expect(() => BoxConstraints.lerp(constraints2, constraints3, 0.5), throwsA(const isInstanceOf<AssertionError>()));
});
test('BoxConstraints normalize', () {
......
packages/flutter/test/rendering/flex_test.dart
View file @ 6599271b
......@@ -358,7 +358,7 @@ void main() {
expect(exceptions, isEmpty);
layout(parent);
expect(exceptions, isNotEmpty);
expect(exceptions.first, const TypeMatcher<FlutterError>());
expect(exceptions.first, isInstanceOf<FlutterError>());
});
test('MainAxisSize.min inside unconstrained', () {
......@@ -388,7 +388,7 @@ void main() {
expect(exceptions, isEmpty);
layout(parent);
expect(exceptions, isNotEmpty);
expect(exceptions.first, const TypeMatcher<FlutterError>());
expect(exceptions.first, isInstanceOf<FlutterError>());
});
test('MainAxisSize.min inside tightly constrained', () {
......
packages/flutter/test/services/platform_channel_test.dart
View file @ 6599271b
......@@ -215,7 +215,7 @@ void main() {
await new Future<Null>.delayed(Duration.zero);
expect(events, isEmpty);
expect(errors, hasLength(1));
expect(errors[0], const TypeMatcher<PlatformException>());
expect(errors[0], const isInstanceOf<PlatformException>());
final PlatformException error = errors[0];
expect(error.code, '404');
expect(error.message, 'Not Found.');
......
packages/flutter/test/widgets/animated_switcher_test.dart
View file @ 6599271b
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'package:flutter/widgets.dart' hide TypeMatcher;
import 'package:flutter/widgets.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
......@@ -221,7 +221,7 @@ void main() {
expect(find.byType(Column), findsOneWidget);
for (Widget child in foundChildren) {
expect(child, const TypeMatcher<KeyedSubtree>());
expect(child, isInstanceOf<KeyedSubtree>());
}
await tester.pumpWidget(
......@@ -239,7 +239,7 @@ void main() {
await tester.pump(const Duration(milliseconds: 50));
for (Widget child in foundChildren) {
expect(child, const TypeMatcher<KeyedSubtree>());
expect(child, isInstanceOf<KeyedSubtree>());
expect(
find.descendant(of: find.byWidget(child), matching: find.byType(SizeTransition)),
findsOneWidget,
......@@ -389,7 +389,7 @@ void main() {
expect(foundChildren.length, equals(3));
for (Widget child in foundChildren) {
expect(child, const TypeMatcher<KeyedSubtree>());
expect(child, isInstanceOf<KeyedSubtree>());
expect(
find.descendant(of: find.byWidget(child), matching: find.byType(FadeTransition)),
findsOneWidget,
......@@ -419,7 +419,7 @@ void main() {
expect(foundChildren.length, equals(3));
for (Widget child in foundChildren) {
expect(child, const TypeMatcher<KeyedSubtree>());
expect(child, isInstanceOf<KeyedSubtree>());
expect(
find.descendant(of: find.byWidget(child), matching: find.byType(ScaleTransition)),
findsOneWidget,
......
packages/flutter/test/widgets/app_navigator_key_test.dart
View file @ 6599271b
......@@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/widgets.dart' hide TypeMatcher;
import 'package:flutter/widgets.dart';
final RouteFactory generateRoute = (RouteSettings settings) => new PageRouteBuilder<void>(
settings: settings,
......@@ -20,7 +20,7 @@ void main() {
color: const Color(0xFF112233),
onGenerateRoute: generateRoute,
));
expect(key.currentState, const TypeMatcher<NavigatorState>());
expect(key.currentState, isInstanceOf<NavigatorState>());
await tester.pumpWidget(new WidgetsApp(
color: const Color(0xFF112233),
onGenerateRoute: generateRoute,
......@@ -31,6 +31,6 @@ void main() {
color: const Color(0xFF112233),
onGenerateRoute: generateRoute,
));
expect(key.currentState, const TypeMatcher<NavigatorState>());
expect(key.currentState, isInstanceOf<NavigatorState>());
});
}
packages/flutter/test/widgets/dispose_ancestor_lookup_test.dart
View file @ 6599271b
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'package:flutter_test/flutter_test.dart' hide TypeMatcher;
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/widgets.dart';
typedef void TestCallback(BuildContext context);
......
packages/flutter/test/widgets/flow_test.dart
View file @ 6599271b
......@@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/widgets.dart' hide TypeMatcher;
import 'package:flutter/widgets.dart';
import 'package:flutter/rendering.dart';
class TestFlowDelegate extends FlowDelegate {
......@@ -113,9 +113,9 @@ void main() {
ContainerLayer layer = RendererBinding.instance.renderView.debugLayer;
while (layer != null && !(layer is OpacityLayer))
layer = layer.firstChild;
expect(layer, const TypeMatcher<OpacityLayer>());
expect(layer, isInstanceOf<OpacityLayer>());
final OpacityLayer opacityLayer = layer;
expect(opacityLayer.alpha, equals(opacity * 255));
expect(layer.firstChild, const TypeMatcher<TransformLayer>());
expect(layer.firstChild, isInstanceOf<TransformLayer>());
});
}
packages/flutter/test/widgets/navigator_test.dart
View file @ 6599271b
......@@ -5,7 +5,7 @@
import 'dart:ui';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/material.dart' hide TypeMatcher;
import 'package:flutter/material.dart';
import 'semantics_tester.dart';
......@@ -186,7 +186,7 @@ void main() {
);
await tester.pumpWidget(widget);
await tester.tap(find.byKey(targetKey));
expect(exception, const TypeMatcher<FlutterError>());
expect(exception, isInstanceOf<FlutterError>());
expect('$exception', startsWith('Navigator operation requested with a context'));
});
......
packages/flutter/test/widgets/page_forward_transitions_test.dart
View file @ 6599271b
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'package:flutter_test/flutter_test.dart' hide TypeMatcher;
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
......
packages/flutter/test/widgets/routes_test.dart
View file @ 6599271b
......@@ -6,7 +6,7 @@ import 'dart:collection';
import 'package:mockito/mockito.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/widgets.dart' hide TypeMatcher;
import 'package:flutter/widgets.dart';
final List<String> results = <String>[];
......@@ -46,7 +46,7 @@ class TestRoute extends LocalHistoryRoute<String> {
@override
void didReplace(Route<dynamic> oldRoute) {
expect(oldRoute, const TypeMatcher<TestRoute>());
expect(oldRoute, isInstanceOf<TestRoute>());
final TestRoute castRoute = oldRoute;
log('didReplace ${castRoute.name}');
super.didReplace(castRoute);
......@@ -63,7 +63,7 @@ class TestRoute extends LocalHistoryRoute<String> {
@override
void didPopNext(Route<dynamic> nextRoute) {
expect(nextRoute, const TypeMatcher<TestRoute>());
expect(nextRoute, isInstanceOf<TestRoute>());
final TestRoute castRoute = nextRoute;
log('didPopNext ${castRoute.name}');
super.didPopNext(castRoute);
......@@ -71,7 +71,7 @@ class TestRoute extends LocalHistoryRoute<String> {
@override
void didChangeNext(Route<dynamic> nextRoute) {
expect(nextRoute, anyOf(isNull, const TypeMatcher<TestRoute>()));
expect(nextRoute, anyOf(isNull, isInstanceOf<TestRoute>()));
final TestRoute castRoute = nextRoute;
log('didChangeNext ${castRoute?.name}');
super.didChangeNext(castRoute);
......
packages/flutter/test/widgets/scroll_behavior_test.dart
View file @ 6599271b
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'package:flutter/widgets.dart' hide TypeMatcher;
import 'package:flutter/widgets.dart';
import 'package:flutter_test/flutter_test.dart';
class TestScrollBehavior extends ScrollBehavior {
......@@ -47,7 +47,7 @@ void main() {
expect(behavior, isNotNull);
expect(behavior.flag, isTrue);
expect(position.physics, const TypeMatcher<ClampingScrollPhysics>());
expect(position.physics, isInstanceOf<ClampingScrollPhysics>());
ScrollMetrics metrics = position.copyWith();
expect(metrics.extentAfter, equals(400.0));
expect(metrics.viewportDimension, equals(600.0));
......@@ -62,7 +62,7 @@ void main() {
expect(behavior, isNotNull);
expect(behavior.flag, isFalse);
expect(position.physics, const TypeMatcher<BouncingScrollPhysics>());
expect(position.physics, isInstanceOf<BouncingScrollPhysics>());
// Regression test for https://github.com/flutter/flutter/issues/5856
metrics = position.copyWith();
expect(metrics.extentAfter, equals(400.0));
......
packages/flutter/test/widgets/scroll_notification_test.dart
View file @ 6599271b
......@@ -4,7 +4,7 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/widgets.dart' hide TypeMatcher;
import 'package:flutter/widgets.dart';
void main() {
testWidgets('Scroll notification basics', (WidgetTester tester) async {
......@@ -23,7 +23,7 @@ void main() {
final TestGesture gesture = await tester.startGesture(const Offset(100.0, 100.0));
await tester.pump(const Duration(seconds: 1));
expect(notification, const TypeMatcher<ScrollStartNotification>());
expect(notification, isInstanceOf<ScrollStartNotification>());
expect(notification.depth, equals(0));
final ScrollStartNotification start = notification;
expect(start.dragDetails, isNotNull);
......@@ -31,7 +31,7 @@ void main() {
await gesture.moveBy(const Offset(-10.0, -10.0));
await tester.pump(const Duration(seconds: 1));
expect(notification, const TypeMatcher<ScrollUpdateNotification>());
expect(notification, isInstanceOf<ScrollUpdateNotification>());
expect(notification.depth, equals(0));
final ScrollUpdateNotification update = notification;
expect(update.dragDetails, isNotNull);
......@@ -40,7 +40,7 @@ void main() {
await gesture.up();
await tester.pump(const Duration(seconds: 1));
expect(notification, const TypeMatcher<ScrollEndNotification>());
expect(notification, isInstanceOf<ScrollEndNotification>());
expect(notification.depth, equals(0));
final ScrollEndNotification end = notification;
expect(end.dragDetails, isNotNull);
......
packages/flutter/test/widgets/scroll_view_test.dart
View file @ 6599271b
......@@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/widgets.dart' hide TypeMatcher;
import 'package:flutter/widgets.dart';
import 'states.dart';
......@@ -319,22 +319,22 @@ void main() {
testWidgets('Primary ListViews are always scrollable', (WidgetTester tester) async {
final ListView view = new ListView(primary: true);
expect(view.physics, const TypeMatcher<AlwaysScrollableScrollPhysics>());
expect(view.physics, isInstanceOf<AlwaysScrollableScrollPhysics>());
});
testWidgets('Non-primary ListViews are not always scrollable', (WidgetTester tester) async {
final ListView view = new ListView(primary: false);
expect(view.physics, isNot(const TypeMatcher<AlwaysScrollableScrollPhysics>()));
expect(view.physics, isNot(isInstanceOf<AlwaysScrollableScrollPhysics>()));
});
testWidgets('Defaulting-to-primary ListViews are always scrollable', (WidgetTester tester) async {
final ListView view = new ListView(scrollDirection: Axis.vertical);
expect(view.physics, const TypeMatcher<AlwaysScrollableScrollPhysics>());
expect(view.physics, isInstanceOf<AlwaysScrollableScrollPhysics>());
});
testWidgets('Defaulting-to-not-primary ListViews are not always scrollable', (WidgetTester tester) async {
final ListView view = new ListView(scrollDirection: Axis.horizontal);
expect(view.physics, isNot(const TypeMatcher<AlwaysScrollableScrollPhysics>()));
expect(view.physics, isNot(isInstanceOf<AlwaysScrollableScrollPhysics>()));
});
testWidgets('primary:true leads to scrolling', (WidgetTester tester) async {
......
packages/flutter/test/widgets/set_state_5_test.dart
View file @ 6599271b
......@@ -3,7 +3,7 @@
// found in the LICENSE file.
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/widgets.dart' hide TypeMatcher;
import 'package:flutter/widgets.dart';
class BadWidget extends StatefulWidget {
@override
......@@ -29,6 +29,6 @@ class BadWidgetState extends State<BadWidget> {
void main() {
testWidgets('setState() catches being used inside a constructor', (WidgetTester tester) async {
await tester.pumpWidget(new BadWidget());
expect(tester.takeException(), const TypeMatcher<FlutterError>());
expect(tester.takeException(), isInstanceOf<FlutterError>());
});
}
packages/flutter/test/widgets/single_child_scroll_view_test.dart
View file @ 6599271b
......@@ -6,7 +6,7 @@ import 'dart:ui';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/widgets.dart' hide TypeMatcher;
import 'package:flutter/widgets.dart';
import 'semantics_tester.dart';
......@@ -72,7 +72,7 @@ void main() {
));
final ScrollableState scrollable = tester.state(find.byType(Scrollable));
expect(scrollable.position, const TypeMatcher<TestScrollPosition>());
expect(scrollable.position, isInstanceOf<TestScrollPosition>());
});
testWidgets('Sets PrimaryScrollController when primary', (WidgetTester tester) async {
......
packages/flutter/test/widgets/size_changed_layout_notification_test.dart
View file @ 6599271b
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'package:flutter/widgets.dart' hide TypeMatcher;
import 'package:flutter/widgets.dart';
import 'package:flutter_test/flutter_test.dart';
class NotifyMaterial extends StatelessWidget {
......@@ -37,7 +37,7 @@ void main() {
new Center(
child: new NotificationListener<LayoutChangedNotification>(
onNotification: (LayoutChangedNotification notification) {
expect(notification, const TypeMatcher<SizeChangedLayoutNotification>());
expect(notification, isInstanceOf<SizeChangedLayoutNotification>());
notified = true;
return true;
},
......
packages/flutter/test/widgets/slivers_appbar_floating_test.dart
View file @ 6599271b
......@@ -4,11 +4,11 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/widgets.dart' hide TypeMatcher;
import 'package:flutter/widgets.dart';
void verifyPaintPosition(GlobalKey key, Offset ideal, bool visible) {
final RenderSliver target = key.currentContext.findRenderObject();
expect(target.parent, const TypeMatcher<RenderViewport>());
expect(target.parent, isInstanceOf<RenderViewport>());
final SliverPhysicalParentData parentData = target.parentData;
final Offset actual = parentData.paintOffset;
expect(actual, ideal);
......
packages/flutter/test/widgets/slivers_appbar_pinned_test.dart
View file @ 6599271b
......@@ -4,11 +4,11 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/widgets.dart' hide TypeMatcher;
import 'package:flutter/widgets.dart';
void verifyPaintPosition(GlobalKey key, Offset ideal, bool visible) {
final RenderSliver target = key.currentContext.findRenderObject();
expect(target.parent, const TypeMatcher<RenderViewport>());
expect(target.parent, isInstanceOf<RenderViewport>());
final SliverPhysicalParentData parentData = target.parentData;
final Offset actual = parentData.paintOffset;
expect(actual, ideal);
......
packages/flutter/test/widgets/slivers_appbar_scrolling_test.dart
View file @ 6599271b
......@@ -4,11 +4,11 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/widgets.dart' hide TypeMatcher;
import 'package:flutter/widgets.dart';
void verifyPaintPosition(GlobalKey key, Offset ideal) {
final RenderObject target = key.currentContext.findRenderObject();
expect(target.parent, const TypeMatcher<RenderViewport>());
expect(target.parent, isInstanceOf<RenderViewport>());
final SliverPhysicalParentData parentData = target.parentData;
final Offset actual = parentData.paintOffset;
expect(actual, ideal);
......
packages/flutter/test/widgets/slivers_padding_test.dart
View file @ 6599271b
......@@ -4,7 +4,7 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/widgets.dart' hide TypeMatcher;
import 'package:flutter/widgets.dart';
Future<Null> test(WidgetTester tester, double offset, EdgeInsetsGeometry padding, AxisDirection axisDirection, TextDirection textDirection) {
return tester.pumpWidget(
......@@ -168,11 +168,11 @@ void main() {
result = tester.hitTestOnBinding(const Offset(10.0, 10.0));
expect(result.path.first.target, tester.firstRenderObject<RenderObject>(find.byType(Text)));
result = tester.hitTestOnBinding(const Offset(10.0, 60.0));
expect(result.path.first.target, const TypeMatcher<RenderView>());
expect(result.path.first.target, isInstanceOf<RenderView>());
result = tester.hitTestOnBinding(const Offset(100.0, 100.0));
expect(result.path.first.target, tester.renderObjectList<RenderObject>(find.byType(Text)).skip(1).first);
result = tester.hitTestOnBinding(const Offset(100.0, 490.0));
expect(result.path.first.target, const TypeMatcher<RenderView>());
expect(result.path.first.target, isInstanceOf<RenderView>());
result = tester.hitTestOnBinding(const Offset(10.0, 520.0));
expect(result.path.first.target, tester.renderObjectList<RenderObject>(find.byType(Text)).last);
});
......@@ -190,11 +190,11 @@ void main() {
result = tester.hitTestOnBinding(const Offset(10.0, 600.0-10.0));
expect(result.path.first.target, tester.firstRenderObject<RenderObject>(find.byType(Text)));
result = tester.hitTestOnBinding(const Offset(10.0, 600.0-60.0));
expect(result.path.first.target, const TypeMatcher<RenderView>());
expect(result.path.first.target, isInstanceOf<RenderView>());
result = tester.hitTestOnBinding(const Offset(100.0, 600.0-100.0));
expect(result.path.first.target, tester.renderObjectList<RenderObject>(find.byType(Text)).skip(1).first);
result = tester.hitTestOnBinding(const Offset(100.0, 600.0-490.0));
expect(result.path.first.target, const TypeMatcher<RenderView>());
expect(result.path.first.target, isInstanceOf<RenderView>());
result = tester.hitTestOnBinding(const Offset(10.0, 600.0-520.0));
expect(result.path.first.target, tester.renderObjectList<RenderObject>(find.byType(Text)).last);
});
......@@ -212,11 +212,11 @@ void main() {
result = tester.hitTestOnBinding(const Offset(800.0-10.0, 10.0));
expect(result.path.first.target, tester.firstRenderObject<RenderObject>(find.byType(Text)));
result = tester.hitTestOnBinding(const Offset(800.0-60.0, 10.0));
expect(result.path.first.target, const TypeMatcher<RenderView>());
expect(result.path.first.target, isInstanceOf<RenderView>());
result = tester.hitTestOnBinding(const Offset(800.0-100.0, 100.0));
expect(result.path.first.target, tester.renderObjectList<RenderObject>(find.byType(Text)).skip(1).first);
result = tester.hitTestOnBinding(const Offset(800.0-490.0, 100.0));
expect(result.path.first.target, const TypeMatcher<RenderView>());
expect(result.path.first.target, isInstanceOf<RenderView>());
result = tester.hitTestOnBinding(const Offset(800.0-520.0, 10.0));
expect(result.path.first.target, tester.renderObjectList<RenderObject>(find.byType(Text)).last);
});
......@@ -234,11 +234,11 @@ void main() {
result = tester.hitTestOnBinding(const Offset(10.0, 10.0));
expect(result.path.first.target, tester.firstRenderObject<RenderObject>(find.byType(Text)));
result = tester.hitTestOnBinding(const Offset(60.0, 10.0));
expect(result.path.first.target, const TypeMatcher<RenderView>());
expect(result.path.first.target, isInstanceOf<RenderView>());
result = tester.hitTestOnBinding(const Offset(100.0, 100.0));
expect(result.path.first.target, tester.renderObjectList<RenderObject>(find.byType(Text)).skip(1).first);
result = tester.hitTestOnBinding(const Offset(490.0, 100.0));
expect(result.path.first.target, const TypeMatcher<RenderView>());
expect(result.path.first.target, isInstanceOf<RenderView>());
result = tester.hitTestOnBinding(const Offset(520.0, 10.0));
expect(result.path.first.target, tester.renderObjectList<RenderObject>(find.byType(Text)).last);
});
......
packages/flutter/test/widgets/slivers_protocol_test.dart
View file @ 6599271b
......@@ -6,11 +6,11 @@ import 'dart:math' as math;
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/widgets.dart' hide TypeMatcher;
import 'package:flutter/widgets.dart';
void verifyPaintPosition(GlobalKey key, Offset ideal) {
final RenderObject target = key.currentContext.findRenderObject();
expect(target.parent, const TypeMatcher<RenderViewport>());
expect(target.parent, isInstanceOf<RenderViewport>());
final SliverPhysicalParentData parentData = target.parentData;
final Offset actual = parentData.paintOffset;
expect(actual, ideal);
......
packages/flutter/test/widgets/transitions_test.dart
View file @ 6599271b
......@@ -4,7 +4,7 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/widgets.dart' hide TypeMatcher;
import 'package:flutter/widgets.dart';
void main() {
testWidgets('toString control test', (WidgetTester tester) async {
......@@ -77,7 +77,7 @@ void main() {
actualDecoration = actualBox.decoration;
expect(actualDecoration.color, const Color(0xFF7F7F7F));
expect(actualDecoration.border, const TypeMatcher<Border>());
expect(actualDecoration.border, isInstanceOf<Border>());
final Border border = actualDecoration.border;
expect(border.left.width, 2.5);
expect(border.left.style, BorderStyle.solid);
......@@ -133,7 +133,7 @@ void main() {
// Same as the test above but the values should be much closer to the
// tween's end values given the easeOut curve.
expect(actualDecoration.color, const Color(0xFF505050));
expect(actualDecoration.border, const TypeMatcher<Border>());
expect(actualDecoration.border, isInstanceOf<Border>());
final Border border = actualDecoration.border;
expect(border.left.width, closeTo(1.9, 0.1));
expect(border.left.style, BorderStyle.solid);
......
packages/flutter/test/widgets/widget_inspector_test.dart
View file @ 6599271b
......@@ -5,9 +5,9 @@
import 'dart:async';
import 'dart:convert';
import 'package:flutter/material.dart' hide TypeMatcher;
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/widgets.dart' hide TypeMatcher;
import 'package:flutter/widgets.dart';
import 'package:flutter_test/flutter_test.dart';
typedef FutureOr<Map<String, Object>> InspectorServiceExtensionCallback(Map<String, String> parameters);
......@@ -495,7 +495,7 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
expect(chainNode['node'], isMap);
final Map<String, Object> jsonNode = chainNode['node'];
expect(service.toObject(jsonNode['valueId']), equals(element));
expect(service.toObject(jsonNode['objectId']), const TypeMatcher<DiagnosticsNode>());
expect(service.toObject(jsonNode['objectId']), isInstanceOf<DiagnosticsNode>());
expect(chainNode['children'], isList);
final List<Object> jsonChildren = chainNode['children'];
......@@ -511,7 +511,7 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
expect(jsonChildren[j], isMap);
final Map<String, Object> childJson = jsonChildren[j];
expect(service.toObject(childJson['valueId']), equals(childrenElements[j]));
expect(service.toObject(childJson['objectId']), const TypeMatcher<DiagnosticsNode>());
expect(service.toObject(childJson['objectId']), isInstanceOf<DiagnosticsNode>());
}
}
});
......@@ -528,7 +528,7 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
for (int i = 0; i < propertiesJson.length; ++i) {
final Map<String, Object> propertyJson = propertiesJson[i];
expect(service.toObject(propertyJson['valueId']), equals(properties[i].value));
expect(service.toObject(propertyJson['objectId']), const TypeMatcher<DiagnosticsNode>());
expect(service.toObject(propertyJson['objectId']), isInstanceOf<DiagnosticsNode>());
}
});
......@@ -557,7 +557,7 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
for (int i = 0; i < propertiesJson.length; ++i) {
final Map<String, Object> propertyJson = propertiesJson[i];
expect(service.toObject(propertyJson['valueId']), equals(children[i].value));
expect(service.toObject(propertyJson['objectId']), const TypeMatcher<DiagnosticsNode>());
expect(service.toObject(propertyJson['objectId']), isInstanceOf<DiagnosticsNode>());
}
});
......@@ -811,7 +811,7 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
expect(chainNode['node'], isMap);
final Map<String, Object> jsonNode = chainNode['node'];
expect(service.toObject(jsonNode['valueId']), equals(element));
expect(service.toObject(jsonNode['objectId']), const TypeMatcher<DiagnosticsNode>());
expect(service.toObject(jsonNode['objectId']), isInstanceOf<DiagnosticsNode>());
expect(chainNode['children'], isList);
final List<Object> jsonChildren = chainNode['children'];
......@@ -827,7 +827,7 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
expect(jsonChildren[j], isMap);
final Map<String, Object> childJson = jsonChildren[j];
expect(service.toObject(childJson['valueId']), equals(childrenElements[j]));
expect(service.toObject(childJson['objectId']), const TypeMatcher<DiagnosticsNode>());
expect(service.toObject(childJson['objectId']), isInstanceOf<DiagnosticsNode>());
}
}
});
......@@ -843,7 +843,7 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
for (int i = 0; i < propertiesJson.length; ++i) {
final Map<String, Object> propertyJson = propertiesJson[i];
expect(service.toObject(propertyJson['valueId']), equals(properties[i].value));
expect(service.toObject(propertyJson['objectId']), const TypeMatcher<DiagnosticsNode>());
expect(service.toObject(propertyJson['objectId']), isInstanceOf<DiagnosticsNode>());
}
});
......@@ -871,7 +871,7 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
for (int i = 0; i < propertiesJson.length; ++i) {
final Map<String, Object> propertyJson = propertiesJson[i];
expect(service.toObject(propertyJson['valueId']), equals(children[i].value));
expect(service.toObject(propertyJson['objectId']), const TypeMatcher<DiagnosticsNode>());
expect(service.toObject(propertyJson['objectId']), isInstanceOf<DiagnosticsNode>());
}
});
......@@ -899,13 +899,13 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
for (int i = 0; i < childrenJson.length; ++i) {
final Map<String, Object> childJson = childrenJson[i];
expect(service.toObject(childJson['valueId']), equals(children[i].value));
expect(service.toObject(childJson['objectId']), const TypeMatcher<DiagnosticsNode>());
expect(service.toObject(childJson['objectId']), isInstanceOf<DiagnosticsNode>());
final List<Object> propertiesJson = childJson['properties'];
final DiagnosticsNode diagnosticsNode = service.toObject(childJson['objectId']);
final List<DiagnosticsNode> expectedProperties = diagnosticsNode.getProperties();
for (Map<String, Object> propertyJson in propertiesJson) {
final Object property = service.toObject(propertyJson['objectId']);
expect(property, const TypeMatcher<DiagnosticsNode>());
expect(property, isInstanceOf<DiagnosticsNode>());
expect(expectedProperties.contains(property), isTrue);
}
}
......@@ -937,13 +937,13 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
for (int i = 0; i < childrenJson.length; ++i) {
final Map<String, Object> childJson = childrenJson[i];
expect(service.toObject(childJson['valueId']), equals(children[i].value));
expect(service.toObject(childJson['objectId']), const TypeMatcher<DiagnosticsNode>());
expect(service.toObject(childJson['objectId']), isInstanceOf<DiagnosticsNode>());
final List<Object> propertiesJson = childJson['properties'];
final DiagnosticsNode diagnosticsNode = service.toObject(childJson['objectId']);
final List<DiagnosticsNode> expectedProperties = diagnosticsNode.getProperties();
for (Map<String, Object> propertyJson in propertiesJson) {
final Object property = service.toObject(propertyJson['objectId']);
expect(property, const TypeMatcher<DiagnosticsNode>());
expect(property, isInstanceOf<DiagnosticsNode>());
expect(expectedProperties.contains(property), isTrue);
}
}
......
packages/flutter_driver/pubspec.yaml
View file @ 6599271b
......@@ -38,7 +38,7 @@ dependencies:
js: 0.6.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
kernel: 0.3.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
logging: 0.11.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
mime: 0.9.6+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
multi_server_socket: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
node_preamble: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -65,8 +65,8 @@ dependencies:
yaml: 2.1.14 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
dev_dependencies:
test: 0.12.42
test: 0.12.41
mockito: 3.0.0-alpha+5
quiver: 0.29.0+1
# PUBSPEC CHECKSUM: 0a0b
# PUBSPEC CHECKSUM: 1909
packages/flutter_driver/test/flutter_driver_test.dart
View file @ 6599271b
......@@ -138,7 +138,7 @@ void main() {
group('ByValueKey', () {
test('restricts value types', () async {
expect(() => find.byValueKey(null),
throwsA(const TypeMatcher<DriverError>()));
throwsA(const isInstanceOf<DriverError>()));
});
test('finds by ValueKey', () async {
......@@ -158,7 +158,7 @@ void main() {
group('tap', () {
test('requires a target reference', () async {
expect(driver.tap(null), throwsA(const TypeMatcher<DriverError>()));
expect(driver.tap(null), throwsA(const isInstanceOf<DriverError>()));
});
test('sends the tap command', () async {
......@@ -177,7 +177,7 @@ void main() {
group('getText', () {
test('requires a target reference', () async {
expect(driver.getText(null), throwsA(const TypeMatcher<DriverError>()));
expect(driver.getText(null), throwsA(const isInstanceOf<DriverError>()));
});
test('sends the getText command', () async {
......@@ -200,7 +200,7 @@ void main() {
group('waitFor', () {
test('requires a target reference', () async {
expect(driver.waitFor(null), throwsA(const TypeMatcher<DriverError>()));
expect(driver.waitFor(null), throwsA(const isInstanceOf<DriverError>()));
});
test('sends the waitFor command', () async {
......
packages/flutter_goldens/pubspec.yaml
View file @ 6599271b
......@@ -30,7 +30,7 @@ dependencies:
json_rpc_2: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
kernel: 0.3.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
logging: 0.11.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
mime: 0.9.6+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
multi_server_socket: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
node_preamble: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -52,7 +52,7 @@ dependencies:
stream_channel: 1.6.7+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
string_scanner: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
term_glyph: 1.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
typed_data: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
utf: 0.9.0+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
vector_math: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -67,4 +67,4 @@ dev_dependencies:
environment:
sdk: '>=1.19.0 <2.0.0'
# PUBSPEC CHECKSUM: 8558
# PUBSPEC CHECKSUM: 6256
packages/flutter_localizations/pubspec.yaml
View file @ 6599271b
......@@ -36,7 +36,7 @@ dev_dependencies:
json_rpc_2: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
kernel: 0.3.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
logging: 0.11.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
mime: 0.9.6+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
multi_server_socket: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
node_preamble: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -57,11 +57,11 @@ dev_dependencies:
stream_channel: 1.6.7+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
string_scanner: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
term_glyph: 1.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
utf: 0.9.0+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
vm_service_client: 0.2.4+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
watcher: 0.9.7+8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
web_socket_channel: 1.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
yaml: 2.1.14 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
# PUBSPEC CHECKSUM: d176
# PUBSPEC CHECKSUM: e074
packages/flutter_test/lib/src/matchers.dart
View file @ 6599271b
......@@ -7,11 +7,12 @@ import 'dart:math' as math;
import 'dart:ui' as ui;
import 'package:meta/meta.dart';
import 'package:test/test.dart';
import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;
import 'package:test/test.dart' as test_package show isInstanceOf;
import 'package:test/src/frontend/async_matcher.dart'; // ignore: implementation_imports
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart' hide TypeMatcher;
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/services.dart';
......@@ -148,7 +149,7 @@ const Matcher hasAGoodToStringDeep = const _HasGoodToStringDeep();
/// A matcher for functions that throw [FlutterError].
///
/// This is equivalent to `throwsA(const TypeMatcher<FlutterError>())`.
/// This is equivalent to `throwsA(isInstanceOf<FlutterError>())`.
///
/// See also:
///
......@@ -159,7 +160,7 @@ final Matcher throwsFlutterError = throwsA(isFlutterError);
/// A matcher for functions that throw [AssertionError].
///
/// This is equivalent to `throwsA(const TypeMatcher<AssertionError>())`.
/// This is equivalent to `throwsA(isInstanceOf<AssertionError>())`.
///
/// See also:
///
......@@ -170,23 +171,27 @@ final Matcher throwsAssertionError = throwsA(isAssertionError);
/// A matcher for [FlutterError].
///
/// This is equivalent to `const TypeMatcher<FlutterError>()`.
/// This is equivalent to `isInstanceOf<FlutterError>()`.
///
/// See also:
///
/// * [throwsFlutterError], to test if a function throws a [FlutterError].
/// * [isAssertionError], to test if any object is any kind of [AssertionError].
const Matcher isFlutterError = const TypeMatcher<FlutterError>();
final Matcher isFlutterError = isInstanceOf<FlutterError>();
/// A matcher for [AssertionError].
///
/// This is equivalent to `const TypeMatcher<AssertionError>()`.
/// This is equivalent to `isInstanceOf<AssertionError>()`.
///
/// See also:
///
/// * [throwsAssertionError], to test if a function throws any [AssertionError].
/// * [isFlutterError], to test if any object is a [FlutterError].
const Matcher isAssertionError = const TypeMatcher<AssertionError>();
final Matcher isAssertionError = isInstanceOf<AssertionError>();
/// A matcher that compares the type of the actual value to the type argument T.
// TODO(ianh): https://github.com/flutter/flutter/issues/18608, https://github.com/dart-lang/matcher/pull/88
Matcher isInstanceOf<T>() => new test_package.isInstanceOf<T>(); // ignore: prefer_const_constructors, https://github.com/dart-lang/sdk/issues/32544
/// Asserts that two [double]s are equal, within some tolerated error.
///
......
packages/flutter_test/lib/src/widget_tester.dart
View file @ 6599271b
......@@ -21,7 +21,10 @@ import 'matchers.dart';
import 'test_async_utils.dart';
import 'test_text_input.dart';
export 'package:test/test.dart' hide expect;
export 'package:test/test.dart' hide
expect, // we have our own wrapper below
TypeMatcher, // matcher's TypeMatcher conflicts with the one in the Flutter framework
isInstanceOf; // we have our own wrapper in matchers.dart
/// Signature for callback to [testWidgets] and [benchmarkWidgets].
typedef Future<Null> WidgetTesterCallback(WidgetTester widgetTester);
......
packages/flutter_test/pubspec.yaml
View file @ 6599271b
......@@ -8,7 +8,7 @@ dependencies:
# We depend on very specific internal implementation details of the
# 'test' package, which change between versions, so when upgrading
# this, make sure the tests are still running correctly.
test: 0.12.42
test: 0.12.41
# Used by golden file comparator
path: 1.6.1
......@@ -44,7 +44,7 @@ dependencies:
json_rpc_2: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
kernel: 0.3.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
logging: 0.11.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
meta: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
mime: 0.9.6+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
multi_server_socket: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -76,4 +76,4 @@ dev_dependencies:
intl: 0.15.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
# PUBSPEC CHECKSUM: 038c
# PUBSPEC CHECKSUM: 3a8a
packages/flutter_test/test/custom_exception_reporter/flutter_test_config.dart
View file @ 6599271b
......@@ -9,7 +9,7 @@ import 'package:flutter_test/flutter_test.dart';
Future<void> main(FutureOr<void> testMain()) async {
reportTestException = (FlutterErrorDetails details, String testDescription) {
expect(details.exception, const TypeMatcher<StateError>());
expect(details.exception, isInstanceOf<StateError>());
expect(details.exception.message, 'foo');
expect(testDescription, 'custom exception reporter');
};
......
packages/flutter_test/test/goldens_test.dart
View file @ 6599271b
......@@ -59,7 +59,7 @@ void main() {
group('goldenFileComparator', () {
test('is initialized by test framework', () {
expect(goldenFileComparator, isNotNull);
expect(goldenFileComparator, const TypeMatcher<LocalFileComparator>());
expect(goldenFileComparator, const isInstanceOf<LocalFileComparator>());
final LocalFileComparator comparator = goldenFileComparator;
expect(comparator.basedir.path, contains('flutter_test'));
});
......@@ -133,7 +133,7 @@ void main() {
group('fails', () {
test('when golden file does not exist', () async {
final Future<bool> comparison = doComparison();
expect(comparison, throwsA(const TypeMatcher<TestFailure>()));
expect(comparison, throwsA(const isInstanceOf<TestFailure>()));
});
test('when golden bytes are leading subset of image bytes', () async {
......
packages/flutter_test/test/widget_tester_test.dart
View file @ 6599271b
......@@ -5,8 +5,8 @@
import 'dart:async';
import 'dart:io';
import 'package:flutter/cupertino.dart' hide TypeMatcher;
import 'package:flutter/material.dart' hide TypeMatcher;
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:test/test.dart' as test_package;
import 'package:test/src/frontend/async_matcher.dart' show AsyncMatcher;
......@@ -334,7 +334,7 @@ void main() {
expect(
expectAsync0(tester.pageBack),
throwsA(const TypeMatcher<TestFailure>()),
throwsA(isInstanceOf<TestFailure>()),
);
});
......@@ -490,7 +490,7 @@ void main() {
testWidgets('disallows re-entry', (WidgetTester tester) async {
final Completer<void> completer = new Completer<void>();
tester.runAsync<void>(() => completer.future);
expect(() => tester.runAsync(() async {}), throwsA(const TypeMatcher<TestFailure>()));
expect(() => tester.runAsync(() async {}), throwsA(isInstanceOf<TestFailure>()));
completer.complete();
});
......
packages/flutter_tools/lib/src/commands/update_packages.dart
View file @ 6599271b
......@@ -28,6 +28,7 @@ import '../runner/flutter_command.dart';
const Map<String, String> _kManuallyPinnedDependencies = const <String, String>{
// Add pinned packages here.
'mockito': '3.0.0-alpha+5', // TODO(aam): https://github.com/dart-lang/mockito/issues/110
'matcher': '0.12.2', // TODO(ianh): https://github.com/flutter/flutter/issues/18608, https://github.com/dart-lang/matcher/pull/88
};
class UpdatePackagesCommand extends FlutterCommand {
......@@ -1015,7 +1016,8 @@ class PubspecDependency extends PubspecLine {
assert(kind != DependencyKind.unknown);
break;
case DependencyKind.normal:
dependencies.writeln(' $name: ${_kManuallyPinnedDependencies[name] ?? 'any'}');
if (!_kManuallyPinnedDependencies.containsKey(name))
dependencies.writeln(' $name: any');
break;
case DependencyKind.path:
if (_lockIsOverride) {
......@@ -1049,22 +1051,19 @@ File _pubspecFor(Directory directory) {
/// Generates the source of a fake pubspec.yaml file given a list of
/// dependencies.
String _generateFakePubspec(Iterable<PubspecDependency> dependencies) {
if (_kManuallyPinnedDependencies.isNotEmpty) {
final String hardCodedConstraints = _kManuallyPinnedDependencies.keys
.map((String packageName) {
return ' - $packageName: ${_kManuallyPinnedDependencies[packageName]}';
})
.join('\n');
printStatus(
'WARNING: the following packages use hard-coded version constraints:\n'
'$hardCodedConstraints',
);
}
final StringBuffer result = new StringBuffer();
final StringBuffer overrides = new StringBuffer();
result.writeln('name: flutter_update_packages');
result.writeln('dependencies:');
overrides.writeln('dependency_overrides:');
if (_kManuallyPinnedDependencies.isNotEmpty) {
printStatus('WARNING: the following packages use hard-coded version constraints:');
for (String package in _kManuallyPinnedDependencies.keys) {
final String version = _kManuallyPinnedDependencies[package];
result.writeln(' $package: $version');
printStatus(' - $package: $version');
}
}
for (PubspecDependency dependency in dependencies)
if (!dependency.pointsToSdk)
dependency.describeForFakePubspec(result, overrides);
......
packages/flutter_tools/pubspec.yaml
View file @ 6599271b
......@@ -38,7 +38,7 @@ dependencies:
# We depend on very specific internal implementation details of the
# 'test' package, which change between versions, so when upgrading
# this, make sure the tests are still running correctly.
test: 0.12.42
test: 0.12.41
async: 2.0.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
boolean_selector: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -54,7 +54,7 @@ dependencies:
js: 0.6.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
kernel: 0.3.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
logging: 0.11.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
mime: 0.9.6+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
multi_server_socket: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
node_preamble: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -85,4 +85,4 @@ dartdoc:
# Exclude this package from the hosted API docs.
nodoc: true
# PUBSPEC CHECKSUM: 9fc6
# PUBSPEC CHECKSUM: 3ac4
packages/flutter_tools/test/ios/cocoapods_test.dart
View file @ 6599271b
......@@ -224,7 +224,7 @@ void main() {
);
fail('ToolExit expected');
} catch(e) {
expect(e, const TypeMatcher<ToolExit>());
expect(e, const isInstanceOf<ToolExit>());
verifyNever(mockProcessManager.run(
typedArgThat(containsAllInOrder(<String>['pod', 'install'])),
workingDirectory: anyNamed('workingDirectory'),
......@@ -271,7 +271,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
);
fail('ToolExit expected');
} catch (e) {
expect(e, const TypeMatcher<ToolExit>());
expect(e, const isInstanceOf<ToolExit>());
expect(
testLogger.errorText,
contains("CocoaPods's specs repository is too out-of-date to satisfy dependencies"),
......
packages/flutter_tools/test/src/common.dart
View file @ 6599271b
......@@ -76,7 +76,7 @@ Matcher throwsToolExit({int exitCode, String message}) {
}
/// Matcher for [ToolExit]s.
const Matcher isToolExit = const TypeMatcher<ToolExit>();
const Matcher isToolExit = const isInstanceOf<ToolExit>();
/// Matcher for functions that throw [ProcessExit].
Matcher throwsProcessExit([dynamic exitCode]) {
......@@ -86,7 +86,7 @@ Matcher throwsProcessExit([dynamic exitCode]) {
}
/// Matcher for [ProcessExit]s.
const Matcher isProcessExit = const TypeMatcher<ProcessExit>();
const Matcher isProcessExit = const isInstanceOf<ProcessExit>();
/// Creates a flutter project in the [temp] directory using the
/// [arguments] list if specified, or `--no-pub` if not.
......
packages/flutter_tools/test/tester/flutter_tester_test.dart
View file @ 6599271b
......@@ -59,7 +59,7 @@ void main() {
expect(devices, hasLength(1));
final Device device = devices.single;
expect(device, const TypeMatcher<FlutterTesterDevice>());
expect(device, const isInstanceOf<FlutterTesterDevice>());
expect(device.id, 'flutter-tester');
});
});
......
packages/fuchsia_remote_debug_protocol/pubspec.yaml
View file @ 6599271b
......@@ -34,7 +34,7 @@ dependencies:
js: 0.6.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
kernel: 0.3.0-alpha.12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
logging: 0.11.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
mime: 0.9.6+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
multi_server_socket: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
node_preamble: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -66,6 +66,6 @@ dependencies:
dev_dependencies:
mockito: 3.0.0-alpha+5
test: 0.12.42
test: 0.12.41
# PUBSPEC CHECKSUM: 8558
# PUBSPEC CHECKSUM: 6256
packages/fuchsia_remote_debug_protocol/test/src/dart/dart_vm_test.dart
View file @ 6599271b
......@@ -149,7 +149,7 @@ void main() {
}
// Both views should be invalid as they were missing required fields.
expect(failingFunction, throwsA(const TypeMatcher<RpcFormatError>()));
expect(failingFunction, throwsA(const isInstanceOf<RpcFormatError>()));
});
test('invalid flutter view missing ID', () async {
......@@ -187,7 +187,7 @@ void main() {
}
// Both views should be invalid as they were missing required fields.
expect(failingFunction, throwsA(const TypeMatcher<RpcFormatError>()));
expect(failingFunction, throwsA(const isInstanceOf<RpcFormatError>()));
});
});
......@@ -220,7 +220,7 @@ void main() {
await vm.invokeRpc('somesillyfunction', timeout: timeoutTime);
}
expect(failingFunction, throwsA(const TypeMatcher<TimeoutException>()));
expect(failingFunction, throwsA(const isInstanceOf<TimeoutException>()));
});
});
}
......
packages/fuchsia_remote_debug_protocol/test/src/runners/ssh_command_runner_test.dart
View file @ 6599271b
......@@ -99,7 +99,7 @@ void main() {
await runner.run('oihaw');
}
expect(failingFunction, throwsA(const TypeMatcher<SshCommandError>()));
expect(failingFunction, throwsA(const isInstanceOf<SshCommandError>()));
});
test('verify correct args with config', () async {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab