DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes crash in testTrackpadGesturesAreSentToFramework (flutter/engine#55990)

Browse Source 
fixes https://github.com/flutter/flutter/issues/157205

This crashed because ocmock was storing references to rvalues for its
mocked arguments.

## 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].
- [x] 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
This commit is contained in:
gaaclarke 2024-10-23 10:11:35 -07:00 committed by GitHub
parent 20528e2550
commit d7182e6d40
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterViewControllerTest.mm
View File

@ -21,6 +21,9 @@
#pragma mark - Test Helper Classes
static const FlutterPointerEvent kDefaultFlutterPointerEvent = {};
static const FlutterKeyEvent kDefaultFlutterKeyEvent = {};
// A wrap to convert FlutterKeyEvent to a ObjC class.
@interface KeyEventWrapper : NSObject
@property(nonatomic) FlutterKeyEvent* data;
@ -339,7 +342,7 @@ TEST_F(FlutterViewControllerTest, testViewControllerIsReleased) {
OCMStub( // NOLINT(google-objc-avoid-throwing-exception)
[engineMock binaryMessenger])
.andReturn(binaryMessengerMock);
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
callback:nil
userData:nil])
.andCall([FlutterViewControllerTestObjC class],
@ -375,7 +378,7 @@ TEST_F(FlutterViewControllerTest, testViewControllerIsReleased) {
- (bool)testCtrlTabKeyEventIsPropagated:(id)engineMock {
__block bool called = false;
__block FlutterKeyEvent last_event;
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
callback:nil
userData:nil])
.andDo((^(NSInvocation* invocation) {
@ -419,7 +422,7 @@ TEST_F(FlutterViewControllerTest, testViewControllerIsReleased) {
- (bool)testKeyEquivalentIsPassedToTextInputPlugin:(id)engineMock {
__block bool called = false;
__block FlutterKeyEvent last_event;
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
callback:nil
userData:nil])
.andDo((^(NSInvocation* invocation) {
@ -471,7 +474,7 @@ TEST_F(FlutterViewControllerTest, testViewControllerIsReleased) {
OCMStub( // NOLINT(google-objc-avoid-throwing-exception)
[engineMock binaryMessenger])
.andReturn(binaryMessengerMock);
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
callback:nil
userData:nil])
.andCall([FlutterViewControllerTestObjC class],
@ -545,7 +548,7 @@ TEST_F(FlutterViewControllerTest, testViewControllerIsReleased) {
OCMStub( // NOLINT(google-objc-avoid-throwing-exception)
[engineMock binaryMessenger])
.andReturn(binaryMessengerMock);
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
callback:nil
userData:nil])
.andCall([FlutterViewControllerTestObjC class],
@ -598,7 +601,7 @@ TEST_F(FlutterViewControllerTest, testViewControllerIsReleased) {
OCMStub( // NOLINT(google-objc-avoid-throwing-exception)
[engineMock binaryMessenger])
.andReturn(binaryMessengerMock);
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
callback:nil
userData:nil])
.andCall([FlutterViewControllerTestObjC class],
@ -655,7 +658,7 @@ TEST_F(FlutterViewControllerTest, testViewControllerIsReleased) {
.andReturn(binaryMessengerMock);
__block bool called = false;
__block FlutterKeyEvent last_event;
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
callback:nil
userData:nil])
.andDo((^(NSInvocation* invocation) {
@ -715,7 +718,7 @@ TEST_F(FlutterViewControllerTest, testViewControllerIsReleased) {
OCMStub([engineMock renderer]).andReturn(renderer_);
__block bool called = false;
__block FlutterPointerEvent last_event;
OCMStub([[engineMock ignoringNonObjectArgs] sendPointerEvent:FlutterPointerEvent{}])
OCMStub([[engineMock ignoringNonObjectArgs] sendPointerEvent:kDefaultFlutterPointerEvent])
.andDo((^(NSInvocation* invocation) {
FlutterPointerEvent* event;
[invocation getArgument:&event atIndex:2];
@ -1139,7 +1142,7 @@ static void SwizzledNoop(id self, SEL _cmd) {}
// Capture calls to sendKeyEvent
__block NSMutableArray<KeyEventWrapper*>* events = [NSMutableArray array];
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
callback:nil
userData:nil])
.andDo((^(NSInvocation* invocation) {