Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1259)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/client/plugin/normalizing_input_filter_mac_unittest.cc

Issue 985863002: Move all protocol event matchers to test_event_matchers.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
« remoting/client/plugin/normalizing_input_filter_cros_unittest.cc ('K') | « remoting/client/plugin/normalizing_input_filter_cros_unittest.cc ('k') | remoting/client/plugin/touch_input_scaler_unittest.cc » ('j') | remoting/protocol/test_event_matchers.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/plugin/normalizing_input_filter_mac_unittest.cc
diff --git a/remoting/client/plugin/normalizing_input_filter_mac_unittest.cc b/remoting/client/plugin/normalizing_input_filter_mac_unittest.cc
index 2e645e58740c8c3300ef4277c9fab1b6dfbc5686..362bdeb37068802d49bb7a0d76c74f4c3c37b7f0 100644
--- a/remoting/client/plugin/normalizing_input_filter_mac_unittest.cc
+++ b/remoting/client/plugin/normalizing_input_filter_mac_unittest.cc
@@ -6,6 +6,7 @@
#include "remoting/proto/event.pb.h"
#include "remoting/protocol/protocol_mock_objects.h"
+#include "remoting/protocol/test_event_matchers.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -14,6 +15,7 @@ using remoting::protocol::InputStub;
using remoting::protocol::KeyEvent;
using remoting::protocol::MockInputStub;
using remoting::protocol::MouseEvent;
+using remoting::protocol::EqualsUsbEventWithNumLock;
namespace remoting {
@@ -25,20 +27,11 @@ const unsigned int kUsbLeftOption = 0x0700e2;
const unsigned int kUsbLeftCmd = 0x0700e3;
const unsigned int kUsbRightCmd = 0x0700e7;
-// A hardcoded value used to verify |lock_states| is preserved.
-static const uint32 kTestLockStates = protocol::KeyEvent::LOCK_STATES_NUMLOCK;
Wez 2015/03/12 00:13:58 And this?
Rintaro Kuroiwa 2015/03/12 18:51:27 Same as the other file.
-
-MATCHER_P2(EqualsUsbEvent, usb_keycode, pressed, "") {
- return arg.usb_keycode() == static_cast<uint32>(usb_keycode) &&
- arg.pressed() == pressed &&
- arg.lock_states() == kTestLockStates;
-}
-
KeyEvent MakeKeyEvent(uint32 keycode, bool pressed) {
KeyEvent event;
event.set_usb_keycode(keycode);
event.set_pressed(pressed);
- event.set_lock_states(kTestLockStates);
+ event.set_lock_states(KeyEvent::LOCK_STATES_NUMLOCK);
return event;
}
@@ -54,8 +47,10 @@ TEST(NormalizingInputFilterMacTest, CapsLock) {
InSequence s;
// Verifies the generated CapsLock up/down events.
- EXPECT_CALL(stub, InjectKeyEvent(EqualsUsbEvent(kUsbCapsLock, true)));
- EXPECT_CALL(stub, InjectKeyEvent(EqualsUsbEvent(kUsbCapsLock, false)));
+ EXPECT_CALL(stub,
+ InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbCapsLock, true)));
+ EXPECT_CALL(stub,
+ InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbCapsLock, false)));
}
// Injecting a CapsLock down event with NumLock on.
@@ -71,10 +66,8 @@ TEST(NormalizingInputFilterMacTest, NoInjection) {
{
InSequence s;
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent('C', true)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent('C', false)));
+ EXPECT_CALL(stub, InjectKeyEvent(EqualsUsbEventWithNumLock('C', true)));
+ EXPECT_CALL(stub, InjectKeyEvent(EqualsUsbEventWithNumLock('C', false)));
}
// C Down and C Up.
@@ -92,38 +85,30 @@ TEST(NormalizingInputFilterMacTest, CmdKey) {
InSequence s;
// Left command key.
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent(kUsbLeftCmd, true)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent('C', true)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent('C', false)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent(kUsbLeftCmd, false)));
+ EXPECT_CALL(stub,
+ InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftCmd, true)));
+ EXPECT_CALL(stub, InjectKeyEvent(EqualsUsbEventWithNumLock('C', true)));
+ EXPECT_CALL(stub, InjectKeyEvent(EqualsUsbEventWithNumLock('C', false)));
+ EXPECT_CALL(stub,
+ InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftCmd, false)));
// Right command key.
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent(kUsbRightCmd, true)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent('C', true)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent('C', false)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent(kUsbRightCmd, false)));
+ EXPECT_CALL(stub,
+ InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbRightCmd, true)));
+ EXPECT_CALL(stub, InjectKeyEvent(EqualsUsbEventWithNumLock('C', true)));
+ EXPECT_CALL(stub, InjectKeyEvent(EqualsUsbEventWithNumLock('C', false)));
+ EXPECT_CALL(stub,
+ InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbRightCmd, false)));
// More than one keys after CMD.
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent(kUsbRightCmd, true)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent('C', true)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent('V', true)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent('C', false)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent('V', false)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent(kUsbRightCmd, false)));
+ EXPECT_CALL(stub,
+ InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbRightCmd, true)));
+ EXPECT_CALL(stub, InjectKeyEvent(EqualsUsbEventWithNumLock('C', true)));
+ EXPECT_CALL(stub, InjectKeyEvent(EqualsUsbEventWithNumLock('V', true)));
+ EXPECT_CALL(stub, InjectKeyEvent(EqualsUsbEventWithNumLock('C', false)));
+ EXPECT_CALL(stub, InjectKeyEvent(EqualsUsbEventWithNumLock('V', false)));
+ EXPECT_CALL(stub,
+ InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbRightCmd, false)));
}
// Left command key.
@@ -153,24 +138,24 @@ TEST(NormalizingInputFilterMacTest, SpecialKeys) {
InSequence s;
// Command + Shift.
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent(kUsbLeftCmd, true)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent(kUsbLeftShift, true)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent(kUsbLeftCmd, false)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent(kUsbLeftShift, false)));
+ EXPECT_CALL(stub,
+ InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftCmd, true)));
+ EXPECT_CALL(stub,
+ InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftShift, true)));
+ EXPECT_CALL(stub,
+ InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftCmd, false)));
+ EXPECT_CALL(
+ stub, InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftShift, false)));
// Command + Option.
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent(kUsbLeftCmd, true)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent(kUsbLeftOption, true)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent(kUsbLeftCmd, false)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent(kUsbLeftOption, false)));
+ EXPECT_CALL(stub,
+ InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftCmd, true)));
+ EXPECT_CALL(
+ stub, InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftOption, true)));
+ EXPECT_CALL(stub,
+ InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftCmd, false)));
+ EXPECT_CALL(
+ stub, InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftOption, false)));
}
// Command + Shift.
@@ -195,16 +180,14 @@ TEST(NormalizingInputFilterMacTest, MultipleCmdKeys) {
{
InSequence s;
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent(kUsbLeftCmd, true)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent('C', true)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent(kUsbRightCmd, true)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent('C', false)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent(kUsbLeftCmd, false)));
+ EXPECT_CALL(stub,
+ InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftCmd, true)));
+ EXPECT_CALL(stub, InjectKeyEvent(EqualsUsbEventWithNumLock('C', true)));
+ EXPECT_CALL(stub,
+ InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbRightCmd, true)));
+ EXPECT_CALL(stub, InjectKeyEvent(EqualsUsbEventWithNumLock('C', false)));
+ EXPECT_CALL(stub,
+ InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftCmd, false)));
}
// Test multiple CMD keys at the same time.
@@ -224,16 +207,13 @@ TEST(NormalizingInputFilterMacTest, BeforeCmdKey) {
{
InSequence s;
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent('C', true)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent(kUsbRightCmd, true)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent('C', false)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent(kUsbRightCmd, false)));
- EXPECT_CALL(stub, InjectKeyEvent(
- EqualsUsbEvent('C', false)));
+ EXPECT_CALL(stub, InjectKeyEvent(EqualsUsbEventWithNumLock('C', true)));
+ EXPECT_CALL(stub,
+ InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbRightCmd, true)));
+ EXPECT_CALL(stub, InjectKeyEvent(EqualsUsbEventWithNumLock('C', false)));
+ EXPECT_CALL(stub,
+ InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbRightCmd, false)));
+ EXPECT_CALL(stub, InjectKeyEvent(EqualsUsbEventWithNumLock('C', false)));
}
// Press C before command key.
« remoting/client/plugin/normalizing_input_filter_cros_unittest.cc ('K') | « remoting/client/plugin/normalizing_input_filter_cros_unittest.cc ('k') | remoting/client/plugin/touch_input_scaler_unittest.cc » ('j') | remoting/protocol/test_event_matchers.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698