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

dropped "c" prefix from class names

Browse Source
This commit is contained in:
Nick Bolton
2014-11-11 13:51:47 +00:00
parent f6c05e7635
commit e8e156f0e2
382 changed files with 7430 additions and 7423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/integtests/platform/MSWindowsClipboardTests.cpp
View File

@@ -89,7 +89,7 @@ TEST_F(CMSWindowsClipboardTests, add_newValue_valueWasStored)
clipboard.add(IClipboard::kText, "synergy rocks!");
CString actual = clipboard.get(IClipboard::kText);
String actual = clipboard.get(IClipboard::kText);
EXPECT_EQ("synergy rocks!", actual);
}
@@ -113,7 +113,7 @@ TEST_F(CMSWindowsClipboardTests, add_replaceValue_valueWasReplaced)
clipboard.add(IClipboard::kText, "synergy rocks!");
clipboard.add(IClipboard::kText, "maxivista sucks"); // haha, just kidding.
CString actual = clipboard.get(IClipboard::kText);
String actual = clipboard.get(IClipboard::kText);
EXPECT_EQ("maxivista sucks", actual);
}
@@ -154,7 +154,7 @@ TEST_F(CMSWindowsClipboardTests, close_isOpen_noErrors)
CMSWindowsClipboard::Time actual = clipboard.getTime();
// this behavior is different to that of CClipboard which only
// this behavior is different to that of Clipboard which only
// returns the value passed into open(t) after empty() is called.
EXPECT_EQ(1, actual);
}*/
@@ -201,7 +201,7 @@ TEST_F(CMSWindowsClipboardTests, get_withNoFormats_returnsEmpty)
clipboard.open(0);
clipboard.empty();
CString actual = clipboard.get(IClipboard::kText);
String actual = clipboard.get(IClipboard::kText);
EXPECT_EQ("", actual);
}
@@ -213,7 +213,7 @@ TEST_F(CMSWindowsClipboardTests, get_withFormatAdded_returnsExpected)
clipboard.empty();
clipboard.add(IClipboard::kText, "synergy rocks!");
CString actual = clipboard.get(IClipboard::kText);
String actual = clipboard.get(IClipboard::kText);
EXPECT_EQ("synergy rocks!", actual);
}

16
src/test/integtests/platform/MSWindowsKeyStateTests.cpp
View File

@@ -70,9 +70,9 @@ private:
TEST_F(CMSWindowsKeyStateTests, disable_eventQueueNotUsed)
{
NiceMock<CMockEventQueue> eventQueue;
NiceMock<MockEventQueue> eventQueue;
CMSWindowsDesks* desks = newDesks(&eventQueue);
CMockKeyMap keyMap;
MockKeyMap keyMap;
CMSWindowsKeyState keyState(desks, getEventTarget(), &eventQueue, keyMap);
EXPECT_CALL(eventQueue, removeHandler(_, _)).Times(0);
@@ -83,9 +83,9 @@ TEST_F(CMSWindowsKeyStateTests, disable_eventQueueNotUsed)
TEST_F(CMSWindowsKeyStateTests, testAutoRepeat_noRepeatAndButtonIsZero_resultIsTrue)
{
NiceMock<CMockEventQueue> eventQueue;
NiceMock<MockEventQueue> eventQueue;
CMSWindowsDesks* desks = newDesks(&eventQueue);
CMockKeyMap keyMap;
MockKeyMap keyMap;
CMSWindowsKeyState keyState(desks, getEventTarget(), &eventQueue, keyMap);
keyState.setLastDown(1);
@@ -97,9 +97,9 @@ TEST_F(CMSWindowsKeyStateTests, testAutoRepeat_noRepeatAndButtonIsZero_resultIsT
TEST_F(CMSWindowsKeyStateTests, testAutoRepeat_pressFalse_lastDownIsZero)
{
NiceMock<CMockEventQueue> eventQueue;
NiceMock<MockEventQueue> eventQueue;
CMSWindowsDesks* desks = newDesks(&eventQueue);
CMockKeyMap keyMap;
MockKeyMap keyMap;
CMSWindowsKeyState keyState(desks, getEventTarget(), &eventQueue, keyMap);
keyState.setLastDown(1);
@@ -111,9 +111,9 @@ TEST_F(CMSWindowsKeyStateTests, testAutoRepeat_pressFalse_lastDownIsZero)
TEST_F(CMSWindowsKeyStateTests, saveModifiers_noModifiers_savedModifiers0)
{
NiceMock<CMockEventQueue> eventQueue;
NiceMock<MockEventQueue> eventQueue;
CMSWindowsDesks* desks = newDesks(&eventQueue);
CMockKeyMap keyMap;
MockKeyMap keyMap;
CMSWindowsKeyState keyState(desks, getEventTarget(), &eventQueue, keyMap);
keyState.saveModifiers();

70
src/test/integtests/platform/OSXClipboardTests.cpp
View File

@@ -21,9 +21,9 @@
#include "test/global/gtest.h"
#include <iostream>
TEST(COSXClipboardTests, empty_openCalled_returnsTrue)
TEST(OSXClipboardTests, empty_openCalled_returnsTrue)
{
COSXClipboard clipboard;
OSXClipboard clipboard;
clipboard.open(0);
bool actual = clipboard.empty();
@@ -31,62 +31,62 @@ TEST(COSXClipboardTests, empty_openCalled_returnsTrue)
EXPECT_EQ(true, actual);
}
TEST(COSXClipboardTests, empty_singleFormat_hasReturnsFalse)
TEST(OSXClipboardTests, empty_singleFormat_hasReturnsFalse)
{
COSXClipboard clipboard;
OSXClipboard clipboard;
clipboard.open(0);
clipboard.add(COSXClipboard::kText, "synergy rocks!");
clipboard.add(OSXClipboard::kText, "synergy rocks!");
clipboard.empty();
bool actual = clipboard.has(COSXClipboard::kText);
bool actual = clipboard.has(OSXClipboard::kText);
EXPECT_EQ(false, actual);
}
TEST(COSXClipboardTests, add_newValue_valueWasStored)
TEST(OSXClipboardTests, add_newValue_valueWasStored)
{
COSXClipboard clipboard;
OSXClipboard clipboard;
clipboard.open(0);
clipboard.add(IClipboard::kText, "synergy rocks!");
CString actual = clipboard.get(IClipboard::kText);
String actual = clipboard.get(IClipboard::kText);
EXPECT_EQ("synergy rocks!", actual);
}
TEST(COSXClipboardTests, add_replaceValue_valueWasReplaced)
TEST(OSXClipboardTests, add_replaceValue_valueWasReplaced)
{
COSXClipboard clipboard;
OSXClipboard clipboard;
clipboard.open(0);
clipboard.add(IClipboard::kText, "synergy rocks!");
clipboard.add(IClipboard::kText, "maxivista sucks"); // haha, just kidding.
CString actual = clipboard.get(IClipboard::kText);
String actual = clipboard.get(IClipboard::kText);
EXPECT_EQ("maxivista sucks", actual);
}
TEST(COSXClipboardTests, open_timeIsZero_returnsTrue)
TEST(OSXClipboardTests, open_timeIsZero_returnsTrue)
{
COSXClipboard clipboard;
OSXClipboard clipboard;
bool actual = clipboard.open(0);
EXPECT_EQ(true, actual);
}
TEST(COSXClipboardTests, open_timeIsOne_returnsTrue)
TEST(OSXClipboardTests, open_timeIsOne_returnsTrue)
{
COSXClipboard clipboard;
OSXClipboard clipboard;
bool actual = clipboard.open(1);
EXPECT_EQ(true, actual);
}
TEST(COSXClipboardTests, close_isOpen_noErrors)
TEST(OSXClipboardTests, close_isOpen_noErrors)
{
COSXClipboard clipboard;
OSXClipboard clipboard;
clipboard.open(0);
clipboard.close();
@@ -94,32 +94,32 @@ TEST(COSXClipboardTests, close_isOpen_noErrors)
// can't assert anything
}
TEST(COSXClipboardTests, getTime_openWithNoEmpty_returnsOne)
TEST(OSXClipboardTests, getTime_openWithNoEmpty_returnsOne)
{
COSXClipboard clipboard;
OSXClipboard clipboard;
clipboard.open(1);
COSXClipboard::Time actual = clipboard.getTime();
OSXClipboard::Time actual = clipboard.getTime();
// this behavior is different to that of CClipboard which only
// this behavior is different to that of Clipboard which only
// returns the value passed into open(t) after empty() is called.
EXPECT_EQ((UInt32)1, actual);
}
TEST(COSXClipboardTests, getTime_openAndEmpty_returnsOne)
TEST(OSXClipboardTests, getTime_openAndEmpty_returnsOne)
{
COSXClipboard clipboard;
OSXClipboard clipboard;
clipboard.open(1);
clipboard.empty();
COSXClipboard::Time actual = clipboard.getTime();
OSXClipboard::Time actual = clipboard.getTime();
EXPECT_EQ((UInt32)1, actual);
}
TEST(COSXClipboardTests, has_withFormatAdded_returnsTrue)
TEST(OSXClipboardTests, has_withFormatAdded_returnsTrue)
{
COSXClipboard clipboard;
OSXClipboard clipboard;
clipboard.open(0);
clipboard.empty();
clipboard.add(IClipboard::kText, "synergy rocks!");
@@ -129,9 +129,9 @@ TEST(COSXClipboardTests, has_withFormatAdded_returnsTrue)
EXPECT_EQ(true, actual);
}
TEST(COSXClipboardTests, has_withNoFormats_returnsFalse)
TEST(OSXClipboardTests, has_withNoFormats_returnsFalse)
{
COSXClipboard clipboard;
OSXClipboard clipboard;
clipboard.open(0);
clipboard.empty();
@@ -140,25 +140,25 @@ TEST(COSXClipboardTests, has_withNoFormats_returnsFalse)
EXPECT_EQ(false, actual);
}
TEST(COSXClipboardTests, get_withNoFormats_returnsEmpty)
TEST(OSXClipboardTests, get_withNoFormats_returnsEmpty)
{
COSXClipboard clipboard;
OSXClipboard clipboard;
clipboard.open(0);
clipboard.empty();
CString actual = clipboard.get(IClipboard::kText);
String actual = clipboard.get(IClipboard::kText);
EXPECT_EQ("", actual);
}
TEST(COSXClipboardTests, get_withFormatAdded_returnsExpected)
TEST(OSXClipboardTests, get_withFormatAdded_returnsExpected)
{
COSXClipboard clipboard;
OSXClipboard clipboard;
clipboard.open(0);
clipboard.empty();
clipboard.add(IClipboard::kText, "synergy rocks!");
CString actual = clipboard.get(IClipboard::kText);
String actual = clipboard.get(IClipboard::kText);
EXPECT_EQ("synergy rocks!", actual);
}

30
src/test/integtests/platform/OSXKeyStateTests.cpp
View File

@@ -30,19 +30,19 @@
#define A_CHAR_ID 0x00000061
#define A_CHAR_BUTTON 001
class COSXKeyStateTests : public ::testing::Test {
class OSXKeyStateTests : public ::testing::Test {
public:
static bool isKeyPressed(const COSXKeyState& keyState, KeyButton button);
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(COSXKeyStateTests, fakeAndPoll_shift)
TEST_F(OSXKeyStateTests, fakeAndPoll_shift)
{
CKeyMap keyMap;
CMockEventQueue eventQueue;
COSXKeyState keyState(&eventQueue, keyMap);
synergy::KeyMap keyMap;
MockEventQueue eventQueue;
OSXKeyState keyState(&eventQueue, keyMap);
keyState.updateKeyMap();
keyState.fakeKeyDown(SHIFT_ID_L, 0, 1);
@@ -58,11 +58,11 @@ TEST_F(COSXKeyStateTests, fakeAndPoll_shift)
EXPECT_TRUE(!isKeyPressed(keyState, SHIFT_BUTTON));
}
TEST_F(COSXKeyStateTests, fakeAndPoll_charKey)
TEST_F(OSXKeyStateTests, fakeAndPoll_charKey)
{
CKeyMap keyMap;
CMockEventQueue eventQueue;
COSXKeyState keyState(&eventQueue, keyMap);
synergy::KeyMap keyMap;
MockEventQueue eventQueue;
OSXKeyState keyState(&eventQueue, keyMap);
keyState.updateKeyMap();
keyState.fakeKeyDown(A_CHAR_ID, 0, 1);
@@ -77,11 +77,11 @@ TEST_F(COSXKeyStateTests, fakeAndPoll_charKey)
keyState.fakeKeyUp(2);
}
TEST_F(COSXKeyStateTests, fakeAndPoll_charKeyAndModifier)
TEST_F(OSXKeyStateTests, fakeAndPoll_charKeyAndModifier)
{
CKeyMap keyMap;
CMockEventQueue eventQueue;
COSXKeyState keyState(&eventQueue, keyMap);
synergy::KeyMap keyMap;
MockEventQueue eventQueue;
OSXKeyState keyState(&eventQueue, keyMap);
keyState.updateKeyMap();
keyState.fakeKeyDown(A_CHAR_ID, KeyModifierShift, 1);
@@ -97,7 +97,7 @@ TEST_F(COSXKeyStateTests, fakeAndPoll_charKeyAndModifier)
}
bool
COSXKeyStateTests::isKeyPressed(const COSXKeyState& keyState, KeyButton button)
OSXKeyStateTests::isKeyPressed(const OSXKeyState& keyState, KeyButton button)
{
// HACK: allow os to realize key state changes.
ARCH->sleep(.2);

12
src/test/integtests/platform/OSXScreenTests.cpp
View File

@@ -23,10 +23,10 @@
// disabling these tests - the return value of CGCursorIsVisible is unreliable.
/*
TEST(COSXScreenTests, hideCursor_notPrimary)
TEST(OSXScreenTests, hideCursor_notPrimary)
{
CEventQueue queue;
COSXScreen screen(true, false);
EventQueue queue;
OSXScreen screen(true, false);
screen.hideCursor();
@@ -36,10 +36,10 @@ TEST(COSXScreenTests, hideCursor_notPrimary)
ARCH->sleep(.1f);
}
TEST(COSXScreenTests, showCursor_notPrimary)
TEST(OSXScreenTests, showCursor_notPrimary)
{
CEventQueue queue;
COSXScreen screen(false, false);
EventQueue queue;
OSXScreen screen(false, false);
screen.showCursor();

8
src/test/integtests/platform/XWindowsClipboardTests.cpp
View File

@@ -91,7 +91,7 @@ TEST_F(CXWindowsClipboardTests, add_newValue_valueWasStored)
clipboard.add(IClipboard::kText, "synergy rocks!");
CString actual = clipboard.get(IClipboard::kText);
String actual = clipboard.get(IClipboard::kText);
EXPECT_EQ("synergy rocks!", actual);
}
@@ -102,7 +102,7 @@ TEST_F(CXWindowsClipboardTests, add_replaceValue_valueWasReplaced)
clipboard.add(IClipboard::kText, "synergy rocks!");
clipboard.add(IClipboard::kText, "maxivista sucks"); // haha, just kidding.
CString actual = clipboard.get(IClipboard::kText);
String actual = clipboard.get(IClipboard::kText);
EXPECT_EQ("maxivista sucks", actual);
}
@@ -139,7 +139,7 @@ TEST_F(CXWindowsClipboardTests, get_withNoFormats_returnsEmpty)
{
CXWindowsClipboard clipboard = createClipboard();
CString actual = clipboard.get(IClipboard::kText);
String actual = clipboard.get(IClipboard::kText);
EXPECT_EQ("", actual);
}
@@ -149,7 +149,7 @@ TEST_F(CXWindowsClipboardTests, get_withFormatAdded_returnsExpected)
CXWindowsClipboard clipboard = createClipboard();
clipboard.add(IClipboard::kText, "synergy rocks!");
CString actual = clipboard.get(IClipboard::kText);
String actual = clipboard.get(IClipboard::kText);
EXPECT_EQ("synergy rocks!", actual);
}

44
src/test/integtests/platform/XWindowsKeyStateTests.cpp
View File

@@ -74,8 +74,8 @@ protected:
TEST_F(CXWindowsKeyStateTests, setActiveGroup_pollAndSet_groupIsZero)
{
CMockKeyMap keyMap;
CMockEventQueue eventQueue;
MockKeyMap keyMap;
MockEventQueue eventQueue;
CXWindowsKeyState keyState(
m_display, true, &eventQueue, keyMap);
@@ -86,8 +86,8 @@ TEST_F(CXWindowsKeyStateTests, setActiveGroup_pollAndSet_groupIsZero)
TEST_F(CXWindowsKeyStateTests, setActiveGroup_poll_groupIsNotSet)
{
CMockKeyMap keyMap;
CMockEventQueue eventQueue;
MockKeyMap keyMap;
MockEventQueue eventQueue;
CXWindowsKeyState keyState(
m_display, true, &eventQueue, keyMap);
@@ -98,8 +98,8 @@ TEST_F(CXWindowsKeyStateTests, setActiveGroup_poll_groupIsNotSet)
TEST_F(CXWindowsKeyStateTests, setActiveGroup_customGroup_groupWasSet)
{
CMockKeyMap keyMap;
CMockEventQueue eventQueue;
MockKeyMap keyMap;
MockEventQueue eventQueue;
CXWindowsKeyState keyState(
m_display, true, &eventQueue, keyMap);
@@ -110,8 +110,8 @@ TEST_F(CXWindowsKeyStateTests, setActiveGroup_customGroup_groupWasSet)
TEST_F(CXWindowsKeyStateTests, mapModifiersFromX_zeroState_zeroMask)
{
CMockKeyMap keyMap;
CMockEventQueue eventQueue;
MockKeyMap keyMap;
MockEventQueue eventQueue;
CXWindowsKeyState keyState(
m_display, true, &eventQueue, keyMap);
@@ -122,8 +122,8 @@ TEST_F(CXWindowsKeyStateTests, mapModifiersFromX_zeroState_zeroMask)
TEST_F(CXWindowsKeyStateTests, mapModifiersToX_zeroMask_resultIsTrue)
{
CMockKeyMap keyMap;
CMockEventQueue eventQueue;
MockKeyMap keyMap;
MockEventQueue eventQueue;
CXWindowsKeyState keyState(
m_display, true, &eventQueue, keyMap);
@@ -135,8 +135,8 @@ TEST_F(CXWindowsKeyStateTests, mapModifiersToX_zeroMask_resultIsTrue)
TEST_F(CXWindowsKeyStateTests, fakeCtrlAltDel_default_returnsFalse)
{
CMockKeyMap keyMap;
CMockEventQueue eventQueue;
MockKeyMap keyMap;
MockEventQueue eventQueue;
CXWindowsKeyState keyState(
m_display, true, &eventQueue, keyMap);
@@ -147,8 +147,8 @@ TEST_F(CXWindowsKeyStateTests, fakeCtrlAltDel_default_returnsFalse)
TEST_F(CXWindowsKeyStateTests, pollActiveModifiers_defaultState_returnsZero)
{
CMockKeyMap keyMap;
CMockEventQueue eventQueue;
MockKeyMap keyMap;
MockEventQueue eventQueue;
CXWindowsKeyState keyState(
m_display, true, &eventQueue, keyMap);
@@ -160,8 +160,8 @@ TEST_F(CXWindowsKeyStateTests, pollActiveModifiers_defaultState_returnsZero)
#if 0 // TODO: fix, causes sigsegv
TEST_F(CXWindowsKeyStateTests, pollActiveModifiers_shiftKeyDownThenUp_masksAreCorrect)
{
CMockKeyMap keyMap;
CMockEventQueue eventQueue;
MockKeyMap keyMap;
MockEventQueue eventQueue;
CXWindowsKeyState keyState(
m_display, true, &eventQueue, keyMap);
@@ -193,8 +193,8 @@ TEST_F(CXWindowsKeyStateTests, pollActiveModifiers_shiftKeyDownThenUp_masksAreCo
TEST_F(CXWindowsKeyStateTests, pollActiveGroup_defaultState_returnsZero)
{
CMockKeyMap keyMap;
CMockEventQueue eventQueue;
MockKeyMap keyMap;
MockEventQueue eventQueue;
CXWindowsKeyState keyState(
m_display, true, &eventQueue, keyMap);
@@ -205,8 +205,8 @@ TEST_F(CXWindowsKeyStateTests, pollActiveGroup_defaultState_returnsZero)
TEST_F(CXWindowsKeyStateTests, pollActiveGroup_positiveGroup_returnsGroup)
{
CMockKeyMap keyMap;
CMockEventQueue eventQueue;
MockKeyMap keyMap;
MockEventQueue eventQueue;
CXWindowsKeyState keyState(
m_display, true, &eventQueue, keyMap);
@@ -220,8 +220,8 @@ TEST_F(CXWindowsKeyStateTests, pollActiveGroup_positiveGroup_returnsGroup)
TEST_F(CXWindowsKeyStateTests, pollActiveGroup_xkb_areEqual)
{
#if HAVE_XKB_EXTENSION
CMockKeyMap keyMap;
CMockEventQueue eventQueue;
MockKeyMap keyMap;
MockEventQueue eventQueue;
CXWindowsKeyState keyState(
m_display, true, &eventQueue, keyMap);

2
src/test/integtests/platform/XWindowsScreenSaverTests.cpp
View File

@@ -32,7 +32,7 @@ TEST(CXWindowsScreenSaverTests, activate_defaultScreen_todo)
{
Display* display = XOpenDisplay(":0.0");
Window window = DefaultRootWindow(display);
CMockEventQueue eventQueue;
MockEventQueue eventQueue;
EXPECT_CALL(eventQueue, removeHandler(_, _)).Times(1);
CXWindowsScreenSaver screenSaver(
display, window, NULL, &eventQueue);

2
src/test/integtests/platform/XWindowsScreenTests.cpp
View File

@@ -25,7 +25,7 @@ using ::testing::_;
TEST(CXWindowsScreenTests, fakeMouseMove_nonPrimary_getCursorPosValuesCorrect)
{
CMockEventQueue eventQueue;
MockEventQueue eventQueue;
EXPECT_CALL(eventQueue, adoptHandler(_, _, _)).Times(2);
EXPECT_CALL(eventQueue, adoptBuffer(_)).Times(2);
EXPECT_CALL(eventQueue, removeHandler(_, _)).Times(2);