From 50979ef389fcdc9bda80f760fbc3787956b19535 Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Tue, 14 Nov 2023 12:12:53 -0800 Subject: [PATCH] [macOS] Eliminate unused OCMock includes (flutter/engine#48031) As part of the broader quest to reduce our dependence on OCMock in macOS embedder tests, this removes #includes of OCMock into files where OCMock is not actually used. ## 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]. [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 --- .../macos/framework/Source/FlutterEmbedderKeyResponderTest.mm | 1 - .../darwin/macos/framework/Source/FlutterSurfaceManagerTest.mm | 1 - .../framework/Source/FlutterTextInputSemanticsObjectTest.mm | 1 - .../macos/framework/Source/FlutterThreadSynchronizerTest.mm | 1 - 4 files changed, 4 deletions(-) diff --git a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponderTest.mm b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponderTest.mm index faa6703b050..e59837db374 100644 --- a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponderTest.mm +++ b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponderTest.mm @@ -3,7 +3,6 @@ // found in the LICENSE file. #import -#import #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponder.h" #include "flutter/shell/platform/embedder/test_utils/key_codes.g.h" diff --git a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManagerTest.mm b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManagerTest.mm index 8b5606834c0..bc064ece640 100644 --- a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManagerTest.mm +++ b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManagerTest.mm @@ -4,7 +4,6 @@ #import #import -#import #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterSurface.h" #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.h" diff --git a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObjectTest.mm b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObjectTest.mm index 4555e435d71..fcba538dc11 100644 --- a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObjectTest.mm +++ b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObjectTest.mm @@ -9,7 +9,6 @@ #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObject.h" #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h" -#import #import "flutter/testing/testing.h" namespace flutter::testing { diff --git a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizerTest.mm b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizerTest.mm index 2541f867557..2a9dec62f15 100644 --- a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizerTest.mm +++ b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizerTest.mm @@ -4,7 +4,6 @@ #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizer.h" -#import #import "flutter/fml/synchronization/waitable_event.h" #import "flutter/testing/testing.h"