Move all protocol event matchers to test_event_matchers.h

remoting/client/plugin/normalizing_input_filter_cros_unittest.cc

Index: remoting/client/plugin/normalizing_input_filter_cros_unittest.cc
diff --git a/remoting/client/plugin/normalizing_input_filter_cros_unittest.cc b/remoting/client/plugin/normalizing_input_filter_cros_unittest.cc
index 1e3e2fbd496d71efc255e82cff7a4e16ef24cc98..aabf3eeee7f5a051c56c57ccb8c2ebfd2f4fb8d9 100644
--- a/remoting/client/plugin/normalizing_input_filter_cros_unittest.cc
+++ b/remoting/client/plugin/normalizing_input_filter_cros_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"
 
@@ -17,6 +18,10 @@ using remoting::protocol::MouseEvent;
 
 namespace remoting {
 
+using protocol::EqualsMouseButtonEvent;
+using protocol::EqualsMouseMoveEvent;
+using protocol::EqualsUsbEventWithNumLock;
+
 namespace {
 
 const unsigned int kUsbLeftOsKey      = 0x0700e3;
@@ -28,20 +33,11 @@ const unsigned int kUsbFunctionKey    = 0x07003a;  // F1
 const unsigned int kUsbExtendedKey    = 0x070049;  // Insert
 const unsigned int kUsbOtherKey       = 0x07002b;  // Tab
 
-// 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]

Why remove this?

[Rintaro Kuroiwa, 2015/03/12 18:51:27]

This was used only in the matcher below and MakeKeyEvent().
I moved the matcher to the header file so only MakeKeyEvent() will use this. And
because its used only once, I replaced it with the RHS.
We haven't lost the "NumLock" part of the matcher because I suffixed the matcher
with "WithNumLock"

I could put this back in if this might get used in the future.

-
-MATCHER_P2(EqualsKeyEvent, 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(protocol::KeyEvent::LOCK_STATES_NUMLOCK);
   return event;
 }
 
@@ -50,14 +46,6 @@ void PressAndReleaseKey(InputStub* input_stub, uint32 keycode) {
   input_stub->InjectKeyEvent(MakeKeyEvent(keycode, false));
 }
 
-MATCHER_P2(EqualsMouseMoveEvent, x, y, "") {
-  return arg.x() == x && arg.y() == y;
-}
-
-MATCHER_P2(EqualsMouseButtonEvent, button, button_down, "") {
-  return arg.button() == button && arg.button_down() == button_down;
-}
-
 static MouseEvent MakeMouseMoveEvent(int x, int y) {
   MouseEvent event;
   event.set_x(x);
@@ -84,11 +72,15 @@ TEST(NormalizingInputFilterCrosTest, PressReleaseOsKey) {
   {
     InSequence s;
 
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbLeftOsKey, true)));
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbLeftOsKey, false)));
+    EXPECT_CALL(stub,
+                InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftOsKey, true)));
+    EXPECT_CALL(
+        stub, InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftOsKey, false)));
 
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbRightOsKey, true)));
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbRightOsKey, false)));
+    EXPECT_CALL(
+        stub, InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbRightOsKey, true)));
+    EXPECT_CALL(
+        stub, InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbRightOsKey, false)));
   }
 
   // Inject press & release events for left & right OSKeys.
@@ -105,9 +97,12 @@ TEST(NormalizingInputFilterCrosTest, OSKeyRepeats) {
   {
     InSequence s;
 
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbLeftOsKey, true)));
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbLeftOsKey, true)));
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbLeftOsKey, true)));
+    EXPECT_CALL(stub,
+                InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftOsKey, true)));
+    EXPECT_CALL(stub,
+                InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftOsKey, true)));
+    EXPECT_CALL(stub,
+                InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftOsKey, true)));
   }
 
   // Inject a press and repeats for the left OSKey, but don't release it, and
@@ -127,8 +122,10 @@ TEST(NormalizingInputFilterCrosTest, FunctionKey) {
   {
     InSequence s;
 
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbFunctionKey, true)));
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbFunctionKey, false)));
+    EXPECT_CALL(
+        stub, InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbFunctionKey, true)));
+    EXPECT_CALL(stub, InjectKeyEvent(
+                          EqualsUsbEventWithNumLock(kUsbFunctionKey, false)));
   }
 
   // Hold the left OSKey while pressing & releasing the function key.
@@ -147,8 +144,10 @@ TEST(NormalizingInputFilterCrosTest, ExtendedKey) {
   {
     InSequence s;
 
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbExtendedKey, true)));
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbExtendedKey, false)));
+    EXPECT_CALL(
+        stub, InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbExtendedKey, true)));
+    EXPECT_CALL(stub, InjectKeyEvent(
+                          EqualsUsbEventWithNumLock(kUsbExtendedKey, false)));
   }
 
   // Hold the left OSKey while pressing & releasing the function key.
@@ -167,10 +166,14 @@ TEST(NormalizingInputFilterCrosTest, OtherKey) {
   {
     InSequence s;
 
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbLeftOsKey, true)));
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbOtherKey, true)));
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbOtherKey, false)));
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbLeftOsKey, false)));
+    EXPECT_CALL(stub,
+                InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftOsKey, true)));
+    EXPECT_CALL(stub,
+                InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbOtherKey, true)));
+    EXPECT_CALL(stub,
+                InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbOtherKey, false)));
+    EXPECT_CALL(
+        stub, InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftOsKey, false)));
   }
 
   // Hold the left OSKey while pressing & releasing the function key.
@@ -189,12 +192,18 @@ TEST(NormalizingInputFilterCrosTest, ExtendedThenOtherKey) {
   {
     InSequence s;
 
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbExtendedKey, true)));
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbExtendedKey, false)));
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbLeftOsKey, true)));
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbOtherKey, true)));
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbOtherKey, false)));
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbLeftOsKey, false)));
+    EXPECT_CALL(
+        stub, InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbExtendedKey, true)));
+    EXPECT_CALL(stub, InjectKeyEvent(
+                          EqualsUsbEventWithNumLock(kUsbExtendedKey, false)));
+    EXPECT_CALL(stub,
+                InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftOsKey, true)));
+    EXPECT_CALL(stub,
+                InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbOtherKey, true)));
+    EXPECT_CALL(stub,
+                InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbOtherKey, false)));
+    EXPECT_CALL(
+        stub, InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftOsKey, false)));
   }
 
   // Hold the left OSKey while pressing & releasing the function key.
@@ -213,9 +222,11 @@ TEST(NormalizingInputFilterCrosTest, MouseEvent) {
   {
     InSequence s;
 
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbLeftOsKey, true)));
+    EXPECT_CALL(stub,
+                InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftOsKey, true)));
     EXPECT_CALL(stub, InjectMouseEvent(EqualsMouseMoveEvent(0, 0)));
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbLeftOsKey, false)));
+    EXPECT_CALL(
+        stub, InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftOsKey, false)));
   }
 
   // Hold the left OSKey while pressing & releasing the function key.
@@ -233,12 +244,14 @@ TEST(NormalizingInputFilterCrosTest, LeftAltClick) {
   {
     InSequence s;
 
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbLeftAltKey, true)));
-    EXPECT_CALL(stub, InjectMouseEvent(
-        EqualsMouseButtonEvent(MouseEvent::BUTTON_LEFT, true)));
-    EXPECT_CALL(stub, InjectMouseEvent(
-        EqualsMouseButtonEvent(MouseEvent::BUTTON_LEFT, false)));
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbLeftAltKey, false)));
+    EXPECT_CALL(
+        stub, InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftAltKey, true)));
+    EXPECT_CALL(stub, InjectMouseEvent(EqualsMouseButtonEvent(
+                          MouseEvent::BUTTON_LEFT, true)));
+    EXPECT_CALL(stub, InjectMouseEvent(EqualsMouseButtonEvent(
+                          MouseEvent::BUTTON_LEFT, false)));
+    EXPECT_CALL(
+        stub, InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbLeftAltKey, false)));
   }
 
   // Hold the left alt key while left-clicking. ChromeOS will rewrite this as
@@ -260,12 +273,14 @@ TEST(NormalizingInputFilterCrosTest, RightAltClick) {
   {
     InSequence s;
 
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbRightAltKey, true)));
-    EXPECT_CALL(stub, InjectMouseEvent(
-        EqualsMouseButtonEvent(MouseEvent::BUTTON_RIGHT, true)));
-    EXPECT_CALL(stub, InjectMouseEvent(
-        EqualsMouseButtonEvent(MouseEvent::BUTTON_RIGHT, false)));
-    EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEvent(kUsbRightAltKey, false)));
+    EXPECT_CALL(
+        stub, InjectKeyEvent(EqualsUsbEventWithNumLock(kUsbRightAltKey, true)));
+    EXPECT_CALL(stub, InjectMouseEvent(EqualsMouseButtonEvent(
+                          MouseEvent::BUTTON_RIGHT, true)));
+    EXPECT_CALL(stub, InjectMouseEvent(EqualsMouseButtonEvent(
+                          MouseEvent::BUTTON_RIGHT, false)));
+    EXPECT_CALL(stub, InjectKeyEvent(
+                          EqualsUsbEventWithNumLock(kUsbRightAltKey, false)));
   }
 
   // Hold the right alt key while left-clicking. ChromeOS will rewrite this as