Skip to content

[Android][webview_flutter] Run integration tests on emulators running Android 34 #6499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 20 commits into from
May 10, 2024
+250 −375
Merged

[Android][webview_flutter] Run integration tests on emulators running Android 34 #6499

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8318874
Changes for test
camsim99 Apr 10, 2024
a8fc572
Run on 34
camsim99 Apr 10, 2024
0d52ab9
Remove 33 only tests, testing verbose change
camsim99 Apr 10, 2024
e1641eb
Move test
camsim99 Apr 11, 2024
9900937
Try just moving legacy
camsim99 Apr 16, 2024
25742fb
Revert "Try just moving legacy"
camsim99 Apr 17, 2024
8d6b444
Try moving test back to double check
camsim99 Apr 17, 2024
93c4a5d
Revert "Try moving test back to double check"
camsim99 Apr 17, 2024
3a22243
Merge branch 'main' into wf_34_await
camsim99 Apr 17, 2024
72cccfa
Try common await change
camsim99 Apr 18, 2024
e135fbb
Merge remote-tracking branch 'refs/remotes/origin/wf_34_await' into w…
camsim99 Apr 18, 2024
1a20934
Get rid of unawaiteds
camsim99 Apr 18, 2024
7e82e47
Add print statements to debug in CI + add pump and settle call
camsim99 Apr 22, 2024
47e093f
Remove unawaiteds + move legacy test outside of its own directory in …
camsim99 Apr 23, 2024
fe19f00
Add missing pumpAndSettle
camsim99 Apr 23, 2024
98a175b
Dart fixes
camsim99 Apr 23, 2024
e1edba5
Remove print statements
camsim99 Apr 23, 2024
2645d8b
Fix analyzer
camsim99 Apr 23, 2024
43ab76d
Merge remote-tracking branch 'upstream/main' into wf_34_await
camsim99 Apr 23, 2024
9a903d5
Nits
camsim99 Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Get rid of unawaiteds
  • Loading branch information
@camsim99
camsim99 committed Apr 18, 2024
commit 1a20934bbacb31ddcac98cd43bcd68eb70477d53
121 changes: 60 additions & 61 deletions packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Future<void> main() async {
IntegrationTestWidgetsFlutterBinding.ensureInitialized();

final HttpServer server = await HttpServer.bind(InternetAddress.anyIPv4, 0);
await server.forEach((HttpRequest request) {
unawaited(server.forEach((HttpRequest request) {
if (request.uri.path == '/hello.txt') {
request.response.writeln('Hello, world.');
} else if (request.uri.path == '/secondary.txt') {
Expand Down Expand Up @@ -55,7 +55,7 @@ Future<void> main() async {
fail('unexpected request: ${request.method} ${request.uri}');
}
request.response.close();
});
}));
final String prefixUrl = 'http://${server.address.address}:${server.port}';
final String primaryUrl = '$prefixUrl/hello.txt';
final String secondaryUrl = '$prefixUrl/secondary.txt';
Expand All @@ -66,10 +66,10 @@ Future<void> main() async {
final Completer<void> pageFinished = Completer<void>();

final WebViewController controller = WebViewController();
unawaited(controller.setNavigationDelegate(
await (controller.setNavigationDelegate(
NavigationDelegate(onPageFinished: (_) => pageFinished.complete()),
));
unawaited(controller.loadRequest(Uri.parse(primaryUrl)));
await (controller.loadRequest(Uri.parse(primaryUrl)));

await tester.pumpWidget(WebViewWidget(controller: controller));
await pageFinished.future;
Expand All @@ -82,11 +82,11 @@ Future<void> main() async {
final Completer<void> pageFinished = Completer<void>();

final WebViewController controller = WebViewController();
unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
unawaited(controller.setNavigationDelegate(
await (controller.setJavaScriptMode(JavaScriptMode.unrestricted));
await (controller.setNavigationDelegate(
NavigationDelegate(onPageFinished: (_) => pageFinished.complete()),
));
unawaited(controller.loadRequest(Uri.parse(primaryUrl)));
await (controller.loadRequest(Uri.parse(primaryUrl)));

await tester.pumpWidget(WebViewWidget(controller: controller));

Expand All @@ -106,14 +106,14 @@ Future<void> main() async {
final StreamController<String> pageLoads = StreamController<String>();

final WebViewController controller = WebViewController();
unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
unawaited(controller.setNavigationDelegate(
await (controller.setJavaScriptMode(JavaScriptMode.unrestricted));
await (controller.setNavigationDelegate(
NavigationDelegate(onPageFinished: (String url) => pageLoads.add(url)),
));

await tester.pumpWidget(WebViewWidget(controller: controller));

unawaited(controller.loadRequest(Uri.parse(headersUrl), headers: headers));
await (controller.loadRequest(Uri.parse(headersUrl), headers: headers));

await pageLoads.stream.firstWhere((String url) => url == headersUrl);

Expand All @@ -126,8 +126,8 @@ Future<void> main() async {
testWidgets('JavascriptChannel', (WidgetTester tester) async {
final Completer<void> pageFinished = Completer<void>();
final WebViewController controller = WebViewController();
unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
unawaited(controller.setNavigationDelegate(
await (controller.setJavaScriptMode(JavaScriptMode.unrestricted));
await (controller.setNavigationDelegate(
NavigationDelegate(onPageFinished: (_) => pageFinished.complete()),
));

Expand Down Expand Up @@ -187,12 +187,12 @@ Future<void> main() async {
final Completer<void> pageFinished = Completer<void>();

final WebViewController controller = WebViewController();
unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
unawaited(controller.setNavigationDelegate(NavigationDelegate(
await (controller.setJavaScriptMode(JavaScriptMode.unrestricted));
await (controller.setNavigationDelegate(NavigationDelegate(
onPageFinished: (_) => pageFinished.complete(),
)));
unawaited(controller.setUserAgent('Custom_User_Agent1'));
unawaited(controller.loadRequest(Uri.parse('about:blank')));
await (controller.setUserAgent('Custom_User_Agent1'));
await (controller.loadRequest(Uri.parse('about:blank')));

await tester.pumpWidget(WebViewWidget(controller: controller));

Expand Down Expand Up @@ -312,11 +312,11 @@ Future<void> main() async {
}
final WebViewController controller =
WebViewController.fromPlatformCreationParams(params);
unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
unawaited(controller.setNavigationDelegate(
await (controller.setJavaScriptMode(JavaScriptMode.unrestricted));
await (controller.setNavigationDelegate(
NavigationDelegate(onPageFinished: (_) => pageLoaded.complete()),
));
unawaited(controller.addJavaScriptChannel(
await (controller.addJavaScriptChannel(
'VideoTestTime',
onMessageReceived: (JavaScriptMessage message) {
final double currentTime = double.parse(message.message);
Expand All @@ -328,7 +328,7 @@ Future<void> main() async {
));

if (controller.platform is AndroidWebViewController) {
unawaited((controller.platform as AndroidWebViewController)
await ((controller.platform as AndroidWebViewController)
.setMediaPlaybackRequiresUserGesture(false));
}

Expand Down Expand Up @@ -453,11 +453,11 @@ Future<void> main() async {
final Completer<void> pageLoaded = Completer<void>();

final WebViewController controller = WebViewController();
unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
unawaited(controller.setNavigationDelegate(NavigationDelegate(
await (controller.setJavaScriptMode(JavaScriptMode.unrestricted));
await (controller.setNavigationDelegate(NavigationDelegate(
onPageFinished: (_) => pageLoaded.complete(),
)));
unawaited(controller.loadRequest(
await (controller.loadRequest(
Uri.parse('data:text/html;charset=utf-8;base64,$getTitleTestBase64'),
));

Expand Down Expand Up @@ -504,16 +504,16 @@ Future<void> main() async {
final Completer<void> pageLoaded = Completer<void>();
final WebViewController controller = WebViewController();
ScrollPositionChange? recordedPosition;
unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
unawaited(controller.setNavigationDelegate(NavigationDelegate(
await (controller.setJavaScriptMode(JavaScriptMode.unrestricted));
await (controller.setNavigationDelegate(NavigationDelegate(
onPageFinished: (_) => pageLoaded.complete(),
)));
unawaited(controller.setOnScrollPositionChange(
await (controller.setOnScrollPositionChange(
(ScrollPositionChange contentOffsetChange) {
recordedPosition = contentOffsetChange;
}));

unawaited(controller.loadRequest(Uri.parse(
await (controller.loadRequest(Uri.parse(
'data:text/html;charset=utf-8;base64,$scrollTestPageBase64',
)));

Expand Down Expand Up @@ -562,8 +562,8 @@ Future<void> main() async {
Completer<void> pageLoaded = Completer<void>();

final WebViewController controller = WebViewController();
unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
unawaited(controller.setNavigationDelegate(NavigationDelegate(
await (controller.setJavaScriptMode(JavaScriptMode.unrestricted));
await (controller.setNavigationDelegate(NavigationDelegate(
onPageFinished: (_) => pageLoaded.complete(),
onNavigationRequest: (NavigationRequest navigationRequest) {
return (navigationRequest.url.contains('youtube.com'))
Expand All @@ -574,7 +574,7 @@ Future<void> main() async {

await tester.pumpWidget(WebViewWidget(controller: controller));

unawaited(controller.loadRequest(Uri.parse(blankPageEncoded)));
await (controller.loadRequest(Uri.parse(blankPageEncoded)));

await pageLoaded.future; // Wait for initial page load.

Expand All @@ -591,13 +591,12 @@ Future<void> main() async {
Completer<WebResourceError>();

final WebViewController controller = WebViewController();
unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
unawaited(controller.setNavigationDelegate(
await (controller.setJavaScriptMode(JavaScriptMode.unrestricted));
await (controller.setNavigationDelegate(
NavigationDelegate(onWebResourceError: (WebResourceError error) {
errorCompleter.complete(error);
})));
unawaited(
controller.loadRequest(Uri.parse('https://www.notawebsite..com')));
await (controller.loadRequest(Uri.parse('https://www.notawebsite..com')));

await tester.pumpWidget(WebViewWidget(controller: controller));

Expand All @@ -612,14 +611,14 @@ Future<void> main() async {
final Completer<void> pageFinishCompleter = Completer<void>();

final WebViewController controller = WebViewController();
unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
unawaited(controller.setNavigationDelegate(NavigationDelegate(
await (controller.setJavaScriptMode(JavaScriptMode.unrestricted));
await (controller.setNavigationDelegate(NavigationDelegate(
onPageFinished: (_) => pageFinishCompleter.complete(),
onWebResourceError: (WebResourceError error) {
errorCompleter.complete(error);
},
)));
unawaited(controller.loadRequest(
await (controller.loadRequest(
Uri.parse('data:text/html;charset=utf-8;base64,PCFET0NUWVBFIGh0bWw+'),
));

Expand All @@ -633,8 +632,8 @@ Future<void> main() async {
Completer<void> pageLoaded = Completer<void>();

final WebViewController controller = WebViewController();
unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
unawaited(controller.setNavigationDelegate(NavigationDelegate(
await (controller.setJavaScriptMode(JavaScriptMode.unrestricted));
await (controller.setNavigationDelegate(NavigationDelegate(
onPageFinished: (_) => pageLoaded.complete(),
onNavigationRequest: (NavigationRequest navigationRequest) {
return (navigationRequest.url.contains('youtube.com'))
Expand All @@ -644,7 +643,7 @@ Future<void> main() async {

await tester.pumpWidget(WebViewWidget(controller: controller));

unawaited(controller.loadRequest(Uri.parse(blankPageEncoded)));
await (controller.loadRequest(Uri.parse(blankPageEncoded)));

await pageLoaded.future; // Wait for initial page load.

Expand All @@ -665,8 +664,8 @@ Future<void> main() async {
Completer<void> pageLoaded = Completer<void>();

final WebViewController controller = WebViewController();
unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
unawaited(controller.setNavigationDelegate(NavigationDelegate(
await (controller.setJavaScriptMode(JavaScriptMode.unrestricted));
await (controller.setNavigationDelegate(NavigationDelegate(
onPageFinished: (_) => pageLoaded.complete(),
onNavigationRequest: (NavigationRequest navigationRequest) async {
NavigationDecision decision = NavigationDecision.prevent;
Expand All @@ -678,7 +677,7 @@ Future<void> main() async {

await tester.pumpWidget(WebViewWidget(controller: controller));

unawaited(controller.loadRequest(Uri.parse(blankPageEncoded)));
await (controller.loadRequest(Uri.parse(blankPageEncoded)));

await pageLoaded.future; // Wait for initial page load.

Expand All @@ -694,11 +693,11 @@ Future<void> main() async {
final Completer<void> pageLoaded = Completer<void>();

final WebViewController controller = WebViewController();
unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
unawaited(controller.setNavigationDelegate(NavigationDelegate(
await (controller.setJavaScriptMode(JavaScriptMode.unrestricted));
await (controller.setNavigationDelegate(NavigationDelegate(
onPageFinished: (_) => pageLoaded.complete(),
)));
unawaited(controller.loadRequest(Uri.parse(blankPageEncoded)));
await (controller.loadRequest(Uri.parse(blankPageEncoded)));

await tester.pumpWidget(WebViewWidget(controller: controller));

Expand All @@ -725,9 +724,9 @@ Future<void> main() async {
);

final WebViewController controller = WebViewController();
unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
unawaited(controller.setNavigationDelegate(navigationDelegate));
unawaited(controller.loadRequest(Uri.parse(primaryUrl)));
await (controller.setJavaScriptMode(JavaScriptMode.unrestricted));
await (controller.setNavigationDelegate(navigationDelegate));
await (controller.loadRequest(Uri.parse(primaryUrl)));

await tester.pumpWidget(WebViewWidget(controller: controller));

Expand All @@ -752,7 +751,7 @@ Future<void> main() async {
final Completer<void> authRequested = Completer<void>();
final WebViewController controller = WebViewController();

unawaited(
await (
controller.setNavigationDelegate(
NavigationDelegate(
onHttpAuthRequest: (HttpAuthRequest request) =>
Expand All @@ -763,7 +762,7 @@ Future<void> main() async {

await tester.pumpWidget(WebViewWidget(controller: controller));

unawaited(controller.loadRequest(Uri.parse(basicAuthUrl)));
await (controller.loadRequest(Uri.parse(basicAuthUrl)));

await expectLater(authRequested.future, completes);
});
Expand All @@ -773,7 +772,7 @@ Future<void> main() async {
final WebViewController controller = WebViewController();
final Completer<void> pageFinished = Completer<void>();

unawaited(
await (
controller.setNavigationDelegate(
NavigationDelegate(
onHttpAuthRequest: (HttpAuthRequest request) => request.onProceed(
Expand All @@ -790,7 +789,7 @@ Future<void> main() async {

await tester.pumpWidget(WebViewWidget(controller: controller));

unawaited(controller.loadRequest(Uri.parse(basicAuthUrl)));
await (controller.loadRequest(Uri.parse(basicAuthUrl)));

await expectLater(pageFinished.future, completes);
});
Expand All @@ -801,8 +800,8 @@ Future<void> main() async {
final Completer<void> pageLoaded = Completer<void>();

final WebViewController controller = WebViewController();
unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
unawaited(controller.setNavigationDelegate(NavigationDelegate(
await (controller.setJavaScriptMode(JavaScriptMode.unrestricted));
await (controller.setNavigationDelegate(NavigationDelegate(
onPageFinished: (_) => pageLoaded.complete(),
)));

Expand All @@ -820,11 +819,11 @@ Future<void> main() async {
Completer<void> pageLoaded = Completer<void>();

final WebViewController controller = WebViewController();
unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
unawaited(controller.setNavigationDelegate(NavigationDelegate(
await (controller.setJavaScriptMode(JavaScriptMode.unrestricted));
await (controller.setNavigationDelegate(NavigationDelegate(
onPageFinished: (_) => pageLoaded.complete(),
)));
unawaited(controller.loadRequest(Uri.parse(primaryUrl)));
await (controller.loadRequest(Uri.parse(primaryUrl)));

await tester.pumpWidget(WebViewWidget(controller: controller));

Expand All @@ -850,11 +849,11 @@ Future<void> main() async {
Completer<void> pageLoadCompleter = Completer<void>();

final WebViewController controller = WebViewController();
unawaited(controller.setJavaScriptMode(JavaScriptMode.unrestricted));
unawaited(controller.setNavigationDelegate(NavigationDelegate(
await (controller.setJavaScriptMode(JavaScriptMode.unrestricted));
await (controller.setNavigationDelegate(NavigationDelegate(
onPageFinished: (_) => pageLoadCompleter.complete(),
)));
unawaited(controller.loadRequest(Uri.parse(primaryUrl)));
await (controller.loadRequest(Uri.parse(primaryUrl)));

await tester.pumpWidget(WebViewWidget(controller: controller));

Expand Down
4 changes: 2 additions & 2 deletions ...webview_flutter/webview_flutter/example/integration_test/webview_flutter_test_legacy.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Future<void> main() async {
IntegrationTestWidgetsFlutterBinding.ensureInitialized();

final HttpServer server = await HttpServer.bind(InternetAddress.anyIPv4, 0);
await server.forEach((HttpRequest request) {
unawaited(server.forEach((HttpRequest request) {
if (request.uri.path == '/hello.txt') {
request.response.writeln('Hello, world.');
} else if (request.uri.path == '/secondary.txt') {
Expand All @@ -34,7 +34,7 @@ Future<void> main() async {
fail('unexpected request: ${request.method} ${request.uri}');
}
request.response.close();
});
}));
final String prefixUrl = 'http://${server.address.address}:${server.port}';
final String primaryUrl = '$prefixUrl/hello.txt';
final String secondaryUrl = '$prefixUrl/secondary.txt';
Expand Down