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

Revert "Load assets in flutter_test without turning event loop. (#115123)" (#115156)

Browse Source 
This reverts commit 88e49ed274b5515caa9faaf03b261f9a73cf7e37.
This commit is contained in:
Dan Field 2022-11-11 12:14:39 -08:00 committed by GitHub
parent 229b39eda5
commit 3895786f98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter/lib/src/foundation/synchronous_future.dart
View File

@ -38,11 +38,11 @@ class SynchronousFuture<T> implements Future<T> {
@override @override
Future<R> then<R>(FutureOr<R> Function(T value) onValue, { Function? onError }) { Future<R> then<R>(FutureOr<R> Function(T value) onValue, { Function? onError }) {
final FutureOr<R> result = onValue(_value); final dynamic result = onValue(_value);
if (result is Future<R>) { if (result is Future<R>) {
return result; return result;
} }
return SynchronousFuture<R>(result); return SynchronousFuture<R>(result as R);
} }
@override @override

23
packages/flutter/lib/src/services/asset_bundle.dart
View File

@ -247,24 +247,17 @@ abstract class CachingAssetBundle extends AssetBundle {
/// An [AssetBundle] that loads resources using platform messages. /// An [AssetBundle] that loads resources using platform messages.
class PlatformAssetBundle extends CachingAssetBundle { class PlatformAssetBundle extends CachingAssetBundle {
@override @override
Future<ByteData> load(String key) { Future<ByteData> load(String key) async {
final Uint8List encoded = utf8.encoder.convert(Uri(path: Uri.encodeFull(key)).path); final Uint8List encoded = utf8.encoder.convert(Uri(path: Uri.encodeFull(key)).path);
final Future<ByteData>? future = ServicesBinding.instance.defaultBinaryMessenger.send('flutter/assets', encoded.buffer.asByteData())?.then((ByteData? asset) { final ByteData? asset =
if (asset == null) { await ServicesBinding.instance.defaultBinaryMessenger.send('flutter/assets', encoded.buffer.asByteData());
throw FlutterError.fromParts(<DiagnosticsNode>[ if (asset == null) {
_errorSummaryWithKey(key),
ErrorDescription('The asset does not exist or has empty data.'),
]);
}
return asset;
});
if (future == null) {
throw FlutterError.fromParts(<DiagnosticsNode>[ throw FlutterError.fromParts(<DiagnosticsNode>[
_errorSummaryWithKey(key), _errorSummaryWithKey(key),
ErrorDescription('The asset does not exist or has empty data.'), ErrorDescription('The asset does not exist or has empty data.'),
]); ]);
} }
return future; return asset;
} }
@override @override

6
packages/flutter_test/lib/src/_binding_io.dart
View File

@ -6,8 +6,8 @@ import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'dart:io'; import 'dart:io';
import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart';
import 'package:path/path.dart' as path; import 'package:path/path.dart' as path;
// ignore: deprecated_member_use // ignore: deprecated_member_use
import 'package:test_api/test_api.dart' as test_package; import 'package:test_api/test_api.dart' as test_package;
@ -42,7 +42,7 @@ void mockFlutterAssets() {
/// platform messages. /// platform messages.
SystemChannels.navigation.setMockMethodCallHandler((MethodCall methodCall) async {}); SystemChannels.navigation.setMockMethodCallHandler((MethodCall methodCall) async {});
ServicesBinding.instance.defaultBinaryMessenger.setMockMessageHandler('flutter/assets', (ByteData? message) { ServicesBinding.instance.defaultBinaryMessenger.setMockMessageHandler('flutter/assets', (ByteData? message) async {
assert(message != null); assert(message != null);
String key = utf8.decode(message!.buffer.asUint8List()); String key = utf8.decode(message!.buffer.asUint8List());
File asset = File(path.join(assetFolderPath, key)); File asset = File(path.join(assetFolderPath, key));
@ -62,7 +62,7 @@ void mockFlutterAssets() {
} }
final Uint8List encoded = Uint8List.fromList(asset.readAsBytesSync()); final Uint8List encoded = Uint8List.fromList(asset.readAsBytesSync());
return SynchronousFuture<ByteData>(encoded.buffer.asByteData()); return Future<ByteData>.value(encoded.buffer.asByteData());
}); });
} }

10
packages/flutter_test/test/bindings_test.dart
View File

@ -10,7 +10,6 @@
import 'dart:async'; import 'dart:async';
import 'dart:io'; import 'dart:io';
import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
@ -91,13 +90,4 @@ void main() {
binding.idle(); binding.idle();
}); });
}); });
testWidgets('Assets in the tester can be loaded without turning event loop', (WidgetTester tester) async {
bool responded = false;
// The particular asset does not matter, as long as it exists.
rootBundle.load('AssetManifest.json').then((ByteData data) {
responded = true;
});
expect(responded, true);
});
} }