Skip to content

Commit

Permalink
Rolls clang forward
Browse files Browse the repository at this point in the history
  • Loading branch information
@zanderso
zanderso committed Dec 19, 2023
1 parent 2759fa3 commit 3646b37
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 1 deletion.
2 changes: 1 addition & 1 deletion DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ vars = {
# updates to Clang Tidy will not turn the tree red.
#
# See https://github.com/flutter/flutter/wiki/Engine-pre‐submits-and-post‐submits#post-submit
'clang_version': 'git_revision:00396e6a1a0b79fda008cb4e86b616d7952b33c8',
'clang_version': 'git_revision:725656bdd885483c39f482a01ea25d67acf39c46',

# The goma version and the clang version can be tightly coupled. If goma
# stops working on a clang roll, this may need to be updated using the value
Expand Down
39 changes: 39 additions & 0 deletions shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponderTest.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ - (void)testBasicKeyEvent API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->timestamp, 123000000.0f);
Expand All @@ -169,6 +170,7 @@ - (void)testBasicKeyEvent API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->timestamp, 123000000.0f);
Expand Down Expand Up @@ -208,6 +210,7 @@ - (void)testIosKeyPlane API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kKeyCodeEject | kIosPlane);
Expand All @@ -230,6 +233,7 @@ - (void)testIosKeyPlane API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kKeyCodeEject | kIosPlane);
Expand Down Expand Up @@ -265,6 +269,7 @@ - (void)testOutOfOrderModifiers API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalAltRight);
Expand All @@ -281,6 +286,7 @@ - (void)testOutOfOrderModifiers API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalKeyW);
Expand All @@ -298,6 +304,7 @@ - (void)testOutOfOrderModifiers API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalAltRight);
Expand All @@ -318,6 +325,7 @@ - (void)testOutOfOrderModifiers API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalKeyW);
Expand All @@ -335,6 +343,7 @@ - (void)testOutOfOrderModifiers API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalKeyA);
Expand Down Expand Up @@ -364,6 +373,7 @@ - (void)testIgnoreDuplicateDownEvent API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalKeyA);
Expand All @@ -384,6 +394,7 @@ - (void)testIgnoreDuplicateDownEvent API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->physical, 0ull);
XCTAssertEqual(event->logical, 0ull);
XCTAssertEqual(event->synthesized, false);
Expand All @@ -400,6 +411,7 @@ - (void)testIgnoreDuplicateDownEvent API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalKeyA);
Expand Down Expand Up @@ -434,6 +446,7 @@ - (void)testIgnoreAbruptUpEvent API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->physical, 0ull);
XCTAssertEqual(event->logical, 0ull);
XCTAssertEqual(event->synthesized, false);
Expand Down Expand Up @@ -466,6 +479,7 @@ - (void)testToggleModifiersDuringKeyTap API_AVAILABLE(ios(13.4)) {
XCTAssertEqual([events count], 1u);

event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->timestamp, 123000000.0f);
Expand All @@ -483,6 +497,7 @@ - (void)testToggleModifiersDuringKeyTap API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalKeyA);
Expand All @@ -499,6 +514,7 @@ - (void)testToggleModifiersDuringKeyTap API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalShiftRight);
Expand All @@ -515,6 +531,7 @@ - (void)testToggleModifiersDuringKeyTap API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalKeyA);
Expand Down Expand Up @@ -557,6 +574,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalNumpad1);
Expand All @@ -574,6 +592,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalKeyUndefined);
Expand All @@ -591,6 +610,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalF1);
Expand All @@ -608,6 +628,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalKeyA);
Expand All @@ -625,6 +646,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalShiftLeft);
Expand All @@ -644,6 +666,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {
// Because the OS no longer provides the 0x20000 (kModifierFlagShiftAny), we
// have to simulate a keyup.
event = [events firstObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalShiftLeft);
Expand All @@ -652,6 +675,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {
XCTAssertEqual(event->synthesized, true);

event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalNumpad1);
Expand All @@ -669,6 +693,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalF1);
Expand All @@ -686,6 +711,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalKeyUndefined);
Expand All @@ -702,6 +728,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalKeyA);
Expand All @@ -719,6 +746,7 @@ - (void)testSpecialModiferFlags API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->physical, 0ull);
XCTAssertEqual(event->logical, 0ull);
XCTAssertEqual(event->synthesized, false);
Expand Down Expand Up @@ -746,6 +774,7 @@ - (void)testIdentifyLeftAndRightModifiers API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalShiftLeft);
Expand All @@ -762,6 +791,7 @@ - (void)testIdentifyLeftAndRightModifiers API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalShiftRight);
Expand All @@ -778,6 +808,7 @@ - (void)testIdentifyLeftAndRightModifiers API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalShiftLeft);
Expand All @@ -794,6 +825,7 @@ - (void)testIdentifyLeftAndRightModifiers API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalShiftRight);
Expand Down Expand Up @@ -829,6 +861,7 @@ - (void)testSynchronizeCapsLockStateOnCapsLock API_AVAILABLE(ios(13.4)) {
XCTAssertEqual([events count], 3u);

event = events[0].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalCapsLock);
Expand All @@ -838,6 +871,7 @@ - (void)testSynchronizeCapsLockStateOnCapsLock API_AVAILABLE(ios(13.4)) {
XCTAssertFalse([events[0] hasCallback]);

event = events[1].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalCapsLock);
Expand All @@ -847,6 +881,7 @@ - (void)testSynchronizeCapsLockStateOnCapsLock API_AVAILABLE(ios(13.4)) {
XCTAssertFalse([events[1] hasCallback]);

event = events[2].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalKeyA);
Expand All @@ -866,6 +901,7 @@ - (void)testSynchronizeCapsLockStateOnCapsLock API_AVAILABLE(ios(13.4)) {
callback:keyEventCallback];
XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalKeyA);
Expand All @@ -882,6 +918,7 @@ - (void)testSynchronizeCapsLockStateOnCapsLock API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events firstObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalCapsLock);
Expand All @@ -902,6 +939,7 @@ - (void)testSynchronizeCapsLockStateOnCapsLock API_AVAILABLE(ios(13.4)) {

XCTAssertEqual([events count], 1u);
event = [events firstObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalCapsLock);
Expand All @@ -920,6 +958,7 @@ - (void)testSynchronizeCapsLockStateOnCapsLock API_AVAILABLE(ios(13.4)) {
// consistent, and should be off.
XCTAssertEqual([events count], 1u);
event = [events lastObject].data;
XCTAssertNotEqual(event, nullptr);
XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
XCTAssertEqual(event->physical, kPhysicalKeyA);
Expand Down

0 comments on commit 3646b37

Please sign in to comment.