Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 6b3f193

Browse files
committed
Simplify by using 'for in'
1 parent 470ba89 commit 6b3f193

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

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

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -834,38 +834,38 @@ - (bool)testModifierKeysAreSynthesizedOnMouseMove {
834834
EXPECT_EQ([events count], 0u);
835835

836836
// For each modifier key, check that key events are synthesized.
837-
[flutter::keyCodeToModifierFlag
838-
enumerateKeysAndObjectsUsingBlock:^(NSNumber* keyCode, NSNumber* flag, BOOL* stop) {
839-
FlutterKeyEvent* event;
840-
NSNumber* logicalKey;
841-
NSNumber* physicalKey;
842-
843-
// Should synthesize down event.
844-
NSEvent* mouseEvent = flutter::testing::CreateMouseEvent([flag unsignedLongValue]);
845-
[viewController mouseMoved:mouseEvent];
846-
EXPECT_EQ([events count], 1u);
847-
event = events[0].data;
848-
logicalKey = [flutter::keyCodeToLogicalKey objectForKey:keyCode];
849-
physicalKey = [flutter::keyCodeToPhysicalKey objectForKey:keyCode];
850-
EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
851-
EXPECT_EQ(event->logical, logicalKey.unsignedLongLongValue);
852-
EXPECT_EQ(event->physical, physicalKey.unsignedLongLongValue);
853-
EXPECT_EQ(event->synthesized, true);
854-
855-
// Should synthesize up event.
856-
mouseEvent = flutter::testing::CreateMouseEvent(0x00);
857-
[viewController mouseMoved:mouseEvent];
858-
EXPECT_EQ([events count], 2u);
859-
event = events[1].data;
860-
logicalKey = [flutter::keyCodeToLogicalKey objectForKey:keyCode];
861-
physicalKey = [flutter::keyCodeToPhysicalKey objectForKey:keyCode];
862-
EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
863-
EXPECT_EQ(event->logical, logicalKey.unsignedLongLongValue);
864-
EXPECT_EQ(event->physical, physicalKey.unsignedLongLongValue);
865-
EXPECT_EQ(event->synthesized, true);
866-
867-
[events removeAllObjects];
868-
}];
837+
for (NSNumber* keyCode in flutter::keyCodeToModifierFlag) {
838+
FlutterKeyEvent* event;
839+
NSNumber* logicalKey;
840+
NSNumber* physicalKey;
841+
NSNumber* flag = flutter::keyCodeToModifierFlag[keyCode];
842+
843+
// Should synthesize down event.
844+
NSEvent* mouseEvent = flutter::testing::CreateMouseEvent([flag unsignedLongValue]);
845+
[viewController mouseMoved:mouseEvent];
846+
EXPECT_EQ([events count], 1u);
847+
event = events[0].data;
848+
logicalKey = [flutter::keyCodeToLogicalKey objectForKey:keyCode];
849+
physicalKey = [flutter::keyCodeToPhysicalKey objectForKey:keyCode];
850+
EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
851+
EXPECT_EQ(event->logical, logicalKey.unsignedLongLongValue);
852+
EXPECT_EQ(event->physical, physicalKey.unsignedLongLongValue);
853+
EXPECT_EQ(event->synthesized, true);
854+
855+
// Should synthesize up event.
856+
mouseEvent = flutter::testing::CreateMouseEvent(0x00);
857+
[viewController mouseMoved:mouseEvent];
858+
EXPECT_EQ([events count], 2u);
859+
event = events[1].data;
860+
logicalKey = [flutter::keyCodeToLogicalKey objectForKey:keyCode];
861+
physicalKey = [flutter::keyCodeToPhysicalKey objectForKey:keyCode];
862+
EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
863+
EXPECT_EQ(event->logical, logicalKey.unsignedLongLongValue);
864+
EXPECT_EQ(event->physical, physicalKey.unsignedLongLongValue);
865+
EXPECT_EQ(event->synthesized, true);
866+
867+
[events removeAllObjects];
868+
};
869869

870870
return true;
871871
}

0 commit comments

Comments
 (0)