smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: combine all OSXKeyStateTests into one unittest

Browse source
This commit is contained in:
sithlord48 2025-03-30 22:36:10 -04:00 committed by Nick Bolton
parent 5355e84b63
commit 00b5c32fc9
2 changed files with 90 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
src/test/integtests/platform/OSXKeyStateTests.cpp
View file

@ -1,107 +0,0 @@
/*
* Deskflow -- mouse and keyboard sharing utility
* SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
* SPDX-FileCopyrightText: (C) 2011 Nick Bolton
* SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
*/
#include "base/Log.h"
#include "platform/OSXKeyState.h"
#include "test/mock/deskflow/MockEventQueue.h"
#include "test/mock/deskflow/MockKeyMap.h"
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#define SHIFT_ID_L kKeyShift_L
#define SHIFT_ID_R kKeyShift_R
#define SHIFT_BUTTON 57
#define A_CHAR_ID 0x00000061
#define A_CHAR_BUTTON 001
class OSXKeyStateTests : public ::testing::Test
{
public:
static bool isKeyPressed(const OSXKeyState &keyState, KeyButton button);
};
// fakeAndPoll_shift seems to always fail on osx10.6
#if __MAC_OS_X_VERSION_MIN_REQUIRED > 1060
TEST_F(OSXKeyStateTests, fakeAndPoll_shift)
{
deskflow::KeyMap keyMap;
MockEventQueue eventQueue;
OSXKeyState keyState(&eventQueue, keyMap, {"en"}, true);
keyState.updateKeyMap();
keyState.fakeKeyDown(SHIFT_ID_L, 0, 1, "en");
EXPECT_TRUE(isKeyPressed(keyState, SHIFT_BUTTON));
keyState.fakeKeyUp(1);
EXPECT_TRUE(!isKeyPressed(keyState, SHIFT_BUTTON));
keyState.fakeKeyDown(SHIFT_ID_R, 0, 2, "en");
EXPECT_TRUE(isKeyPressed(keyState, SHIFT_BUTTON));
keyState.fakeKeyUp(2);
EXPECT_TRUE(!isKeyPressed(keyState, SHIFT_BUTTON));
}
TEST_F(OSXKeyStateTests, fakeAndPoll_charKey)
{
deskflow::KeyMap keyMap;
MockEventQueue eventQueue;
OSXKeyState keyState(&eventQueue, keyMap, {"en"}, true);
keyState.updateKeyMap();
keyState.fakeKeyDown(A_CHAR_ID, 0, 1, "en");
EXPECT_TRUE(isKeyPressed(keyState, A_CHAR_BUTTON));
keyState.fakeKeyUp(1);
EXPECT_TRUE(!isKeyPressed(keyState, A_CHAR_BUTTON));
// HACK: delete the key in case it was typed into a text editor.
// we should really set focus to an invisible window.
keyState.fakeKeyDown(kKeyBackSpace, 0, 2, "en");
keyState.fakeKeyUp(2);
}
TEST_F(OSXKeyStateTests, fakeAndPoll_charKeyAndModifier)
{
deskflow::KeyMap keyMap;
MockEventQueue eventQueue;
OSXKeyState keyState(&eventQueue, keyMap, {"en"}, true);
keyState.updateKeyMap();
keyState.fakeKeyDown(A_CHAR_ID, KeyModifierShift, 1, "en");
EXPECT_TRUE(isKeyPressed(keyState, A_CHAR_BUTTON));
keyState.fakeKeyUp(1);
EXPECT_TRUE(!isKeyPressed(keyState, A_CHAR_BUTTON));
// HACK: delete the key in case it was typed into a text editor.
// we should really set focus to an invisible window.
keyState.fakeKeyDown(kKeyBackSpace, 0, 2, "en");
keyState.fakeKeyUp(2);
}
bool OSXKeyStateTests::isKeyPressed(const OSXKeyState &keyState, KeyButton button)
{
// HACK: allow os to realize key state changes.
ARCH->sleep(.2);
IKeyState::KeyButtonSet pressed;
keyState.pollPressedKeys(pressed);
IKeyState::KeyButtonSet::const_iterator it;
for (it = pressed.begin(); it != pressed.end(); ++it) {
LOG((CLOG_DEBUG "checking key %d", *it));
if (*it == button) {
return true;
}
}
return false;
}
#endif

91
src/test/unittests/platform/OSXKeyStateTests.cpp
View file

@ -5,6 +5,7 @@
* SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
*/ */
#include "base/Log.h"
#include "platform/OSXKeyState.h" #include "platform/OSXKeyState.h"
#include "test/mock/deskflow/MockEventQueue.h" #include "test/mock/deskflow/MockEventQueue.h"
#include "test/mock/deskflow/MockKeyMap.h" #include "test/mock/deskflow/MockKeyMap.h"
@ -12,7 +13,19 @@
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
TEST(OSXKeyStateTests, mapModifiersFromOSX_OSXMask_returnDeskflowMask) #define SHIFT_ID_L kKeyShift_L
#define SHIFT_ID_R kKeyShift_R
#define SHIFT_BUTTON 57
#define A_CHAR_ID 0x00000061
#define A_CHAR_BUTTON 001
class OSXKeyStateTests : public ::testing::Test
{
public:
static bool isKeyPressed(const OSXKeyState &keyState, KeyButton button);
};
TEST_F(OSXKeyStateTests, mapModifiersFromOSX_OSXMask_returnDeskflowMask)
{ {
deskflow::KeyMap keyMap; deskflow::KeyMap keyMap;
MockEventQueue eventQueue; MockEventQueue eventQueue;
@ -44,3 +57,79 @@ TEST(OSXKeyStateTests, mapModifiersFromOSX_OSXMask_returnDeskflowMask)
outMask = keyState.mapModifiersFromOSX(numMask); outMask = keyState.mapModifiersFromOSX(numMask);
EXPECT_EQ(KeyModifierNumLock, outMask); EXPECT_EQ(KeyModifierNumLock, outMask);
} }
TEST_F(OSXKeyStateTests, fakeAndPoll_shift)
{
deskflow::KeyMap keyMap;
MockEventQueue eventQueue;
OSXKeyState keyState(&eventQueue, keyMap, {"en"}, true);
keyState.updateKeyMap();
keyState.fakeKeyDown(SHIFT_ID_L, 0, 1, "en");
EXPECT_TRUE(isKeyPressed(keyState, SHIFT_BUTTON));
keyState.fakeKeyUp(1);
EXPECT_TRUE(!isKeyPressed(keyState, SHIFT_BUTTON));
keyState.fakeKeyDown(SHIFT_ID_R, 0, 2, "en");
EXPECT_TRUE(isKeyPressed(keyState, SHIFT_BUTTON));
keyState.fakeKeyUp(2);
EXPECT_TRUE(!isKeyPressed(keyState, SHIFT_BUTTON));
}
TEST_F(OSXKeyStateTests, fakeAndPoll_charKey)
{
deskflow::KeyMap keyMap;
MockEventQueue eventQueue;
OSXKeyState keyState(&eventQueue, keyMap, {"en"}, true);
keyState.updateKeyMap();
keyState.fakeKeyDown(A_CHAR_ID, 0, 1, "en");
EXPECT_TRUE(isKeyPressed(keyState, A_CHAR_BUTTON));
keyState.fakeKeyUp(1);
EXPECT_TRUE(!isKeyPressed(keyState, A_CHAR_BUTTON));
// HACK: delete the key in case it was typed into a text editor.
// we should really set focus to an invisible window.
keyState.fakeKeyDown(kKeyBackSpace, 0, 2, "en");
keyState.fakeKeyUp(2);
}
TEST_F(OSXKeyStateTests, fakeAndPoll_charKeyAndModifier)
{
deskflow::KeyMap keyMap;
MockEventQueue eventQueue;
OSXKeyState keyState(&eventQueue, keyMap, {"en"}, true);
keyState.updateKeyMap();
keyState.fakeKeyDown(A_CHAR_ID, KeyModifierShift, 1, "en");
EXPECT_TRUE(isKeyPressed(keyState, A_CHAR_BUTTON));
keyState.fakeKeyUp(1);
EXPECT_TRUE(!isKeyPressed(keyState, A_CHAR_BUTTON));
// HACK: delete the key in case it was typed into a text editor.
// we should really set focus to an invisible window.
keyState.fakeKeyDown(kKeyBackSpace, 0, 2, "en");
keyState.fakeKeyUp(2);
}
bool OSXKeyStateTests::isKeyPressed(const OSXKeyState &keyState, KeyButton button)
{
// HACK: allow os to realize key state changes.
ARCH->sleep(.2);
IKeyState::KeyButtonSet pressed;
keyState.pollPressedKeys(pressed);
IKeyState::KeyButtonSet::const_iterator it;
for (it = pressed.begin(); it != pressed.end(); ++it) {
LOG((CLOG_DEBUG "checking key %d", *it));
if (*it == button) {
return true;
}
}
return false;
}