From b62de406e25824985f3596c888be5de0718a3bca Mon Sep 17 00:00:00 2001
From: "Jerry (Xinyu Hou)" <xinyu@synergy-project.org>
Date: Wed, 8 Jun 2016 17:08:14 +0100
Subject: [PATCH] #3305 Refactor MockKeyState into a separate class

---
 .../synergy/MockKeyState.h}                   | 19 +---------------
 src/test/unittests/synergy/KeyStateTests.cpp  | 22 ++++++++++++++++---
 2 files changed, 20 insertions(+), 21 deletions(-)
 rename src/test/{unittests/synergy/KeyStateTests.h => mock/synergy/MockKeyState.h} (76%)

diff --git a/src/test/unittests/synergy/KeyStateTests.h b/src/test/mock/synergy/MockKeyState.h
similarity index 76%
rename from src/test/unittests/synergy/KeyStateTests.h
rename to src/test/mock/synergy/MockKeyState.h
index 1ab49a22..78dc3356 100644
--- a/src/test/unittests/synergy/KeyStateTests.h
+++ b/src/test/mock/synergy/MockKeyState.h
@@ -54,21 +54,4 @@ typedef ::testing::NiceMock<MockKeyState> KeyStateImpl;
 typedef UInt32 KeyID;
 
 typedef void (*ForeachKeyCallback)(
-		KeyID, SInt32 group, synergy::KeyMap::KeyItem&, void* userData);
-
-void
-stubPollPressedKeys(IKeyState::KeyButtonSet& pressedKeys);
-
-void
-assertMaskIsOne(ForeachKeyCallback cb, void* userData);
-
-const synergy::KeyMap::KeyItem*
-stubMapKey(
-	synergy::KeyMap::Keystrokes& keys, KeyID id, SInt32 group,
-	synergy::KeyMap::ModifierToKeys& activeModifiers,
-	KeyModifierMask& currentState,
-	KeyModifierMask desiredMask,
-	bool isAutoRepeat);
-
-synergy::KeyMap::Keystroke s_stubKeystroke(1, false, false);
-synergy::KeyMap::KeyItem s_stubKeyItem;
+		KeyID, SInt32 group, CKeyMap::KeyItem&, void* userData);
diff --git a/src/test/unittests/synergy/KeyStateTests.cpp b/src/test/unittests/synergy/KeyStateTests.cpp
index 1d0f6a58..b75c7b88 100644
--- a/src/test/unittests/synergy/KeyStateTests.cpp
+++ b/src/test/unittests/synergy/KeyStateTests.cpp
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/unittests/synergy/KeyStateTests.h"
-
+#include "test/mock/synergy/MockKeyState.h"
 #include "test/mock/synergy/MockEventQueue.h"
 #include "test/mock/synergy/MockKeyMap.h"
 
@@ -31,7 +30,24 @@ using ::testing::Return;
 using ::testing::ReturnRef;
 using ::testing::SaveArg;
 
-TEST(KeyStateTests, onKey_aKeyDown_keyStateOne)
+void
+stubPollPressedKeys(IKeyState::KeyButtonSet& pressedKeys);
+
+void
+assertMaskIsOne(ForeachKeyCallback cb, void* userData);
+
+const CKeyMap::KeyItem*
+stubMapKey(
+		   CKeyMap::Keystrokes& keys, KeyID id, SInt32 group,
+		   CKeyMap::ModifierToKeys& activeModifiers,
+		   KeyModifierMask& currentState,
+		   KeyModifierMask desiredMask,
+		   bool isAutoRepeat);
+
+CKeyMap::Keystroke s_stubKeystroke(1, false, false);
+CKeyMap::KeyItem s_stubKeyItem;
+
+TEST(CKeyStateTests, onKey_aKeyDown_keyStateOne)
 {
 	MockKeyMap keyMap;
 	MockEventQueue eventQueue;