Skip to content

Commit

Permalink
[macOS] Clean up resources in ViewController tests
Browse files Browse the repository at this point in the history
Wraps all FlutterViewController tests in an autorelease pool to ensure
resources are cleaned up.

Adds a MockFlutterEngineTest subclass of AutoreleasePoolTest that
creates an OCPartialMock FlutterEngine and shuts it down at the end of
the test. Previously we were not shutting down any FlutterEngine
instances we allocated, resulting in potentially thousands of threads
and graphics contexts being allocated.

Prior to this change, running these tests via:

    ../out/host_debug_unopt_arm64/flutter_desktop_darwin_unittests \
        --gtest_filter='FlutterViewController.*' --gtest_repeat=1000

resulted in test failures and sometimes segfaults. This ensures
resources are cleaned up

Eventually all unit tests should configure their FlutterEngine via
either FlutterEngineTest (which should be an AutoreleasePoolTest) or
MockFlutterEngineTest, and the CreateMockFlutterEngine function moved to
a static used in the implementation of these.

Issue: flutter/flutter#104789
Issue: flutter/flutter#127441
Issue: flutter/flutter#124840
  • Loading branch information
cbracken committed Nov 8, 2023
1 parent 5833714 commit 13da3c0
Show file tree
Hide file tree
Showing 3 changed files with 143 additions and 71 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h"

#import <OCMock/OCMock.h>

#include "flutter/testing/autoreleasepool_test.h"
#include "flutter/testing/test_dart_native_resolver.h"
#include "gtest/gtest.h"

Expand Down Expand Up @@ -36,6 +38,30 @@ class FlutterEngineTest : public ::testing::Test {

// Returns a mock FlutterEngine that is able to work in environments
// without a real pasteboard.
//
// Callers MUST call [mockEngine shutDownEngine] when finished with the returned engine.
id CreateMockFlutterEngine(NSString* pasteboardString);

class MockFlutterEngineTest : public AutoreleasePoolTest {
public:
MockFlutterEngineTest();

void SetUp() override;
void TearDown() override;

id GetMockEngine() { return engine_mock_; }

void ShutDownEngine();

~MockFlutterEngineTest() {
[engine_mock_ shutDownEngine];
[engine_mock_ stopMocking];
}

private:
id engine_mock_;

FML_DISALLOW_COPY_AND_ASSIGN(MockFlutterEngineTest);
};

} // namespace flutter::testing
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,21 @@ id CreateMockFlutterEngine(NSString* pasteboardString) {
}
}

MockFlutterEngineTest::MockFlutterEngineTest() = default;

void MockFlutterEngineTest::SetUp() {
engine_mock_ = CreateMockFlutterEngine(@"");
}

void MockFlutterEngineTest::TearDown() {
[engine_mock_ shutDownEngine];
[engine_mock_ stopMocking];
engine_mock_ = nil;
}

void MockFlutterEngineTest::ShutDownEngine() {
[engine_mock_ shutDownEngine];
engine_mock_ = nil;
}

} // namespace flutter::testing
Loading

0 comments on commit 13da3c0

Please sign in to comment.