diff options
| author | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-26 01:55:52 +0000 |
|---|---|---|
| committer | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-26 01:55:52 +0000 |
| commit | b67fb930ca28a39b12cb40c769321df52cd0ddae (patch) | |
| tree | ae6122a7f0c3e5e10cd1bb58b73e0375ff9c833e /remoting/host/client_session_unittest.cc | |
| parent | 79e1409f81bf5ce29f69acfaae15f0ff057cb321 (diff) | |
| download | chromium_src-b67fb930ca28a39b12cb40c769321df52cd0ddae.zip chromium_src-b67fb930ca28a39b12cb40c769321df52cd0ddae.tar.gz chromium_src-b67fb930ca28a39b12cb40c769321df52cd0ddae.tar.bz2 | |
Chromoting: Undo any mouse-downs that haven't been mouse-upped.
BUG=97466
TEST=manual
Review URL: http://codereview.chromium.org/7973016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102687 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/client_session_unittest.cc')
| -rw-r--r-- | remoting/host/client_session_unittest.cc | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/remoting/host/client_session_unittest.cc b/remoting/host/client_session_unittest.cc index 1734709..cd621e8 100644 --- a/remoting/host/client_session_unittest.cc +++ b/remoting/host/client_session_unittest.cc @@ -81,6 +81,10 @@ MATCHER_P2(EqualsMouseEvent, x, y, "") { return arg.x() == x && arg.y() == y; } +MATCHER_P(EqualsMouseUpEvent, button, "") { + return arg.button() == button && !arg.button_down(); +} + TEST_F(ClientSessionTest, InputStubFilter) { protocol::KeyEvent key_event1; key_event1.set_pressed(true); @@ -178,7 +182,7 @@ TEST_F(ClientSessionTest, LocalInputTest) { client_session_->OnDisconnected(); } -TEST_F(ClientSessionTest, UnpressKeys) { +TEST_F(ClientSessionTest, RestoreEventState) { protocol::KeyEvent key1; key1.set_pressed(true); key1.set_keycode(1); @@ -187,13 +191,20 @@ TEST_F(ClientSessionTest, UnpressKeys) { key2.set_pressed(true); key2.set_keycode(2); + protocol::MouseEvent mousedown; + mousedown.set_button(protocol::MouseEvent::BUTTON_LEFT); + mousedown.set_button_down(true); + client_session_->RecordKeyEvent(key1); client_session_->RecordKeyEvent(key2); + client_session_->RecordMouseButtonState(mousedown); EXPECT_CALL(input_stub_, InjectKeyEvent(EqualsKeyEvent(1, false))); EXPECT_CALL(input_stub_, InjectKeyEvent(EqualsKeyEvent(2, false))); + EXPECT_CALL(input_stub_, InjectMouseEvent(EqualsMouseUpEvent( + protocol::MouseEvent::BUTTON_LEFT))); - client_session_->UnpressKeys(); + client_session_->RestoreEventState(); } TEST_F(ClientSessionTest, ClampMouseEvents) { |