chrome/browser/chromeos/input_method/input_method_engine_ibus_browserttests.cc - Issue 45733008: sk6_charactercomposer: Merged DispatchKeyEvent and its fabricated version.

Unified Diff: chrome/browser/chromeos/input_method/input_method_engine_ibus_browserttests.cc

Issue 45733008: sk6_charactercomposer: Merged DispatchKeyEvent and its fabricated version. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/chromeos/input_method/input_method_engine_ibus_browserttests.cc

diff --git a/chrome/browser/chromeos/input_method/input_method_engine_ibus_browserttests.cc b/chrome/browser/chromeos/input_method/input_method_engine_ibus_browserttests.cc

index 4d7bde7962617da74e37fbd452208742e920c60e..1de4ff3768e6c9fa1348a25c944f1fe15a177328 100644

--- a/chrome/browser/chromeos/input_method/input_method_engine_ibus_browserttests.cc

+++ b/chrome/browser/chromeos/input_method/input_method_engine_ibus_browserttests.cc

@@ -29,11 +29,6 @@ const char kToUpperIMEID[] =

const char kAPIArgumentIMEID[] =

"_ext_ime_iafoklpfplgfnoimmaejoeondnjnlcfpAPIArgumentIME";

-const uint32 kAltKeyMask = 1 << 3;

-const uint32 kCtrlKeyMask = 1 << 2;

-const uint32 kShiftKeyMask = 1 << 0;

-const uint32 kCapsLockMask = 1 << 1;

// InputMethod extension should work on 1)normal extension, 2)normal extension

// in incognito mode 3)component extension.

enum TestType {

@@ -189,11 +184,23 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineIBusBrowserTest,

// onKeyEvent should be fired if ProcessKeyEvent is called.

KeyEventDoneCallback callback(false); // EchoBackIME doesn't consume keys.

ExtensionTestMessageListener keyevent_listener("onKeyEvent", false);

+ /*

engine_handler->ProcessKeyEvent(0x61, // KeySym for 'a'.

0x26, // KeyCode for 'a'.

0, // No modifiers.

base::Bind(&KeyEventDoneCallback::Run,

base::Unretained(&callback)));

+ */

+ engine_handler->ProcessKeyEvent("a", // KeySym

+ "KeyA", // KeyCode for 'a'

+ true, // is_key_down

+ false, // is_alt_down

+ false, // is_ctrl_down

+ false, // is_shift_down

+ false, // is_caps_lock_down

+ base::Bind(&KeyEventDoneCallback::Run,

+ base::Unretained(&callback)));

ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied());

ASSERT_TRUE(keyevent_listener.was_satisfied());

callback.WaitUntilCalled();

@@ -272,9 +279,13 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineIBusBrowserTest,

"onKeyEvent:keydown:a:KeyA:false:false:false:false";

ExtensionTestMessageListener keyevent_listener(expected_value, false);

- engine_handler->ProcessKeyEvent(0x61, // KeySym for 'a'.

- 0x26, // KeyCode for 'a'.

- 0, // No modifiers.

+ engine_handler->ProcessKeyEvent("a", // KeySym

+ "KeyA", // KeyCode for 'a'

+ true, // is_key_down

+ false, // is_alt_down

+ false, // is_ctrl_down

+ false, // is_shift_down

+ false, // is_caps_lock_down

base::Bind(&KeyEventDoneCallback::Run,

base::Unretained(&callback)));

ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied());

@@ -288,9 +299,13 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineIBusBrowserTest,

"onKeyEvent:keydown:a:KeyA:true:false:false:false";

ExtensionTestMessageListener keyevent_listener(expected_value, false);

- engine_handler->ProcessKeyEvent(0x61, // KeySym for 'a'.

- 0x26, // KeyCode for 'a'.

- kCtrlKeyMask,

+ engine_handler->ProcessKeyEvent("a", // KeySym

+ "KeyA", // KeyCode for 'a'

+ true, // is_key_down

+ false, // is_alt_down

+ true, // is_ctrl_down

+ false, // is_shift_down

+ false, // is_caps_lock_down

base::Bind(&KeyEventDoneCallback::Run,

base::Unretained(&callback)));

ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied());

@@ -304,9 +319,13 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineIBusBrowserTest,

"onKeyEvent:keydown:a:KeyA:false:true:false:false";

ExtensionTestMessageListener keyevent_listener(expected_value, false);

- engine_handler->ProcessKeyEvent(0x61, // KeySym for 'a'.

- 0x26, // KeyCode for 'a'.

- kAltKeyMask,

+ engine_handler->ProcessKeyEvent("a", // KeySym

+ "KeyA", // KeyCode for 'a'

+ true, // is_key_down

+ true, // is_alt_down

+ false, // is_ctrl_down

+ false, // is_shift_down

+ false, // is_caps_lock_down

base::Bind(&KeyEventDoneCallback::Run,

base::Unretained(&callback)));

ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied());

@@ -320,9 +339,13 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineIBusBrowserTest,

"onKeyEvent:keydown:a:KeyA:false:false:true:false";

ExtensionTestMessageListener keyevent_listener(expected_value, false);

- engine_handler->ProcessKeyEvent(0x61, // KeySym for 'a'.

- 0x26, // KeyCode for 'a'.

- kShiftKeyMask,

+ engine_handler->ProcessKeyEvent("a", // KeySym

+ "KeyA", // KeyCode for 'a'

+ true, // is_key_down

+ false, // is_alt_down

+ false, // is_ctrl_down

+ true, // is_shift_down

+ false, // is_caps_lock_down

base::Bind(&KeyEventDoneCallback::Run,

base::Unretained(&callback)));

ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied());

@@ -336,9 +359,13 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineIBusBrowserTest,

"onKeyEvent:keydown:a:KeyA:false:false:false:true";

ExtensionTestMessageListener keyevent_listener(expected_value, false);

- engine_handler->ProcessKeyEvent(0x61, // KeySym for 'a'.

- 0x26, // KeyCode for 'a'.

- kCapsLockMask,

+ engine_handler->ProcessKeyEvent("a", // KeySym

+ "KeyA", // KeyCode for 'a'

+ true, // is_key_down

+ false, // is_alt_down

+ false, // is_ctrl_down

+ false, // is_shift_down

+ true, // is_caps_lock_down

base::Bind(&KeyEventDoneCallback::Run,

base::Unretained(&callback)));

ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied());

@@ -352,9 +379,13 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineIBusBrowserTest,

"onKeyEvent:keydown:a:KeyA:true:true:false:false";

ExtensionTestMessageListener keyevent_listener(expected_value, false);

- engine_handler->ProcessKeyEvent(0x61, // KeySym for 'a'.

- 0x26, // KeyCode for 'a'.

- kAltKeyMask | kCtrlKeyMask,

+ engine_handler->ProcessKeyEvent("a", // KeySym

+ "KeyA", // KeyCode for 'a'

+ true, // is_key_down

+ true, // is_alt_down

+ true, // is_ctrl_down

+ false, // is_shift_down

+ false, // is_caps_lock_down

base::Bind(&KeyEventDoneCallback::Run,

base::Unretained(&callback)));

ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied());

@@ -368,9 +399,13 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineIBusBrowserTest,

"onKeyEvent:keydown:a:KeyA:false:false:true:true";

ExtensionTestMessageListener keyevent_listener(expected_value, false);

- engine_handler->ProcessKeyEvent(0x61, // KeySym for 'a'.

- 0x26, // KeyCode for 'a'.

- kShiftKeyMask | kCapsLockMask,

+ engine_handler->ProcessKeyEvent("a", // KeySym

+ "KeyA", // KeyCode for 'a'

+ true, // is_key_down

+ false, // is_alt_down

+ false, // is_ctrl_down

+ true, // is_shift_down

+ true, // is_caps_lock_down

base::Bind(&KeyEventDoneCallback::Run,

base::Unretained(&callback)));

ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied());

« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_engine_ibus.cc ('k') | chromeos/ime/ibus_bridge.h » ('j') | no next file with comments »