review

format

Author: Chris Yang

shell/platform/darwin/ios/framework/Source/FlutterChannelKeyResponderTest.mm

@@ -16,12 +16,6 @@
   XCTAssertTrue([value isEqualToString:expected], \
                 @"String \"%@\" not equal to the expected value of \"%@\"", value, expected)
 
-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))
@@ -38,8 +32,8 @@ - (void)setUp {
   } else {
     XCTSkip(@"Required API not present for test.");
   }
-  _testKeyDownEvent = keyDownEvent(keyACode, 0x0, 0.0f, "a", "a");
-  _testKeyUpEvent = keyUpEvent(keyACode, 0x0, 0.0f);
+  _testKeyDownEvent = keyDownEvent(UIKeyboardHIDUsageKeyboardA, 0x0, 0.0f, "a", "a");
+  _testKeyUpEvent = keyUpEvent(UIKeyboardHIDUsageKeyboardA, 0x0, 0.0f);
 }
 
 - (void)tearDown API_AVAILABLE(ios(13.4)) {
@@ -79,7 +73,7 @@ - (void)testBasicKeyEvent API_AVAILABLE(ios(13.4)) {
   XCTAssertEqual([messages count], 1u);
   XCTAssertStrEqual([messages lastObject][@"keymap"], @"ios");
   XCTAssertStrEqual([messages lastObject][@"type"], @"keydown");
-  XCTAssertEqual([[messages lastObject][@"keyCode"] intValue], keyACode);
+  XCTAssertEqual([[messages lastObject][@"keyCode"] intValue], UIKeyboardHIDUsageKeyboardA);
   XCTAssertEqual([[messages lastObject][@"modifiers"] intValue], 0x0);
   XCTAssertStrEqual([messages lastObject][@"characters"], @"a");
   XCTAssertStrEqual([messages lastObject][@"charactersIgnoringModifiers"], @"a");
@@ -100,7 +94,7 @@ - (void)testBasicKeyEvent API_AVAILABLE(ios(13.4)) {
   XCTAssertEqual([messages count], 1u);
   XCTAssertStrEqual([messages lastObject][@"keymap"], @"ios");
   XCTAssertStrEqual([messages lastObject][@"type"], @"keyup");
-  XCTAssertEqual([[messages lastObject][@"keyCode"] intValue], keyACode);
+  XCTAssertEqual([[messages lastObject][@"keyCode"] intValue], UIKeyboardHIDUsageKeyboardA);
   XCTAssertEqual([[messages lastObject][@"modifiers"] intValue], 0x0);
 
   XCTAssertEqual([responses count], 1u);
@@ -137,7 +131,7 @@ - (void)testEmptyResponseIsTakenAsHandled API_AVAILABLE(ios(13.4)) {
   XCTAssertEqual([messages count], 1u);
   XCTAssertStrEqual([messages lastObject][@"keymap"], @"ios");
   XCTAssertStrEqual([messages lastObject][@"type"], @"keydown");
-  XCTAssertEqual([[messages lastObject][@"keyCode"] intValue], keyACode);
+  XCTAssertEqual([[messages lastObject][@"keyCode"] intValue], UIKeyboardHIDUsageKeyboardA);
   XCTAssertEqual([[messages lastObject][@"modifiers"] intValue], 0x0);
   XCTAssertStrEqual([messages lastObject][@"characters"], @"a");
   XCTAssertStrEqual([messages lastObject][@"charactersIgnoringModifiers"], @"a");

shell/platform/darwin/ios/framework/Source/FlutterEngineGroupTest.mm

@@ -130,9 +130,9 @@ - (void)testReleasesProjectOnDealloc {
   __weak FlutterDartProject* weakProject;
   @autoreleasepool {
     FlutterDartProject* mockProject = OCMClassMock([FlutterDartProject class]);
-    // NOLINTNEXTLINE(clang-analyzer-deadcode.DeadStores)
     FlutterEngineGroup* group = [[FlutterEngineGroup alloc] initWithName:@"foo"
                                                                  project:mockProject];
+    XCTAssertNotNil(group);
     weakProject = mockProject;
     XCTAssertNotNil(weakProject);
     group = nil;

shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm

@@ -1585,6 +1585,7 @@ - (void)testWillDeallocNotification {
                                                   usingBlock:^(NSNotification* _Nonnull note) {
                                                     [expectation fulfill];
                                                   }];
+    XCTAssertNotNil(realVC);
     realVC = nil;
   }
   [self waitForExpectations:@[ expectation ] timeout:1.0];

shell/platform/darwin/ios/framework/Source/SemanticsObjectTest.mm

@@ -12,12 +12,6 @@
 
 const CGRect kScreenSize = CGRectMake(0, 0, 600, 800);
 
-// copied from clang document: https://clang-analyzer.llvm.org/faq.html#unlocalized_string
-__attribute__((annotate("returns_localized_nsstring"))) static inline NSString*
-LocalizationNotNeeded(NSString* s) {
-  return s;
-}
-
 namespace flutter {
 namespace {
 
@@ -666,9 +660,11 @@ - (void)testFlutterScrollableSemanticsObjectWithLabelValueHintIsNotHiddenWhenVoi
   [scrollable accessibilityBridgeDidFinishUpdate];
   UIScrollView* scrollView = [scrollable nativeAccessibility];
   XCTAssertTrue(scrollView.isAccessibilityElement);
-  XCTAssertTrue([scrollView.accessibilityLabel isEqualToString:LocalizationNotNeeded(@"label")]);
-  XCTAssertTrue([scrollView.accessibilityValue isEqualToString:LocalizationNotNeeded(@"value")]);
-  XCTAssertTrue([scrollView.accessibilityHint isEqualToString:LocalizationNotNeeded(@"hint")]);
+  XCTAssertTrue(
+      [scrollView.accessibilityLabel isEqualToString:NSLocalizedString(@"label", @"test")]);
+  XCTAssertTrue(
+      [scrollView.accessibilityValue isEqualToString:NSLocalizedString(@"value", @"test")]);
+  XCTAssertTrue([scrollView.accessibilityHint isEqualToString:NSLocalizedString(@"hint", @"test")]);
 }
 
 - (void)testFlutterSemanticsObjectMergeTooltipToLabel {
@@ -794,7 +790,7 @@ - (void)testSemanticsObjectBuildsAttributedString {
   FlutterSemanticsObject* object = [[FlutterSemanticsObject alloc] initWithBridge:bridge uid:0];
   [object setSemanticsNode:&node];
   NSMutableAttributedString* expectedAttributedLabel =
-      [[NSMutableAttributedString alloc] initWithString:LocalizationNotNeeded(@"label")];
+      [[NSMutableAttributedString alloc] initWithString:NSLocalizedString(@"label", @"test")];
   NSDictionary* attributeDict = @{
     UIAccessibilitySpeechAttributeSpellOut : @YES,
   };
@@ -803,7 +799,7 @@ - (void)testSemanticsObjectBuildsAttributedString {
       [object.accessibilityAttributedLabel isEqualToAttributedString:expectedAttributedLabel]);
 
   NSMutableAttributedString* expectedAttributedValue =
-      [[NSMutableAttributedString alloc] initWithString:LocalizationNotNeeded(@"value")];
+      [[NSMutableAttributedString alloc] initWithString:NSLocalizedString(@"value", @"test")];
   attributeDict = @{
     UIAccessibilitySpeechAttributeSpellOut : @YES,
   };
@@ -812,7 +808,7 @@ - (void)testSemanticsObjectBuildsAttributedString {
       [object.accessibilityAttributedValue isEqualToAttributedString:expectedAttributedValue]);
 
   NSMutableAttributedString* expectedAttributedHint =
-      [[NSMutableAttributedString alloc] initWithString:LocalizationNotNeeded(@"hint")];
+      [[NSMutableAttributedString alloc] initWithString:NSLocalizedString(@"hint", @"test")];
   attributeDict = @{
     UIAccessibilitySpeechAttributeLanguage : @"en-MX",
   };