Skip to content

Commit 041d524

Browse files
mdebbarmdebbar
authored
[web] Remove HTML from the engine's test suites (flutter#162404)
- Remove html bundles/suites from configs and CI. - Delete html test files. - Replace the `isHtml` helper with `false` and refactor accordingly.
1 parent 264bef3 commit 041d524

File tree

75 files changed

+730
-13166
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+730
-13166
lines changed

‎engine/src/flutter/ci/builders/linux_web_engine_test.json‎

Lines changed: 0 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -2,50 +2,6 @@
22
"_comment": "THIS IS A GENERATED FILE. Do not edit this file directly.",
33
"_comment2": "See `generate_builder_json.dart` for the generator code",
44
"builds": [
5-
{
6-
"name": "web_tests/test_bundles/dart2js-html-html",
7-
"drone_dimensions": [
8-
"device_type=none",
9-
"os=Linux"
10-
],
11-
"generators": {
12-
"tasks": [
13-
{
14-
"name": "compile bundle dart2js-html-html",
15-
"parameters": [
16-
"test",
17-
"--compile",
18-
"--bundle=dart2js-html-html"
19-
],
20-
"scripts": [
21-
"flutter/lib/web_ui/dev/felt"
22-
]
23-
}
24-
]
25-
}
26-
},
27-
{
28-
"name": "web_tests/test_bundles/dart2js-html-ui",
29-
"drone_dimensions": [
30-
"device_type=none",
31-
"os=Linux"
32-
],
33-
"generators": {
34-
"tasks": [
35-
{
36-
"name": "compile bundle dart2js-html-ui",
37-
"parameters": [
38-
"test",
39-
"--compile",
40-
"--bundle=dart2js-html-ui"
41-
],
42-
"scripts": [
43-
"flutter/lib/web_ui/dev/felt"
44-
]
45-
}
46-
]
47-
}
48-
},
495
{
506
"name": "web_tests/test_bundles/dart2js-canvaskit-engine",
517
"drone_dimensions": [
@@ -209,8 +165,6 @@
209165
"download_jdk": false
210166
},
211167
"dependencies": [
212-
"web_tests/test_bundles/dart2js-html-html",
213-
"web_tests/test_bundles/dart2js-html-ui",
214168
"web_tests/test_bundles/dart2js-canvaskit-engine",
215169
"web_tests/test_bundles/dart2js-canvaskit-canvaskit",
216170
"web_tests/test_bundles/dart2js-canvaskit-ui",
@@ -234,27 +188,19 @@
234188
"parameters": [
235189
"test",
236190
"--copy-artifacts",
237-
"--suite=chrome-dart2js-html-html",
238-
"--suite=chrome-dart2js-html-ui",
239191
"--suite=chrome-dart2js-canvaskit-engine",
240192
"--suite=chrome-dart2js-canvaskit-canvaskit",
241193
"--suite=chrome-dart2js-canvaskit-ui",
242194
"--suite=chrome-full-dart2js-canvaskit-canvaskit",
243195
"--suite=chrome-full-dart2js-canvaskit-ui",
244-
"--suite=edge-dart2js-html-html",
245-
"--suite=edge-dart2js-html-ui",
246196
"--suite=edge-dart2js-canvaskit-engine",
247197
"--suite=edge-dart2js-canvaskit-canvaskit",
248198
"--suite=edge-dart2js-canvaskit-ui",
249199
"--suite=edge-full-dart2js-canvaskit-canvaskit",
250200
"--suite=edge-full-dart2js-canvaskit-ui",
251-
"--suite=firefox-dart2js-html-html",
252-
"--suite=firefox-dart2js-html-ui",
253201
"--suite=firefox-dart2js-canvaskit-engine",
254202
"--suite=firefox-dart2js-canvaskit-canvaskit",
255203
"--suite=firefox-dart2js-canvaskit-ui",
256-
"--suite=safari-dart2js-html-html",
257-
"--suite=safari-dart2js-html-ui",
258204
"--suite=safari-dart2js-canvaskit-engine",
259205
"--suite=safari-dart2js-canvaskit-canvaskit",
260206
"--suite=safari-dart2js-canvaskit-ui",
@@ -269,24 +215,6 @@
269215
],
270216
"script": "flutter/lib/web_ui/dev/felt"
271217
},
272-
{
273-
"name": "run suite chrome-dart2js-html-html",
274-
"parameters": [
275-
"test",
276-
"--run",
277-
"--suite=chrome-dart2js-html-html"
278-
],
279-
"script": "flutter/lib/web_ui/dev/felt"
280-
},
281-
{
282-
"name": "run suite chrome-dart2js-html-ui",
283-
"parameters": [
284-
"test",
285-
"--run",
286-
"--suite=chrome-dart2js-html-ui"
287-
],
288-
"script": "flutter/lib/web_ui/dev/felt"
289-
},
290218
{
291219
"name": "run suite chrome-dart2js-canvaskit-engine",
292220
"parameters": [
@@ -400,8 +328,6 @@
400328
"download_jdk": false
401329
},
402330
"dependencies": [
403-
"web_tests/test_bundles/dart2js-html-html",
404-
"web_tests/test_bundles/dart2js-html-ui",
405331
"web_tests/test_bundles/dart2js-canvaskit-engine",
406332
"web_tests/test_bundles/dart2js-canvaskit-canvaskit",
407333
"web_tests/test_bundles/dart2js-canvaskit-ui",
@@ -423,27 +349,19 @@
423349
"parameters": [
424350
"test",
425351
"--copy-artifacts",
426-
"--suite=chrome-dart2js-html-html",
427-
"--suite=chrome-dart2js-html-ui",
428352
"--suite=chrome-dart2js-canvaskit-engine",
429353
"--suite=chrome-dart2js-canvaskit-canvaskit",
430354
"--suite=chrome-dart2js-canvaskit-ui",
431355
"--suite=chrome-full-dart2js-canvaskit-canvaskit",
432356
"--suite=chrome-full-dart2js-canvaskit-ui",
433-
"--suite=edge-dart2js-html-html",
434-
"--suite=edge-dart2js-html-ui",
435357
"--suite=edge-dart2js-canvaskit-engine",
436358
"--suite=edge-dart2js-canvaskit-canvaskit",
437359
"--suite=edge-dart2js-canvaskit-ui",
438360
"--suite=edge-full-dart2js-canvaskit-canvaskit",
439361
"--suite=edge-full-dart2js-canvaskit-ui",
440-
"--suite=firefox-dart2js-html-html",
441-
"--suite=firefox-dart2js-html-ui",
442362
"--suite=firefox-dart2js-canvaskit-engine",
443363
"--suite=firefox-dart2js-canvaskit-canvaskit",
444364
"--suite=firefox-dart2js-canvaskit-ui",
445-
"--suite=safari-dart2js-html-html",
446-
"--suite=safari-dart2js-html-ui",
447365
"--suite=safari-dart2js-canvaskit-engine",
448366
"--suite=safari-dart2js-canvaskit-canvaskit",
449367
"--suite=safari-dart2js-canvaskit-ui",
@@ -458,24 +376,6 @@
458376
],
459377
"script": "flutter/lib/web_ui/dev/felt"
460378
},
461-
{
462-
"name": "run suite firefox-dart2js-html-html",
463-
"parameters": [
464-
"test",
465-
"--run",
466-
"--suite=firefox-dart2js-html-html"
467-
],
468-
"script": "flutter/lib/web_ui/dev/felt"
469-
},
470-
{
471-
"name": "run suite firefox-dart2js-html-ui",
472-
"parameters": [
473-
"test",
474-
"--run",
475-
"--suite=firefox-dart2js-html-ui"
476-
],
477-
"script": "flutter/lib/web_ui/dev/felt"
478-
},
479379
{
480380
"name": "run suite firefox-dart2js-canvaskit-engine",
481381
"parameters": [
@@ -527,8 +427,6 @@
527427
"download_jdk": false
528428
},
529429
"dependencies": [
530-
"web_tests/test_bundles/dart2js-html-html",
531-
"web_tests/test_bundles/dart2js-html-ui",
532430
"web_tests/test_bundles/dart2js-canvaskit-engine",
533431
"web_tests/test_bundles/dart2js-canvaskit-canvaskit",
534432
"web_tests/test_bundles/dart2js-canvaskit-ui",
@@ -546,27 +444,19 @@
546444
"parameters": [
547445
"test",
548446
"--copy-artifacts",
549-
"--suite=chrome-dart2js-html-html",
550-
"--suite=chrome-dart2js-html-ui",
551447
"--suite=chrome-dart2js-canvaskit-engine",
552448
"--suite=chrome-dart2js-canvaskit-canvaskit",
553449
"--suite=chrome-dart2js-canvaskit-ui",
554450
"--suite=chrome-full-dart2js-canvaskit-canvaskit",
555451
"--suite=chrome-full-dart2js-canvaskit-ui",
556-
"--suite=edge-dart2js-html-html",
557-
"--suite=edge-dart2js-html-ui",
558452
"--suite=edge-dart2js-canvaskit-engine",
559453
"--suite=edge-dart2js-canvaskit-canvaskit",
560454
"--suite=edge-dart2js-canvaskit-ui",
561455
"--suite=edge-full-dart2js-canvaskit-canvaskit",
562456
"--suite=edge-full-dart2js-canvaskit-ui",
563-
"--suite=firefox-dart2js-html-html",
564-
"--suite=firefox-dart2js-html-ui",
565457
"--suite=firefox-dart2js-canvaskit-engine",
566458
"--suite=firefox-dart2js-canvaskit-canvaskit",
567459
"--suite=firefox-dart2js-canvaskit-ui",
568-
"--suite=safari-dart2js-html-html",
569-
"--suite=safari-dart2js-html-ui",
570460
"--suite=safari-dart2js-canvaskit-engine",
571461
"--suite=safari-dart2js-canvaskit-canvaskit",
572462
"--suite=safari-dart2js-canvaskit-ui",
@@ -581,24 +471,6 @@
581471
],
582472
"script": "flutter/lib/web_ui/dev/felt"
583473
},
584-
{
585-
"name": "run suite safari-dart2js-html-html",
586-
"parameters": [
587-
"test",
588-
"--run",
589-
"--suite=safari-dart2js-html-html"
590-
],
591-
"script": "flutter/lib/web_ui/dev/felt"
592-
},
593-
{
594-
"name": "run suite safari-dart2js-html-ui",
595-
"parameters": [
596-
"test",
597-
"--run",
598-
"--suite=safari-dart2js-html-ui"
599-
],
600-
"script": "flutter/lib/web_ui/dev/felt"
601-
},
602474
{
603475
"name": "run suite safari-dart2js-canvaskit-engine",
604476
"parameters": [

‎engine/src/flutter/lib/web_ui/dev/felt_config.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'package:yaml/yaml.dart';
77

88
enum Compiler { dart2js, dart2wasm }
99

10-
enum Renderer { html, canvaskit, skwasm }
10+
enum Renderer { canvaskit, skwasm }
1111

1212
class CompileConfiguration {
1313
CompileConfiguration(this.name, this.compiler, this.renderer);

‎engine/src/flutter/lib/web_ui/test/common/matchers.dart‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,3 +512,17 @@ class HtmlPatternMatcher extends Matcher {
512512
return mismatchDescription;
513513
}
514514
}
515+
516+
Matcher listEqual(List<int> source, {int tolerance = 0}) {
517+
return predicate((List<int> target) {
518+
if (source.length != target.length) {
519+
return false;
520+
}
521+
for (int i = 0; i < source.length; i += 1) {
522+
if ((source[i] - target[i]).abs() > tolerance) {
523+
return false;
524+
}
525+
}
526+
return true;
527+
}, source.toString());
528+
}

‎engine/src/flutter/lib/web_ui/test/engine/view_embedder/flutter_view_manager_test.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import 'package:test/test.dart';
1010
import 'package:ui/src/engine.dart';
1111

1212
import '../../common/matchers.dart';
13-
import '../../html/image_test.dart';
1413

1514
void main() {
1615
internalBootstrapBrowserTest(() => doTests);

‎engine/src/flutter/lib/web_ui/test/felt_config.yaml‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# See the `README.md` in this directory for documentation on the structure of
22
# this file.
33
compile-configs:
4-
- name: dart2js-html
5-
compiler: dart2js
6-
renderer: html
7-
84
- name: dart2js-canvaskit
95
compiler: dart2js
106
renderer: canvaskit
@@ -30,10 +26,6 @@ test-sets:
3026
- name: canvaskit
3127
directory: canvaskit
3228

33-
# Tests for html-renderer-specific functionality
34-
- name: html
35-
directory: html
36-
3729
# Tests for renderer functionality that can be run on any renderer
3830
- name: ui
3931
directory: ui
@@ -43,14 +35,6 @@ test-sets:
4335
directory: fallbacks
4436

4537
test-bundles:
46-
- name: dart2js-html-html
47-
test-set: html
48-
compile-configs: dart2js-html
49-
50-
- name: dart2js-html-ui
51-
test-set: ui
52-
compile-configs: dart2js-html
53-
5438
- name: dart2js-canvaskit-engine
5539
test-set: engine
5640
compile-configs: dart2js-canvaskit
@@ -114,14 +98,6 @@ run-configs:
11498
canvaskit-variant: full
11599

116100
test-suites:
117-
- name: chrome-dart2js-html-html
118-
test-bundle: dart2js-html-html
119-
run-config: chrome
120-
121-
- name: chrome-dart2js-html-ui
122-
test-bundle: dart2js-html-ui
123-
run-config: chrome
124-
125101
- name: chrome-dart2js-canvaskit-engine
126102
test-bundle: dart2js-canvaskit-engine
127103
run-config: chrome
@@ -147,14 +123,6 @@ test-suites:
147123
run-config: chrome-full
148124
artifact-deps: [ canvaskit ]
149125

150-
- name: edge-dart2js-html-html
151-
test-bundle: dart2js-html-html
152-
run-config: edge
153-
154-
- name: edge-dart2js-html-ui
155-
test-bundle: dart2js-html-ui
156-
run-config: edge
157-
158126
- name: edge-dart2js-canvaskit-engine
159127
test-bundle: dart2js-canvaskit-engine
160128
run-config: edge
@@ -180,14 +148,6 @@ test-suites:
180148
run-config: edge-full
181149
artifact-deps: [ canvaskit ]
182150

183-
- name: firefox-dart2js-html-html
184-
test-bundle: dart2js-html-html
185-
run-config: firefox
186-
187-
- name: firefox-dart2js-html-ui
188-
test-bundle: dart2js-html-ui
189-
run-config: firefox
190-
191151
- name: firefox-dart2js-canvaskit-engine
192152
test-bundle: dart2js-canvaskit-engine
193153
run-config: firefox
@@ -203,14 +163,6 @@ test-suites:
203163
run-config: firefox
204164
artifact-deps: [ canvaskit ]
205165

206-
- name: safari-dart2js-html-html
207-
test-bundle: dart2js-html-html
208-
run-config: safari
209-
210-
- name: safari-dart2js-html-ui
211-
test-bundle: dart2js-html-ui
212-
run-config: safari
213-
214166
- name: safari-dart2js-canvaskit-engine
215167
test-bundle: dart2js-canvaskit-engine
216168
run-config: safari

0 commit comments

Comments
 (0)