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

Replace usage of an integer for GdkModifierType #50481

Merged
merged 1 commit into from
Feb 12, 2024
Merged

Replace usage of an integer for GdkModifierType #50481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions shell/platform/linux/fl_key_channel_responder_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ static FlKeyEvent* fl_key_event_new_by_mock(guint32 time_in_milliseconds,
bool is_press,
guint keyval,
guint16 keycode,
int state,
GdkModifierType state,
gboolean is_modifier) {
_g_key_event.is_press = is_press;
_g_key_event.time = time_in_milliseconds;
Expand All @@ -72,7 +72,8 @@ TEST(FlKeyChannelResponderTest, SendKeyEvent) {

fl_key_responder_handle_event(
responder,
fl_key_event_new_by_mock(12345, true, GDK_KEY_A, 0x04, 0x0, false),
fl_key_event_new_by_mock(12345, true, GDK_KEY_A, 0x04,
static_cast<GdkModifierType>(0), false),
responder_callback, loop);
expected_value =
"{type: keydown, keymap: linux, scanCode: 4, toolkit: gtk, keyCode: 65, "
Expand All @@ -84,7 +85,8 @@ TEST(FlKeyChannelResponderTest, SendKeyEvent) {

fl_key_responder_handle_event(
responder,
fl_key_event_new_by_mock(23456, false, GDK_KEY_A, 0x04, 0x0, false),
fl_key_event_new_by_mock(23456, false, GDK_KEY_A, 0x04,
static_cast<GdkModifierType>(0), false),
responder_callback, loop);
expected_value =
"{type: keyup, keymap: linux, scanCode: 4, toolkit: gtk, keyCode: 65, "
Expand All @@ -111,7 +113,8 @@ void test_lock_event(guint key_code,

fl_key_responder_handle_event(
responder,
fl_key_event_new_by_mock(12345, true, key_code, 0x04, 0x0, false),
fl_key_event_new_by_mock(12345, true, key_code, 0x04,
static_cast<GdkModifierType>(0), false),
responder_callback, loop);
expected_value = down_expected;
expected_handled = FALSE;
Expand All @@ -123,7 +126,8 @@ void test_lock_event(guint key_code,
expected_handled = FALSE;
fl_key_responder_handle_event(
responder,
fl_key_event_new_by_mock(12346, false, key_code, 0x04, 0x0, false),
fl_key_event_new_by_mock(12346, false, key_code, 0x04,
static_cast<GdkModifierType>(0), false),
responder_callback, loop);

// Blocks here until echo_response_cb is called.
Expand Down Expand Up @@ -171,7 +175,8 @@ TEST(FlKeyChannelResponderTest, TestKeyEventHandledByFramework) {

fl_key_responder_handle_event(
responder,
fl_key_event_new_by_mock(12345, true, GDK_KEY_A, 0x04, 0x0, false),
fl_key_event_new_by_mock(12345, true, GDK_KEY_A, 0x04,
static_cast<GdkModifierType>(0), false),
responder_callback, loop);
expected_handled = TRUE;
expected_value =
Expand All @@ -196,7 +201,8 @@ TEST(FlKeyChannelResponderTest, UseSpecifiedLogicalKey) {

fl_key_responder_handle_event(
responder,
fl_key_event_new_by_mock(12345, true, GDK_KEY_A, 0x04, 0x0, false),
fl_key_event_new_by_mock(12345, true, GDK_KEY_A, 0x04,
static_cast<GdkModifierType>(0), false),
responder_callback, loop, 888);
expected_handled = TRUE;
expected_value =
Expand Down
Loading