Use flutter.js in the actual test harness. #47670

eyebrowsoffire · 2023-11-03T20:35:20Z

Run the JS unit tests with flutter.js.

I am going to leave the dart2wasm tests doing the old window.flutterConfiguration setup for now, until I actually get dart2wasm/dart2js switching logic built into flutter.js itself.

flutter-dashboard · 2023-11-03T20:35:24Z

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie or stuartmorgan on the #hackers channel in Chat (don't just cc them here, they won't see it! Use Discord!).

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

flutter-dashboard · 2023-11-07T22:27:25Z

Golden file changes have been found for this pull request. Click here to view and triage (e.g. because this is an intentional change).

If you are still iterating on this change and are not ready to resolve the images on the Flutter Gold dashboard, consider marking this PR as a draft pull request above. You will still be able to view image results on the dashboard, commenting will be silenced, and the check will not try to resolve itself until marked ready for review.

Changes reported for pull request #47670 at sha eda3dae

flutter-dashboard · 2023-11-09T00:20:42Z

Golden file changes are available for triage from new commit, Click here to view.

Changes reported for pull request #47670 at sha b8552bf

ditman

This looks good to me, but I have a feeling that this can be simplified a little bit without losing features. LMK what you think/do whatever you want from my feedback.

Also, golden opportunity of removing initializeEngine from the engine/initialization.dart, because AFAIK it's only used by the test harness of the engine anymore!

lib/web_ui/dev/test_platform.dart

lib/web_ui/dev/test_dart2js.js

ditman · 2023-11-14T00:03:54Z

lib/web_ui/lib/src/engine/configuration.dart

+class JsFlutterConfiguration {
+  external factory JsFlutterConfiguration();
+}


This class should handle the FlutterConfiguration coming from JS, so no need for this constructor here. We can just jsify as an empty Map to create a new JS Configuration object from Dart (tests).

We should really avoid using jsify, and actually js_util in general. I think eventually the plan is for js_util to go away, and there is a js_util_unsafe library that should only be used in exceptional cases. Srujan mentioned that they probably at some point are going to have a constructor for JSObject that just creates an empty object, and then we can cast it. But even so, this seems a little more explicit and "correct" to me and I don't see a downside of exposing an anonymous constructor for the object.

The thing is that there's nowhere in the production code (only tests) where this constructor is needed, I don't think there should be any ergonomic way of creating this from Dart :P, but my grief here is very minor :)

lib/web_ui/test/canvaskit/initialization/stores_config_test.dart

lib/web_ui/test/common/test_initialization.dart

lib/web_ui/lib/src/engine/initialization.dart

lib/web_ui/test/common/test_initialization.dart

ditman

Small comment about the debugOverrideJsConfiguration, which I think is not WAI (?)

ditman · 2023-11-14T22:00:46Z

lib/web_ui/dev/test_platform.dart

+  import { runTest } from "/test_dart2js.js";
+
+  runTest({
+    canvasKitBaseUrl: "/canvaskit/",
+    // Some of our tests rely on color emoji
+    useColorEmoji: true,
+    canvasKitVariant: "${getCanvasKitVariant()}",
+  });


(The future of bootstrapping with flutter.js right here 😋)

ditman · 2023-11-14T22:13:04Z

lib/web_ui/lib/src/engine/configuration.dart

+  return _configuration ??= FlutterConfiguration.legacy(_jsConfiguration);
+}
 FlutterConfiguration? _configuration;
+FlutterConfiguration? _debugConfiguration;


Ahhh that's because _jsConfiguration is not available anymore (in dart2js mode, at least!).

I think the debugOverrideJsConfiguration method needs some extra love. The idea behind the method is that it lets you set and unset overrides for configuration that may be set by the test_runner, without breaking other tests.

I don't think the current implementation (even with debug) is doing that?

I think the debugOverrideJsConfiguration needs to:

_debugConfiguration = _configuration.clone() // clone doesn't exist, but we need a way to clone the standard _configuration object :P ..setUserConfiguration(newJsConfig as JsFlutterConfiguration);

So we end up with whatever is set by the runner (the value of _configuration) and then we apply the user overrides (if any?).

lib/web_ui/test/canvaskit/initialization/stores_config_test.dart

ditman · 2023-11-14T22:50:17Z

lib/web_ui/lib/src/engine/configuration.dart

-    _configuration = FlutterConfiguration()
-        ..setUserConfiguration(newJsConfig as JsFlutterConfiguration);
-    print('Overridden engine JS config to: ${newJsConfig.dartify()}');
+    _debugConfiguration = configuration.withOverrides(newConfig);


Suggested change

_debugConfiguration = configuration.withOverrides(newConfig);

_debugConfiguration = _configuration.withOverrides(newConfig);

Or do we want to allow to override the overridden values?

No, configuration.withOverrides is correct. Whatever mechanism was used to configure the tests, we should use that as our base set. Right now dart2wasm tests still use window.flutterConfiguration and the JS tests use flutter.js and explicitly pass the config in, so we should support both.

ditman

LGTM with some questions, but nothing major.

auto-submit · 2023-11-14T23:32:24Z

auto label is removed for flutter/engine/47670, due to - The status or check suite Linux mac_unopt has failed. Please fix the issues identified (or deflake) before re-applying this label.

…47670)

…138456) flutter/engine@1347413...d7ca057 2023-11-15 [email protected] Use flutter.js in the actual test harness. (flutter/engine#47670) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

Use flutter.js in the actual test harness.

45f5b0b

eyebrowsoffire marked this pull request as draft November 3, 2023 20:35

github-actions bot added the platform-web Code specifically for the web engine label Nov 3, 2023

eyebrowsoffire added 9 commits November 3, 2023 13:53

Fix analysis.

f0e5ad0

Use absolute vs relative path on flutter.js URL.

8c5658d

Only use window.flutterConfiguration in the dart2wasm case right now.

ea9b250

Merge branch 'main' into flutter_js_test_harness

bae6bde

Do a blocking bootstrap.

7121204

Fix analyzer warnings.

62ac733

Fix config issues.

53f5a6e

Fix a few canvaskit unit tests.

0236e40

Fix comments/messages in the bootstrapping js script.

eda3dae

eyebrowsoffire marked this pull request as ready for review November 7, 2023 21:38

flutter-dashboard bot added the will affect goldens label Nov 7, 2023

Fix unit test setup ordering.

b8552bf

Don't touch the renderer until bootstrap is complete.

ffaf2f8

eyebrowsoffire requested a review from ditman November 13, 2023 18:51

ditman reviewed Nov 14, 2023

View reviewed changes

Addressed some comments from David.

6ee98d2

ditman reviewed Nov 14, 2023

View reviewed changes

eyebrowsoffire added 2 commits November 14, 2023 14:36

Fix configuration overriding.

74ba2a3

Use _configuration, not _jsConfiguration

026923f

ditman reviewed Nov 14, 2023

View reviewed changes

ditman approved these changes Nov 14, 2023

View reviewed changes

Addressing a few more of David's comments.

c27f08a

eyebrowsoffire added the autosubmit Merge PR when tree becomes green via auto submit App label Nov 14, 2023

auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Nov 14, 2023

ditman added the autosubmit Merge PR when tree becomes green via auto submit App label Nov 14, 2023

Merge branch 'main' into flutter_js_test_harness

ed0bd09

auto-submit bot merged commit d7ca057 into flutter:main Nov 15, 2023

engine-flutter-autoroll mentioned this pull request Nov 15, 2023

Roll Flutter Engine from 1347413470b7 to d7ca057b891f (1 revision) flutter/flutter#138456

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 15, 2023

d7ca057b8 Use flutter.js in the actual test harness. (flutter/engine#…

d16d6a3

…47670)

	_debugConfiguration = configuration.withOverrides(newConfig);
	_debugConfiguration = _configuration.withOverrides(newConfig);

Use flutter.js in the actual test harness. #47670

Use flutter.js in the actual test harness. #47670

Uh oh!

Conversation

eyebrowsoffire commented Nov 3, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

flutter-dashboard bot commented Nov 3, 2023

Uh oh!

flutter-dashboard bot commented Nov 7, 2023

Uh oh!

flutter-dashboard bot commented Nov 9, 2023

Uh oh!

ditman left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ditman Nov 14, 2023

Choose a reason for hiding this comment

Uh oh!

eyebrowsoffire Nov 14, 2023

Choose a reason for hiding this comment

Uh oh!

ditman Nov 14, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ditman left a comment

Choose a reason for hiding this comment

Uh oh!

ditman Nov 14, 2023

Choose a reason for hiding this comment

Uh oh!

ditman Nov 14, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

ditman Nov 14, 2023

Choose a reason for hiding this comment

Uh oh!

eyebrowsoffire Nov 14, 2023

Choose a reason for hiding this comment

Uh oh!

ditman left a comment

Choose a reason for hiding this comment

Uh oh!

auto-submit bot commented Nov 14, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

eyebrowsoffire commented Nov 3, 2023 •

edited

Loading