Revert "Revert "Reland "Build iOS unittest target in unopt builds" (flutter#44356)"" (flutter#45346)"

Chris Yang · Chris Yang · commit 11e04bcc0a86 · 2023-09-07T15:00:40.000-07:00
This reverts commit ca513c9. fix 1 fix fix temp ci change fix name space fix fix fix format
diff --git a/.ci.yaml b/.ci.yaml
@@ -393,7 +393,7 @@ targets:
 
   - name: Mac mac_clang_tidy
     recipe: engine_v2/engine_v2
-    presubmit: false
+    presubmit: true
     timeout: 120
     properties:
       config_name: mac_clang_tidy
diff --git a/BUILD.gn b/BUILD.gn
@@ -149,6 +149,10 @@ group("unittests") {
         [ "//flutter/shell/platform/android:flutter_shell_native_unittests" ]
   }
 
+  if (is_ios) {
+    public_deps += [ "//flutter/shell/platform/darwin/ios:ios_test_flutter" ]
+  }
+
   # Compile all unittests targets if enabled.
   if (enable_unittests) {
     public_deps += [
diff --git a/shell/platform/darwin/ios/BUILD.gn b/shell/platform/darwin/ios/BUILD.gn
@@ -270,7 +270,7 @@ source_set("ios_test_flutter_mrc") {
 
 shared_library("ios_test_flutter") {
   testonly = true
-  visibility = [ ":*" ]
+  visibility = [ "*" ]
   cflags = [
     "-fvisibility=default",
     "-F$platform_frameworks_path",
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterChannelKeyResponderTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterChannelKeyResponderTest.mm
@@ -18,9 +18,12 @@
 
 namespace {
 API_AVAILABLE(ios(13.4))
+// NOLINTNEXTLINE(readability-identifier-naming)
 constexpr UIKeyboardHIDUsage keyACode = (UIKeyboardHIDUsage)0x4;  // KeyA iOS scan code.
 }  // namespace
 
+using namespace flutter::testing;
+
 API_AVAILABLE(ios(13.4))
 @interface FlutterChannelKeyResponderTest : XCTestCase
 @property(copy, nonatomic) FlutterUIPressProxy* testKeyDownEvent API_AVAILABLE(ios(13.4));
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponderTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponderTest.mm
@@ -15,6 +15,7 @@
 #include "flutter/shell/platform/embedder/test_utils/key_codes.g.h"
 
 using namespace flutter::testing::keycodes;
+using namespace flutter::testing;
 
 FLUTTER_ASSERT_ARC;
 
@@ -43,7 +44,7 @@ - (instancetype)initWithEvent:(const FlutterKeyEvent*)event
   if (event->character != nullptr) {
     size_t len = strlen(event->character);
     char* character = new char[len + 1];
-    strcpy(character, event->character);
+    strlcpy(character, event->character, len);
     _data->character = character;
   }
   _callback = callback;
@@ -63,8 +64,9 @@ - (void)respond:(BOOL)handled {
 }
 
 - (void)dealloc {
-  if (_data->character != nullptr)
+  if (_data->character != nullptr) {
     delete[] _data->character;
+  }
   delete _data;
 }
 @end
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterFakeKeyEvents.h b/shell/platform/darwin/ios/framework/Source/FlutterFakeKeyEvents.h
@@ -47,26 +47,29 @@ API_AVAILABLE(ios(13.4))
 @property(readwrite, nonatomic) NSString* dataCharactersIgnoringModifiers;
 @end
 
-FlutterUIPressProxy* keyDownEvent(UIKeyboardHIDUsage keyCode,
-                                  UIKeyModifierFlags modifierFlags = 0x0,
-                                  NSTimeInterval timestamp = 0.0f,
-                                  const char* characters = "",
-                                  const char* charactersIgnoringModifiers = "")
+namespace flutter {
+namespace testing {
+extern FlutterUIPressProxy* keyDownEvent(UIKeyboardHIDUsage keyCode,
+                                         UIKeyModifierFlags modifierFlags = 0x0,
+                                         NSTimeInterval timestamp = 0.0f,
+                                         const char* characters = "",
+                                         const char* charactersIgnoringModifiers = "")
     API_AVAILABLE(ios(13.4));
 
-FlutterUIPressProxy* keyUpEvent(UIKeyboardHIDUsage keyCode,
-                                UIKeyModifierFlags modifierFlags = 0x0,
-                                NSTimeInterval timestamp = 0.0f,
-                                const char* characters = "",
-                                const char* charactersIgnoringModifiers = "")
-    API_AVAILABLE(ios(13.4));
-
-FlutterUIPressProxy* keyEventWithPhase(UIPressPhase phase,
-                                       UIKeyboardHIDUsage keyCode,
+extern FlutterUIPressProxy* keyUpEvent(UIKeyboardHIDUsage keyCode,
                                        UIKeyModifierFlags modifierFlags = 0x0,
                                        NSTimeInterval timestamp = 0.0f,
                                        const char* characters = "",
                                        const char* charactersIgnoringModifiers = "")
     API_AVAILABLE(ios(13.4));
 
+extern FlutterUIPressProxy* keyEventWithPhase(UIPressPhase phase,
+                                              UIKeyboardHIDUsage keyCode,
+                                              UIKeyModifierFlags modifierFlags = 0x0,
+                                              NSTimeInterval timestamp = 0.0f,
+                                              const char* characters = "",
+                                              const char* charactersIgnoringModifiers = "")
+    API_AVAILABLE(ios(13.4));
+}  // namespace testing
+}  // namespace flutter
 #endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_FAKE_KEY_EVENTS_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterFakeKeyEvents.mm b/shell/platform/darwin/ios/framework/Source/FlutterFakeKeyEvents.mm
@@ -84,6 +84,9 @@ - (NSString*)charactersIgnoringModifiers API_AVAILABLE(ios(13.4)) {
 }
 @end
 
+namespace flutter {
+namespace testing {
+
 FlutterUIPressProxy* keyDownEvent(UIKeyboardHIDUsage keyCode,
                                   UIKeyModifierFlags modifierFlags,
                                   NSTimeInterval timestamp,
@@ -123,3 +126,5 @@ - (NSString*)charactersIgnoringModifiers API_AVAILABLE(ios(13.4)) {
                                            type:UIEventTypePresses
                                       timestamp:timestamp];
 }
+}  // namespace testing
+}  // namespace flutter
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterKeyboardManagerTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterKeyboardManagerTest.mm
@@ -21,6 +21,8 @@
 class PointerDataPacket {};
 }  // namespace flutter
 
+using namespace flutter::testing;
+
 /// Sometimes we have to use a custom mock to avoid retain cycles in ocmock.
 @interface FlutterEnginePartialMock : FlutterEngine
 @property(nonatomic, strong) FlutterBasicMessageChannel* lifecycleChannel;
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterTextureRegistryRelayTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterTextureRegistryRelayTest.mm
@@ -61,6 +61,7 @@ - (void)testRetainCycle {
     weakEngine = engine;
   }
   XCTAssertNil(weakEngine);
+  XCTAssertNotNil(strongRelay);
 }
 
 @end
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerPluginTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerPluginTest.mm
@@ -41,7 +41,7 @@ - (void)setUp {
 
   self.undoManagerPlugin = [[FlutterUndoManagerPluginForTest alloc] initWithDelegate:self.engine];
 
-  self.viewController = [FlutterViewController new];
+  self.viewController = [[FlutterViewController alloc] init];
   self.undoManagerPlugin.viewController = self.viewController;
 
   self.undoManager = OCMClassMock([NSUndoManager class]);
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm
@@ -22,6 +22,8 @@
 
 FLUTTER_ASSERT_ARC
 
+using namespace flutter::testing;
+
 @interface FlutterEngine ()
 - (FlutterTextInputPlugin*)textInputPlugin;
 - (void)sendKeyEvent:(const FlutterKeyEvent&)event
@@ -57,8 +59,9 @@ - (void)notifyLowMemory {
 - (void)sendKeyEvent:(const FlutterKeyEvent&)event
             callback:(FlutterKeyEventCallback)callback
             userData:(void*)userData API_AVAILABLE(ios(9.0)) {
-  if (callback == nil)
+  if (callback == nil) {
     return;
+  }
   // NSAssert(callback != nullptr, @"Invalid callback");
   // Response is async, so we have to post it to the run loop instead of calling
   // it directly.
@@ -1179,18 +1182,16 @@ - (void)testItReportsDarkPlatformBrightnessWhenTraitCollectionRequestsIt {
   // Setup test.
   id settingsChannel = OCMClassMock([FlutterBasicMessageChannel class]);
   OCMStub([self.mockEngine settingsChannel]).andReturn(settingsChannel);
-
-  FlutterViewController* realVC = [[FlutterViewController alloc] initWithEngine:self.mockEngine
-                                                                        nibName:nil
-                                                                         bundle:nil];
   id mockTraitCollection =
       [self fakeTraitCollectionWithUserInterfaceStyle:UIUserInterfaceStyleDark];
 
   // We partially mock the real FlutterViewController to act as the OS and report
   // the UITraitCollection of our choice. Mocking the object under test is not
   // desirable, but given that the OS does not offer a DI approach to providing
   // our own UITraitCollection, this seems to be the least bad option.
-  id partialMockVC = OCMPartialMock(realVC);
+  id partialMockVC = OCMPartialMock([[FlutterViewController alloc] initWithEngine:self.mockEngine
+                                                                          nibName:nil
+                                                                           bundle:nil]);
   OCMStub([partialMockVC traitCollection]).andReturn(mockTraitCollection);
 
   // Exercise behavior under test.
@@ -1283,16 +1284,15 @@ - (void)testItReportsHighContrastWhenTraitCollectionRequestsIt {
   id settingsChannel = OCMClassMock([FlutterBasicMessageChannel class]);
   OCMStub([self.mockEngine settingsChannel]).andReturn(settingsChannel);
 
-  FlutterViewController* realVC = [[FlutterViewController alloc] initWithEngine:self.mockEngine
-                                                                        nibName:nil
-                                                                         bundle:nil];
   id mockTraitCollection = [self fakeTraitCollectionWithContrast:UIAccessibilityContrastHigh];
 
   // We partially mock the real FlutterViewController to act as the OS and report
   // the UITraitCollection of our choice. Mocking the object under test is not
   // desirable, but given that the OS does not offer a DI approach to providing
   // our own UITraitCollection, this seems to be the least bad option.
-  id partialMockVC = OCMPartialMock(realVC);
+  id partialMockVC = OCMPartialMock([[FlutterViewController alloc] initWithEngine:self.mockEngine
+                                                                          nibName:nil
+                                                                           bundle:nil]);
   OCMStub([partialMockVC traitCollection]).andReturn(mockTraitCollection);
 
   // Exercise behavior under test.
@@ -1575,6 +1575,7 @@ - (void)testWillDeallocNotification {
       [[XCTestExpectation alloc] initWithDescription:@"notification called"];
   id engine = [[MockEngine alloc] init];
   @autoreleasepool {
+    // NOLINTNEXTLINE(clang-analyzer-deadcode.DeadStores)
     FlutterViewController* realVC = [[FlutterViewController alloc] initWithEngine:engine
                                                                           nibName:nil
                                                                            bundle:nil];
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest_mrc.mm b/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest_mrc.mm
@@ -51,11 +51,10 @@ - (void)testSetupKeyboardAnimationVsyncClientWillCreateNewVsyncClientForFlutterV
   id mockDisplayLinkManager = [OCMockObject mockForClass:[DisplayLinkManager class]];
   double maxFrameRate = 120;
   [[[mockDisplayLinkManager stub] andReturnValue:@(maxFrameRate)] displayRefreshRate];
-  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  FlutterEngine* engine = [[[FlutterEngine alloc] init] autorelease];
   [engine runWithEntrypoint:nil];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
-                                                                                nibName:nil
-                                                                                 bundle:nil];
+  FlutterViewController* viewController =
+      [[[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil] autorelease];
   FlutterKeyboardAnimationCallback callback = ^(fml::TimePoint targetTime) {
   };
   [viewController setUpKeyboardAnimationVsyncClient:callback];
@@ -76,11 +75,10 @@ - (void)testSetupKeyboardAnimationVsyncClientWillCreateNewVsyncClientForFlutterV
   id mockDisplayLinkManager = [OCMockObject mockForClass:[DisplayLinkManager class]];
   double maxFrameRate = 120;
   [[[mockDisplayLinkManager stub] andReturnValue:@(maxFrameRate)] displayRefreshRate];
-  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  FlutterEngine* engine = [[[FlutterEngine alloc] init] autorelease];
   [engine runWithEntrypoint:nil];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
-                                                                                nibName:nil
-                                                                                 bundle:nil];
+  FlutterViewController* viewController =
+      [[[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil] autorelease];
   [viewController createTouchRateCorrectionVSyncClientIfNeeded];
   XCTAssertNotNil(viewController.touchRateCorrectionVSyncClient);
 }
@@ -90,11 +88,10 @@ - (void)testCreateTouchRateCorrectionVSyncClientWillNotCreateNewVSyncClientWhenC
   double maxFrameRate = 120;
   [[[mockDisplayLinkManager stub] andReturnValue:@(maxFrameRate)] displayRefreshRate];
 
-  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  FlutterEngine* engine = [[[FlutterEngine alloc] init] autorelease];
   [engine runWithEntrypoint:nil];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
-                                                                                nibName:nil
-                                                                                 bundle:nil];
+  FlutterViewController* viewController =
+      [[[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil] autorelease];
   [viewController createTouchRateCorrectionVSyncClientIfNeeded];
   VSyncClient* clientBefore = viewController.touchRateCorrectionVSyncClient;
   XCTAssertNotNil(clientBefore);
@@ -110,11 +107,10 @@ - (void)testCreateTouchRateCorrectionVSyncClientWillNotCreateVsyncClientWhenRefr
   id mockDisplayLinkManager = [OCMockObject mockForClass:[DisplayLinkManager class]];
   double maxFrameRate = 60;
   [[[mockDisplayLinkManager stub] andReturnValue:@(maxFrameRate)] displayRefreshRate];
-  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  FlutterEngine* engine = [[[FlutterEngine alloc] init] autorelease];
   [engine runWithEntrypoint:nil];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
-                                                                                nibName:nil
-                                                                                 bundle:nil];
+  FlutterViewController* viewController =
+      [[[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil] autorelease];
   [viewController createTouchRateCorrectionVSyncClientIfNeeded];
   XCTAssertNil(viewController.touchRateCorrectionVSyncClient);
 }
@@ -123,79 +119,83 @@ - (void)testTriggerTouchRateCorrectionVSyncClientCorrectly {
   id mockDisplayLinkManager = [OCMockObject mockForClass:[DisplayLinkManager class]];
   double maxFrameRate = 120;
   [[[mockDisplayLinkManager stub] andReturnValue:@(maxFrameRate)] displayRefreshRate];
-  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  FlutterEngine* engine = [[[FlutterEngine alloc] init] autorelease];
   [engine runWithEntrypoint:nil];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
-                                                                                nibName:nil
-                                                                                 bundle:nil];
+  FlutterViewController* viewController =
+      [[[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil] autorelease];
   [viewController loadView];
   [viewController viewDidLoad];
 
   VSyncClient* client = viewController.touchRateCorrectionVSyncClient;
   CADisplayLink* link = [client getDisplayLink];
 
-  UITouch* fakeTouchBegan = [[UITouch alloc] init];
+  UITouch* fakeTouchBegan = [[[UITouch alloc] init] autorelease];
   fakeTouchBegan.phase = UITouchPhaseBegan;
 
-  UITouch* fakeTouchMove = [[UITouch alloc] init];
+  UITouch* fakeTouchMove = [[[UITouch alloc] init] autorelease];
   fakeTouchMove.phase = UITouchPhaseMoved;
 
-  UITouch* fakeTouchEnd = [[UITouch alloc] init];
+  UITouch* fakeTouchEnd = [[[UITouch alloc] init] autorelease];
   fakeTouchEnd.phase = UITouchPhaseEnded;
 
-  UITouch* fakeTouchCancelled = [[UITouch alloc] init];
+  UITouch* fakeTouchCancelled = [[[UITouch alloc] init] autorelease];
   fakeTouchCancelled.phase = UITouchPhaseCancelled;
 
   [viewController
-      triggerTouchRateCorrectionIfNeeded:[[NSSet alloc] initWithObjects:fakeTouchBegan, nil]];
+      triggerTouchRateCorrectionIfNeeded:[[[NSSet alloc] initWithObjects:fakeTouchBegan, nil]
+                                             autorelease]];
   XCTAssertFalse(link.isPaused);
 
   [viewController
-      triggerTouchRateCorrectionIfNeeded:[[NSSet alloc] initWithObjects:fakeTouchEnd, nil]];
+      triggerTouchRateCorrectionIfNeeded:[[[NSSet alloc] initWithObjects:fakeTouchEnd, nil]
+                                             autorelease]];
   XCTAssertTrue(link.isPaused);
 
   [viewController
-      triggerTouchRateCorrectionIfNeeded:[[NSSet alloc] initWithObjects:fakeTouchMove, nil]];
+      triggerTouchRateCorrectionIfNeeded:[[[NSSet alloc] initWithObjects:fakeTouchMove, nil]
+                                             autorelease]];
   XCTAssertFalse(link.isPaused);
 
   [viewController
-      triggerTouchRateCorrectionIfNeeded:[[NSSet alloc] initWithObjects:fakeTouchCancelled, nil]];
+      triggerTouchRateCorrectionIfNeeded:[[[NSSet alloc] initWithObjects:fakeTouchCancelled, nil]
+                                             autorelease]];
   XCTAssertTrue(link.isPaused);
 
   [viewController
-      triggerTouchRateCorrectionIfNeeded:[[NSSet alloc]
-                                             initWithObjects:fakeTouchBegan, fakeTouchEnd, nil]];
+      triggerTouchRateCorrectionIfNeeded:[[[NSSet alloc]
+                                             initWithObjects:fakeTouchBegan, fakeTouchEnd, nil]
+                                             autorelease]];
   XCTAssertFalse(link.isPaused);
 
   [viewController
-      triggerTouchRateCorrectionIfNeeded:[[NSSet alloc] initWithObjects:fakeTouchEnd,
-                                                                        fakeTouchCancelled, nil]];
+      triggerTouchRateCorrectionIfNeeded:[[[NSSet alloc]
+                                             initWithObjects:fakeTouchEnd, fakeTouchCancelled, nil]
+                                             autorelease]];
   XCTAssertTrue(link.isPaused);
 
   [viewController
-      triggerTouchRateCorrectionIfNeeded:[[NSSet alloc]
-                                             initWithObjects:fakeTouchMove, fakeTouchEnd, nil]];
+      triggerTouchRateCorrectionIfNeeded:[[[NSSet alloc]
+                                             initWithObjects:fakeTouchMove, fakeTouchEnd, nil]
+                                             autorelease]];
   XCTAssertFalse(link.isPaused);
 }
 
 - (void)testFlutterViewControllerStartKeyboardAnimationWillCreateVsyncClientCorrectly {
-  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  FlutterEngine* engine = [[[FlutterEngine alloc] init] autorelease];
   [engine runWithEntrypoint:nil];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
-                                                                                nibName:nil
-                                                                                 bundle:nil];
+  FlutterViewController* viewController =
+      [[[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil] autorelease];
   viewController.targetViewInsetBottom = 100;
   [viewController startKeyBoardAnimation:0.25];
   XCTAssertNotNil(viewController.keyboardAnimationVSyncClient);
 }
 
 - (void)
     testSetupKeyboardAnimationVsyncClientWillNotCreateNewVsyncClientWhenKeyboardAnimationCallbackIsNil {
-  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  FlutterEngine* engine = [[[FlutterEngine alloc] init] autorelease];
   [engine runWithEntrypoint:nil];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
-                                                                                nibName:nil
-                                                                                 bundle:nil];
+  FlutterViewController* viewController =
+      [[[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil] autorelease];
   [viewController setUpKeyboardAnimationVsyncClient:nil];
   XCTAssertNil(viewController.keyboardAnimationVSyncClient);
 }
diff --git a/shell/platform/darwin/ios/framework/Source/SemanticsObjectTest.mm b/shell/platform/darwin/ios/framework/Source/SemanticsObjectTest.mm
diff --git a/tools/clang_tidy/lib/clang_tidy.dart b/tools/clang_tidy/lib/clang_tidy.dart

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,9 @@ - (NSString*)charactersIgnoringModifiers API_AVAILABLE(ios(13.4)) {`
`84`	`84`	`}`
`85`	`85`	`@end`
`86`	`86`
	`87`	`+namespace flutter {`
	`88`	`+namespace testing {`
	`89`	`+`
`87`	`90`	`FlutterUIPressProxy* keyDownEvent(UIKeyboardHIDUsage keyCode,`
`88`	`91`	`UIKeyModifierFlags modifierFlags,`
`89`	`92`	`NSTimeInterval timestamp,`
`@@ -123,3 +126,5 @@ - (NSString*)charactersIgnoringModifiers API_AVAILABLE(ios(13.4)) {`
`123`	`126`	`type:UIEventTypePresses`
`124`	`127`	`timestamp:timestamp];`
`125`	`128`	`}`
	`129`	`+} // namespace testing`
	`130`	`+} // namespace flutter`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ - (void)testRetainCycle {`
`61`	`61`	`weakEngine = engine;`
`62`	`62`	`}`
`63`	`63`	`XCTAssertNil(weakEngine);`
	`64`	`+ XCTAssertNotNil(strongRelay);`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`@end`