development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-12 19:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[web] fix race in the image_loading_integration.dart test (#92303)

Browse source
This commit is contained in:
Yegor 2021-10-26 19:03:03 -07:00 committed by GitHub
parent a24d55660b
commit 11e83e7c18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
dev/integration_tests/web_e2e_tests/lib/image_loading_main.dart
View file

@ -2,9 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
final Completer<void> _assetImageCompleter = Completer<void>();
final Completer<void> _networkImageCompleter = Completer<void>();
/// Notifies that Image.asset used in the test app loaded the image.
Future<void> get whenAssetImageLoads => _assetImageCompleter.future;
/// Notifies that Image.network used in the test app loaded the image.
Future<void> get whenNetworkImageLoads => _networkImageCompleter.future;
Future<void> main() async {
WidgetsFlutterBinding.ensureInitialized();
const MethodChannel channel =
@ -30,9 +41,36 @@ class MyAppState extends State<MyApp> {
title: 'Integration Test App',
home: Column(children: <Widget>[
const Text('Asset image:'),
RepaintBoundary(child: Image.asset('assets/icons/material/material.png', package: 'flutter_gallery_assets')),
RepaintBoundary(child: Image.asset(
'assets/icons/material/material.png',
package: 'flutter_gallery_assets',
frameBuilder: (
BuildContext context,
Widget child,
int? frame,
bool wasSynchronouslyLoaded,
) {
if (frame != null) {
_assetImageCompleter.complete();
}
return child;
},
)),
const Text('Network image:'),
RepaintBoundary(child: Image.network('assets/packages/flutter_gallery_assets/assets/icons/material/material.png')),
RepaintBoundary(child: Image.network(
'assets/packages/flutter_gallery_assets/assets/icons/material/material.png',
frameBuilder: (
BuildContext context,
Widget child,
int? frame,
bool wasSynchronouslyLoaded,
) {
if (frame != null) {
_networkImageCompleter.complete();
}
return child;
},
)),
])
);
}

11
dev/integration_tests/web_e2e_tests/test_driver/image_loading_integration.dart
View file

@ -15,6 +15,17 @@ void main() {
(WidgetTester tester) async {
await app.main();
await tester.pumpAndSettle();
// `pumpAndSettle` only waits until no more frames are scheduled, but the
// test must wait for the image network requests to finish.
await app.whenAssetImageLoads;
await app.whenNetworkImageLoads;
// At the time the network requests are finished the engine may not have
// updated the DOM yet. Delay checking the DOM until the next event, which
// will guarantee that the current frame is done rendering.
await Future<void>.delayed(Duration.zero);
final List<html.ImageElement> imageElements = findElements('img').cast<html.ImageElement>();
expect(imageElements.length, 2);
expect(imageElements[0].naturalWidth, 1.5 * 64);