Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit b6acdc7

Browse files
authored
[macOS] Bail out of tests if engine not running (#47771)
In engine tests where we require a running engine to proceed with the test, immediately fail if the engine isn't running rather than carrying on with the test. In most cases, the fixture test proceeds to block the main thread on a latch until it's released from the UI thread, so this results in quicker test failures. ## Pre-launch Checklist - [X] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [X] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [X] I read and followed the [Flutter Style Guide] and the [C++, Objective-C, Java style guides]. - [ ] I listed at least one issue that this PR fixes in the description above. - [X] I added new tests to check the change I am making or feature I am adding, or the PR is [test-exempt]. See [testing the engine] for instructions on writing and running engine tests. - [X] I updated/added relevant documentation (doc comments with `///`). - [X] I signed the [CLA]. - [X] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview [Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene [test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests [Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style [testing the engine]: https://github.com/flutter/flutter/wiki/Testing-the-engine [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/wiki/Chat
1 parent 98eedd9 commit b6acdc7

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ + (void)registerWithRegistrar:(id<FlutterPluginRegistrar>)registrar {
123123
TEST_F(FlutterEngineTest, CanLaunch) {
124124
FlutterEngine* engine = GetFlutterEngine();
125125
EXPECT_TRUE([engine runWithEntrypoint:@"main"]);
126-
EXPECT_TRUE(engine.running);
126+
ASSERT_TRUE(engine.running);
127127
}
128128

129129
TEST_F(FlutterEngineTest, HasNonNullExecutableName) {
@@ -195,7 +195,7 @@ + (void)registerWithRegistrar:(id<FlutterPluginRegistrar>)registrar {
195195
// Launch the test entrypoint.
196196
FlutterEngine* engine = GetFlutterEngine();
197197
EXPECT_TRUE([engine runWithEntrypoint:@"canLogToStdout"]);
198-
EXPECT_TRUE(engine.running);
198+
ASSERT_TRUE(engine.running);
199199

200200
latch.Wait();
201201

@@ -224,7 +224,7 @@ + (void)registerWithRegistrar:(id<FlutterPluginRegistrar>)registrar {
224224

225225
// Launch the test entrypoint.
226226
EXPECT_TRUE([engine runWithEntrypoint:@"backgroundTest"]);
227-
EXPECT_TRUE(engine.running);
227+
ASSERT_TRUE(engine.running);
228228

229229
FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
230230
nibName:nil
@@ -254,7 +254,7 @@ + (void)registerWithRegistrar:(id<FlutterPluginRegistrar>)registrar {
254254

255255
// Launch the test entrypoint.
256256
EXPECT_TRUE([engine runWithEntrypoint:@"backgroundTest"]);
257-
EXPECT_TRUE(engine.running);
257+
ASSERT_TRUE(engine.running);
258258

259259
FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
260260
nibName:nil
@@ -476,7 +476,7 @@ + (void)registerWithRegistrar:(id<FlutterPluginRegistrar>)registrar {
476476

477477
FlutterEngine* engine = GetFlutterEngine();
478478
EXPECT_TRUE([engine runWithEntrypoint:@"nativeCallback"]);
479-
EXPECT_TRUE(engine.running);
479+
ASSERT_TRUE(engine.running);
480480

481481
latch.Wait();
482482
ASSERT_TRUE(latch_called);

0 commit comments

Comments
 (0)