backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-06-10 14:16:02 +08:00
Code Issues Projects Releases Wiki Activity

- made unit testing easier by (mostly) removing the event queue singleton.

Browse Source 
- fixed code style in many places (mostly indentation).
This commit is contained in:
Nick Bolton
2013-06-29 14:17:49 +00:00
parent 13b2649fa0
commit 608074c041
143 changed files with 2220 additions and 2163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/test/integtests/platform/CMSWindowsKeyStateTests.cpp
View File

@@ -51,7 +51,7 @@ protected:
delete m_screensaver;
}
CMSWindowsDesks* newDesks(IEventQueue& eventQueue)
CMSWindowsDesks* newDesks(IEventQueue* eventQueue)
{
return new CMSWindowsDesks(
true, false, m_hookLibrary, m_screensaver, eventQueue,
@@ -74,9 +74,9 @@ private:
TEST_F(CMSWindowsKeyStateTests, disable_nonWin95OS_eventQueueNotUsed)
{
NiceMock<CMockEventQueue> eventQueue;
CMSWindowsDesks* desks = newDesks(eventQueue);
CMSWindowsDesks* desks = newDesks(&eventQueue);
CMockKeyMap keyMap;
CMSWindowsKeyState keyState(desks, getEventTarget(), eventQueue, keyMap);
CMSWindowsKeyState keyState(desks, getEventTarget(), &eventQueue, keyMap);
// in anything above win95-family, event handler should not be called.
EXPECT_CALL(eventQueue, removeHandler(_, _)).Times(0);
@@ -88,9 +88,9 @@ TEST_F(CMSWindowsKeyStateTests, disable_nonWin95OS_eventQueueNotUsed)
TEST_F(CMSWindowsKeyStateTests, testAutoRepeat_noRepeatAndButtonIsZero_resultIsTrue)
{
NiceMock<CMockEventQueue> eventQueue;
CMSWindowsDesks* desks = newDesks(eventQueue);
CMSWindowsDesks* desks = newDesks(&eventQueue);
CMockKeyMap keyMap;
CMSWindowsKeyState keyState(desks, getEventTarget(), eventQueue, keyMap);
CMSWindowsKeyState keyState(desks, getEventTarget(), &eventQueue, keyMap);
keyState.setLastDown(1);
bool actual = keyState.testAutoRepeat(true, false, 1);
@@ -102,9 +102,9 @@ TEST_F(CMSWindowsKeyStateTests, testAutoRepeat_noRepeatAndButtonIsZero_resultIsT
TEST_F(CMSWindowsKeyStateTests, testAutoRepeat_pressFalse_lastDownIsZero)
{
NiceMock<CMockEventQueue> eventQueue;
CMSWindowsDesks* desks = newDesks(eventQueue);
CMSWindowsDesks* desks = newDesks(&eventQueue);
CMockKeyMap keyMap;
CMSWindowsKeyState keyState(desks, getEventTarget(), eventQueue, keyMap);
CMSWindowsKeyState keyState(desks, getEventTarget(), &eventQueue, keyMap);
keyState.setLastDown(1);
keyState.testAutoRepeat(false, false, 1);
@@ -116,9 +116,9 @@ TEST_F(CMSWindowsKeyStateTests, testAutoRepeat_pressFalse_lastDownIsZero)
TEST_F(CMSWindowsKeyStateTests, saveModifiers_noModifiers_savedModifiers0)
{
NiceMock<CMockEventQueue> eventQueue;
CMSWindowsDesks* desks = newDesks(eventQueue);
CMSWindowsDesks* desks = newDesks(&eventQueue);
CMockKeyMap keyMap;
CMSWindowsKeyState keyState(desks, getEventTarget(), eventQueue, keyMap);
CMSWindowsKeyState keyState(desks, getEventTarget(), &eventQueue, keyMap);
keyState.saveModifiers();