From 82a985406f8fcb7b94a984664d33c3a632ef8583 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Thu, 22 Aug 2024 10:46:29 -0700 Subject: [PATCH 1/2] Test running the macOS engine has no stray logging --- .../darwin/macos/framework/Source/FlutterEngineTest.mm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm index b7d8eb231118e..4574aefa5c50d 100644 --- a/shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm +++ b/shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm @@ -210,6 +210,7 @@ @implementation MockableFlutterEngine // Replace stdout stream buffer with our own. StreamCapture stdout_capture(&std::cout); + StreamCapture stderr_capture(&std::cerr); // Launch the test entrypoint. FlutterEngine* engine = GetFlutterEngine(); @@ -219,9 +220,12 @@ @implementation MockableFlutterEngine latch.Wait(); stdout_capture.Stop(); + stderr_capture.Stop(); // Verify hello world was written to stdout. EXPECT_TRUE(stdout_capture.GetOutput().find("Hello logging") != std::string::npos); + EXPECT_EQ(stdout_capture.GetOutput(), "Hello logging"); + EXPECT_TRUE(stderr_capture.GetOutput().empty()); } TEST_F(FlutterEngineTest, DISABLED_BackgroundIsBlack) { From 73f622c5f01e6dac81cf275598cda6b1d10bb825 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Thu, 22 Aug 2024 11:40:00 -0700 Subject: [PATCH 2/2] Equality check --- .../darwin/macos/framework/Source/FlutterEngineTest.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm index 4574aefa5c50d..7b7d4fb427f1a 100644 --- a/shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm +++ b/shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm @@ -223,8 +223,8 @@ @implementation MockableFlutterEngine stderr_capture.Stop(); // Verify hello world was written to stdout. - EXPECT_TRUE(stdout_capture.GetOutput().find("Hello logging") != std::string::npos); - EXPECT_EQ(stdout_capture.GetOutput(), "Hello logging"); + // Check equality to ensure no unexpected stray logging. + EXPECT_EQ(stdout_capture.GetOutput(), "flutter: Hello logging\n"); EXPECT_TRUE(stderr_capture.GetOutput().empty()); }