Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
588af77
[web] Use CanvasKit to run tests under engine/
mdebbar Aug 26, 2024
b01778d
update ci builders
mdebbar Aug 27, 2024
a7e2814
also move image file used by test
mdebbar Aug 27, 2024
5caa636
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Aug 28, 2024
f33f1cb
deleted an unnecessary file
mdebbar Aug 29, 2024
f794a3a
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Sep 4, 2024
00a4103
skip one test in Firefox
mdebbar Sep 4, 2024
f00a7c8
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Sep 11, 2024
9022513
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Sep 17, 2024
5a80d5b
fix composition test for firefox
mdebbar Sep 18, 2024
7a7ce9d
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Oct 1, 2024
2f311fd
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Oct 15, 2024
9fd423c
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Oct 16, 2024
8ec88b6
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Oct 21, 2024
4116bc9
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Oct 22, 2024
1cde453
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Oct 30, 2024
be466bc
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Nov 4, 2024
21fff18
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Nov 5, 2024
655d7e0
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Nov 5, 2024
e6bbc9a
fix import
mdebbar Nov 7, 2024
14f9b9c
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Nov 7, 2024
636f47a
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Nov 8, 2024
1228a2d
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Nov 8, 2024
d240a2d
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Nov 11, 2024
3e95026
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Nov 15, 2024
ddf09bd
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Nov 26, 2024
b009d3f
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Dec 2, 2024
30200c9
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Dec 5, 2024
95af21f
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Dec 9, 2024
d7f1846
Actual fixes!
mdebbar Dec 10, 2024
2962009
one more fix
mdebbar Dec 10, 2024
495cf14
last one?
mdebbar Dec 11, 2024
f1387d0
ugh last last one
mdebbar Dec 11, 2024
12f6cb1
Merge branch 'main' into engine_tests_use_canvaskit
mdebbar Dec 11, 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
92 changes: 46 additions & 46 deletions ci/builders/linux_web_engine.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,19 @@
}
},
{
"name": "web_tests/test_bundles/dart2js-html-engine",
"name": "web_tests/test_bundles/dart2js-html-html",
"drone_dimensions": [
"device_type=none",
"os=Linux"
],
"generators": {
"tasks": [
{
"name": "compile bundle dart2js-html-engine",
"name": "compile bundle dart2js-html-html",
"parameters": [
"test",
"--compile",
"--bundle=dart2js-html-engine"
"--bundle=dart2js-html-html"
],
"scripts": [
"flutter/lib/web_ui/dev/felt"
Expand All @@ -92,19 +92,19 @@
}
},
{
"name": "web_tests/test_bundles/dart2js-html-html",
"name": "web_tests/test_bundles/dart2js-html-ui",
"drone_dimensions": [
"device_type=none",
"os=Linux"
],
"generators": {
"tasks": [
{
"name": "compile bundle dart2js-html-html",
"name": "compile bundle dart2js-html-ui",
"parameters": [
"test",
"--compile",
"--bundle=dart2js-html-html"
"--bundle=dart2js-html-ui"
],
"scripts": [
"flutter/lib/web_ui/dev/felt"
Expand All @@ -114,19 +114,19 @@
}
},
{
"name": "web_tests/test_bundles/dart2js-html-ui",
"name": "web_tests/test_bundles/dart2js-canvaskit-engine",
"drone_dimensions": [
"device_type=none",
"os=Linux"
],
"generators": {
"tasks": [
{
"name": "compile bundle dart2js-html-ui",
"name": "compile bundle dart2js-canvaskit-engine",
"parameters": [
"test",
"--compile",
"--bundle=dart2js-html-ui"
"--bundle=dart2js-canvaskit-engine"
],
"scripts": [
"flutter/lib/web_ui/dev/felt"
Expand Down Expand Up @@ -180,19 +180,19 @@
}
},
{
"name": "web_tests/test_bundles/dart2wasm-html-engine",
"name": "web_tests/test_bundles/dart2wasm-canvaskit-engine",
"drone_dimensions": [
"device_type=none",
"os=Linux"
],
"generators": {
"tasks": [
{
"name": "compile bundle dart2wasm-html-engine",
"name": "compile bundle dart2wasm-canvaskit-engine",
"parameters": [
"test",
"--compile",
"--bundle=dart2wasm-html-engine"
"--bundle=dart2wasm-canvaskit-engine"
],
"scripts": [
"flutter/lib/web_ui/dev/felt"
Expand Down Expand Up @@ -260,12 +260,12 @@
},
"dependencies": [
"web_tests/artifacts",
"web_tests/test_bundles/dart2js-html-engine",
"web_tests/test_bundles/dart2js-html-html",
"web_tests/test_bundles/dart2js-html-ui",
"web_tests/test_bundles/dart2js-canvaskit-engine",
"web_tests/test_bundles/dart2js-canvaskit-canvaskit",
"web_tests/test_bundles/dart2js-canvaskit-ui",
"web_tests/test_bundles/dart2wasm-html-engine",
"web_tests/test_bundles/dart2wasm-canvaskit-engine",
"web_tests/test_bundles/dart2wasm-skwasm-ui",
"web_tests/test_bundles/fallbacks"
],
Expand All @@ -281,29 +281,29 @@
],
"tasks": [
{
"name": "run suite chrome-dart2js-html-engine",
"name": "run suite chrome-dart2js-html-html",
"parameters": [
"test",
"--run",
"--suite=chrome-dart2js-html-engine"
"--suite=chrome-dart2js-html-html"
],
"script": "flutter/lib/web_ui/dev/felt"
},
{
"name": "run suite chrome-dart2js-html-html",
"name": "run suite chrome-dart2js-html-ui",
"parameters": [
"test",
"--run",
"--suite=chrome-dart2js-html-html"
"--suite=chrome-dart2js-html-ui"
],
"script": "flutter/lib/web_ui/dev/felt"
},
{
"name": "run suite chrome-dart2js-html-ui",
"name": "run suite chrome-dart2js-canvaskit-engine",
"parameters": [
"test",
"--run",
"--suite=chrome-dart2js-html-ui"
"--suite=chrome-dart2js-canvaskit-engine"
],
"script": "flutter/lib/web_ui/dev/felt"
},
Expand Down Expand Up @@ -344,11 +344,11 @@
"script": "flutter/lib/web_ui/dev/felt"
},
{
"name": "run suite chrome-dart2wasm-html-engine",
"name": "run suite chrome-dart2wasm-canvaskit-engine",
"parameters": [
"test",
"--run",
"--suite=chrome-dart2wasm-html-engine"
"--suite=chrome-dart2wasm-canvaskit-engine"
],
"script": "flutter/lib/web_ui/dev/felt"
},
Expand Down Expand Up @@ -412,9 +412,9 @@
},
"dependencies": [
"web_tests/artifacts",
"web_tests/test_bundles/dart2js-html-engine",
"web_tests/test_bundles/dart2js-html-html",
"web_tests/test_bundles/dart2js-html-ui",
"web_tests/test_bundles/dart2js-canvaskit-engine",
"web_tests/test_bundles/dart2js-canvaskit-canvaskit",
"web_tests/test_bundles/dart2js-canvaskit-ui",
"web_tests/test_bundles/fallbacks"
Expand All @@ -431,29 +431,29 @@
],
"tasks": [
{
"name": "run suite firefox-dart2js-html-engine",
"name": "run suite firefox-dart2js-html-html",
"parameters": [
"test",
"--run",
"--suite=firefox-dart2js-html-engine"
"--suite=firefox-dart2js-html-html"
],
"script": "flutter/lib/web_ui/dev/felt"
},
{
"name": "run suite firefox-dart2js-html-html",
"name": "run suite firefox-dart2js-html-ui",
"parameters": [
"test",
"--run",
"--suite=firefox-dart2js-html-html"
"--suite=firefox-dart2js-html-ui"
],
"script": "flutter/lib/web_ui/dev/felt"
},
{
"name": "run suite firefox-dart2js-html-ui",
"name": "run suite firefox-dart2js-canvaskit-engine",
"parameters": [
"test",
"--run",
"--suite=firefox-dart2js-html-ui"
"--suite=firefox-dart2js-canvaskit-engine"
],
"script": "flutter/lib/web_ui/dev/felt"
},
Expand Down Expand Up @@ -500,9 +500,9 @@
},
"dependencies": [
"web_tests/artifacts",
"web_tests/test_bundles/dart2js-html-engine",
"web_tests/test_bundles/dart2js-html-html",
"web_tests/test_bundles/dart2js-html-ui",
"web_tests/test_bundles/dart2js-canvaskit-engine",
"web_tests/test_bundles/dart2js-canvaskit-canvaskit",
"web_tests/test_bundles/dart2js-canvaskit-ui",
"web_tests/test_bundles/fallbacks"
Expand All @@ -515,29 +515,29 @@
],
"tasks": [
{
"name": "run suite safari-dart2js-html-engine",
"name": "run suite safari-dart2js-html-html",
"parameters": [
"test",
"--run",
"--suite=safari-dart2js-html-engine"
"--suite=safari-dart2js-html-html"
],
"script": "flutter/lib/web_ui/dev/felt"
},
{
"name": "run suite safari-dart2js-html-html",
"name": "run suite safari-dart2js-html-ui",
"parameters": [
"test",
"--run",
"--suite=safari-dart2js-html-html"
"--suite=safari-dart2js-html-ui"
],
"script": "flutter/lib/web_ui/dev/felt"
},
{
"name": "run suite safari-dart2js-html-ui",
"name": "run suite safari-dart2js-canvaskit-engine",
"parameters": [
"test",
"--run",
"--suite=safari-dart2js-html-ui"
"--suite=safari-dart2js-canvaskit-engine"
],
"script": "flutter/lib/web_ui/dev/felt"
},
Expand Down Expand Up @@ -583,12 +583,12 @@
},
"dependencies": [
"web_tests/artifacts",
"web_tests/test_bundles/dart2js-html-engine",
"web_tests/test_bundles/dart2js-html-html",
"web_tests/test_bundles/dart2js-html-ui",
"web_tests/test_bundles/dart2js-canvaskit-engine",
"web_tests/test_bundles/dart2js-canvaskit-canvaskit",
"web_tests/test_bundles/dart2js-canvaskit-ui",
"web_tests/test_bundles/dart2wasm-html-engine",
"web_tests/test_bundles/dart2wasm-canvaskit-engine",
"web_tests/test_bundles/dart2wasm-skwasm-ui",
"web_tests/test_bundles/fallbacks"
],
Expand All @@ -604,29 +604,29 @@
],
"tasks": [
{
"name": "run suite chrome-dart2js-html-engine",
"name": "run suite chrome-dart2js-html-html",
"parameters": [
"test",
"--run",
"--suite=chrome-dart2js-html-engine"
"--suite=chrome-dart2js-html-html"
],
"script": "flutter/lib/web_ui/dev/felt"
},
{
"name": "run suite chrome-dart2js-html-html",
"name": "run suite chrome-dart2js-html-ui",
"parameters": [
"test",
"--run",
"--suite=chrome-dart2js-html-html"
"--suite=chrome-dart2js-html-ui"
],
"script": "flutter/lib/web_ui/dev/felt"
},
{
"name": "run suite chrome-dart2js-html-ui",
"name": "run suite chrome-dart2js-canvaskit-engine",
"parameters": [
"test",
"--run",
"--suite=chrome-dart2js-html-ui"
"--suite=chrome-dart2js-canvaskit-engine"
],
"script": "flutter/lib/web_ui/dev/felt"
},
Expand Down Expand Up @@ -667,11 +667,11 @@
"script": "flutter/lib/web_ui/dev/felt"
},
{
"name": "run suite chrome-dart2wasm-html-engine",
"name": "run suite chrome-dart2wasm-canvaskit-engine",
"parameters": [
"test",
"--run",
"--suite=chrome-dart2wasm-html-engine"
"--suite=chrome-dart2wasm-canvaskit-engine"
],
"script": "flutter/lib/web_ui/dev/felt"
},
Expand Down
2 changes: 1 addition & 1 deletion lib/web_ui/dev/test_platform.dart
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class BrowserPlatform extends PlatformPlugin {
.add(_createSourceHandler())

// Serves files from the root of web_ui. Some tests download assets that are embedded
// directly in the test folder, such as test/engine/image/sample_image1.png etc
// directly in the test folder, such as test/html/image/sample_image1.png etc
.add(createStaticHandler(env.environment.webUiRootDir.path))

// Serves absolute package URLs (i.e. not /packages/* but /Users/user/*/hosted/pub.dartlang.org/*).
Expand Down
29 changes: 0 additions & 29 deletions lib/web_ui/test/canvaskit/semantics_test.dart

This file was deleted.

17 changes: 17 additions & 0 deletions lib/web_ui/test/common/test_initialization.dart
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,23 @@ void setUpUnitTests({
});
}

void setUpImplicitView() {
late engine.EngineFlutterWindow myWindow;

final engine.EnginePlatformDispatcher dispatcher = engine.EnginePlatformDispatcher.instance;

setUp(() {
myWindow = engine.EngineFlutterView.implicit(dispatcher, null);
dispatcher.viewManager.registerView(myWindow);
});

tearDown(() async {
dispatcher.viewManager.unregisterView(myWindow.viewId);
await myWindow.resetHistory();
myWindow.dispose();
});
}

Future<void> bootstrapAndRunApp({bool withImplicitView = false}) async {
final Completer<void> completer = Completer<void>();
await ui_web.bootstrapEngine(runApp: () => completer.complete());
Expand Down
2 changes: 1 addition & 1 deletion lib/web_ui/test/engine/clipboard_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ void main() {
}

Future<void> testMain() async {
setUpUnitTests();
setUpImplicitView();
group('message handler', () {
const String testText = 'test text';

Expand Down
Loading
Loading