From d31ce38bf7d88380aa7556e89db67975c72b38ee Mon Sep 17 00:00:00 2001 From: Ian Date: Wed, 11 Mar 2020 10:55:11 -0400 Subject: [PATCH] re-add tests to build (when CMAKE_BUILD_TESTS is set) --- src/CMakeLists.txt | 4 ++ src/test/integtests/CMakeLists.txt | 2 +- .../platform/XWindowsKeyStateTests.cpp | 22 ++++---- .../platform/XWindowsScreenTests.cpp | 2 +- src/test/unittests/CMakeLists.txt | 2 +- .../unittests/barrier/ClipboardChunkTests.cpp | 52 ++----------------- 6 files changed, 21 insertions(+), 63 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3a8e83eb..ac7f6878 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,3 +23,7 @@ add_subdirectory(cmd) if (BARRIER_BUILD_GUI) add_subdirectory(gui) endif() + +if (CMAKE_BUILD_TESTS) + add_subdirectory(test) +endif() diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt index a412ecc0..7b28c362 100644 --- a/src/test/integtests/CMakeLists.txt +++ b/src/test/integtests/CMakeLists.txt @@ -68,4 +68,4 @@ endif() add_executable(integtests ${sources}) target_link_libraries(integtests - arch base client common io ipc mt net platform server barrier gtest gmock ${libs} ${OPENSSL_LIBS}) + arch base client common io ipc mt net platform server gtest gmock ${libs} ${OPENSSL_LIBS}) diff --git a/src/test/integtests/platform/XWindowsKeyStateTests.cpp b/src/test/integtests/platform/XWindowsKeyStateTests.cpp index ea8ce441..9ca01686 100644 --- a/src/test/integtests/platform/XWindowsKeyStateTests.cpp +++ b/src/test/integtests/platform/XWindowsKeyStateTests.cpp @@ -77,7 +77,7 @@ TEST_F(XWindowsKeyStateTests, setActiveGroup_pollAndSet_groupIsZero) MockKeyMap keyMap; MockEventQueue eventQueue; XWindowsKeyState keyState( - m_display, true, &eventQueue, keyMap); + new XWindowsImpl(), m_display, true, &eventQueue, keyMap); keyState.setActiveGroup(XWindowsKeyState::kGroupPollAndSet); @@ -89,7 +89,7 @@ TEST_F(XWindowsKeyStateTests, setActiveGroup_poll_groupIsNotSet) MockKeyMap keyMap; MockEventQueue eventQueue; XWindowsKeyState keyState( - m_display, true, &eventQueue, keyMap); + new XWindowsImpl(), m_display, true, &eventQueue, keyMap); keyState.setActiveGroup(XWindowsKeyState::kGroupPoll); @@ -101,7 +101,7 @@ TEST_F(XWindowsKeyStateTests, setActiveGroup_customGroup_groupWasSet) MockKeyMap keyMap; MockEventQueue eventQueue; XWindowsKeyState keyState( - m_display, true, &eventQueue, keyMap); + new XWindowsImpl(), m_display, true, &eventQueue, keyMap); keyState.setActiveGroup(1); @@ -113,7 +113,7 @@ TEST_F(XWindowsKeyStateTests, mapModifiersFromX_zeroState_zeroMask) MockKeyMap keyMap; MockEventQueue eventQueue; XWindowsKeyState keyState( - m_display, true, &eventQueue, keyMap); + new XWindowsImpl(), m_display, true, &eventQueue, keyMap); int mask = keyState.mapModifiersFromX(0); @@ -125,7 +125,7 @@ TEST_F(XWindowsKeyStateTests, mapModifiersToX_zeroMask_resultIsTrue) MockKeyMap keyMap; MockEventQueue eventQueue; XWindowsKeyState keyState( - m_display, true, &eventQueue, keyMap); + new XWindowsImpl(), m_display, true, &eventQueue, keyMap); unsigned int modifiers = 0; bool result = keyState.mapModifiersToX(0, modifiers); @@ -138,7 +138,7 @@ TEST_F(XWindowsKeyStateTests, fakeCtrlAltDel_default_returnsFalse) MockKeyMap keyMap; MockEventQueue eventQueue; XWindowsKeyState keyState( - m_display, true, &eventQueue, keyMap); + new XWindowsImpl(), m_display, true, &eventQueue, keyMap); bool result = keyState.fakeCtrlAltDel(); @@ -150,7 +150,7 @@ TEST_F(XWindowsKeyStateTests, pollActiveModifiers_defaultState_returnsZero) MockKeyMap keyMap; MockEventQueue eventQueue; XWindowsKeyState keyState( - m_display, true, &eventQueue, keyMap); + new XWindowsImpl(), m_display, true, &eventQueue, keyMap); KeyModifierMask actual = keyState.pollActiveModifiers(); @@ -163,7 +163,7 @@ TEST_F(XWindowsKeyStateTests, pollActiveModifiers_shiftKeyDownThenUp_masksAreCor MockKeyMap keyMap; MockEventQueue eventQueue; XWindowsKeyState keyState( - m_display, true, &eventQueue, keyMap); + new XWindowsImpl(), m_display, true, &eventQueue, keyMap); // set mock modifier mapping std::fill(keyState.modifierFromX().begin(), keyState.modifierFromX().end(), 0); @@ -196,7 +196,7 @@ TEST_F(XWindowsKeyStateTests, pollActiveGroup_defaultState_returnsZero) MockKeyMap keyMap; MockEventQueue eventQueue; XWindowsKeyState keyState( - m_display, true, &eventQueue, keyMap); + new XWindowsImpl(), m_display, true, &eventQueue, keyMap); SInt32 actual = keyState.pollActiveGroup(); @@ -208,7 +208,7 @@ TEST_F(XWindowsKeyStateTests, pollActiveGroup_positiveGroup_returnsGroup) MockKeyMap keyMap; MockEventQueue eventQueue; XWindowsKeyState keyState( - m_display, true, &eventQueue, keyMap); + new XWindowsImpl(), m_display, true, &eventQueue, keyMap); keyState.group(3); @@ -223,7 +223,7 @@ TEST_F(XWindowsKeyStateTests, pollActiveGroup_xkb_areEqual) MockKeyMap keyMap; MockEventQueue eventQueue; XWindowsKeyState keyState( - m_display, true, &eventQueue, keyMap); + new XWindowsImpl(), m_display, true, &eventQueue, keyMap); // reset the group keyState.group(-1); diff --git a/src/test/integtests/platform/XWindowsScreenTests.cpp b/src/test/integtests/platform/XWindowsScreenTests.cpp index b74599c9..ca308515 100644 --- a/src/test/integtests/platform/XWindowsScreenTests.cpp +++ b/src/test/integtests/platform/XWindowsScreenTests.cpp @@ -30,7 +30,7 @@ TEST(CXWindowsScreenTests, fakeMouseMove_nonPrimary_getCursorPosValuesCorrect) EXPECT_CALL(eventQueue, adoptBuffer(_)).Times(2); EXPECT_CALL(eventQueue, removeHandler(_, _)).Times(2); XWindowsScreen screen( - ":0.0", false, false, 0, &eventQueue); + new XWindowsImpl(), ":0.0", false, false, 0, &eventQueue); screen.fakeMouseMove(10, 20); diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt index 3d21a2b8..c9385b22 100644 --- a/src/test/unittests/CMakeLists.txt +++ b/src/test/unittests/CMakeLists.txt @@ -68,4 +68,4 @@ endif() add_executable(unittests ${sources}) target_link_libraries(unittests - arch base client server common io net platform server barrier mt ipc gtest gmock ${libs} ${OPENSSL_LIBS}) + arch base client server common io net platform server mt ipc gtest gmock ${libs} ${OPENSSL_LIBS}) diff --git a/src/test/unittests/barrier/ClipboardChunkTests.cpp b/src/test/unittests/barrier/ClipboardChunkTests.cpp index 9dc4a5ec..1646e6a6 100644 --- a/src/test/unittests/barrier/ClipboardChunkTests.cpp +++ b/src/test/unittests/barrier/ClipboardChunkTests.cpp @@ -22,19 +22,6 @@ TEST(ClipboardChunkTests, start_formatStartChunk) { -<<<<<<< HEAD - ClipboardID id = 0; - UInt32 sequence = 0; - String mockDataSize("10"); - ClipboardChunk* chunk = ClipboardChunk::start(id, sequence, mockDataSize); - - EXPECT_EQ(id, chunk->m_chunk[0]); - EXPECT_EQ(sequence, (UInt32)chunk->m_chunk[1]); - EXPECT_EQ(kDataStart, chunk->m_chunk[5]); - EXPECT_EQ('1', chunk->m_chunk[6]); - EXPECT_EQ('0', chunk->m_chunk[7]); - EXPECT_EQ('\0', chunk->m_chunk[8]); -======= ClipboardID id = 0; UInt32 sequence = 0; String mockDataSize("10"); @@ -48,33 +35,12 @@ TEST(ClipboardChunkTests, start_formatStartChunk) EXPECT_EQ('1', chunk->m_chunk[6]); EXPECT_EQ('0', chunk->m_chunk[7]); EXPECT_EQ('\0', chunk->m_chunk[8]); ->>>>>>> master - delete chunk; + delete chunk; } TEST(ClipboardChunkTests, data_formatDataChunk) { -<<<<<<< HEAD - ClipboardID id = 0; - UInt32 sequence = 1; - String mockData("mock data"); - ClipboardChunk* chunk = ClipboardChunk::data(id, sequence, mockData); - - EXPECT_EQ(id, chunk->m_chunk[0]); - EXPECT_EQ(sequence, (UInt32)chunk->m_chunk[1]); - EXPECT_EQ(kDataChunk, chunk->m_chunk[5]); - EXPECT_EQ('m', chunk->m_chunk[6]); - EXPECT_EQ('o', chunk->m_chunk[7]); - EXPECT_EQ('c', chunk->m_chunk[8]); - EXPECT_EQ('k', chunk->m_chunk[9]); - EXPECT_EQ(' ', chunk->m_chunk[10]); - EXPECT_EQ('d', chunk->m_chunk[11]); - EXPECT_EQ('a', chunk->m_chunk[12]); - EXPECT_EQ('t', chunk->m_chunk[13]); - EXPECT_EQ('a', chunk->m_chunk[14]); - EXPECT_EQ('\0', chunk->m_chunk[15]); -======= ClipboardID id = 0; UInt32 sequence = 1; String mockData("mock data"); @@ -95,23 +61,12 @@ TEST(ClipboardChunkTests, data_formatDataChunk) EXPECT_EQ('t', chunk->m_chunk[13]); EXPECT_EQ('a', chunk->m_chunk[14]); EXPECT_EQ('\0', chunk->m_chunk[15]); ->>>>>>> master - delete chunk; + delete chunk; } TEST(ClipboardChunkTests, end_formatDataChunk) { -<<<<<<< HEAD - ClipboardID id = 1; - UInt32 sequence = 1; - ClipboardChunk* chunk = ClipboardChunk::end(id, sequence); - - EXPECT_EQ(id, chunk->m_chunk[0]); - EXPECT_EQ(sequence, (UInt32)chunk->m_chunk[1]); - EXPECT_EQ(kDataEnd, chunk->m_chunk[5]); - EXPECT_EQ('\0', chunk->m_chunk[6]); -======= ClipboardID id = 1; UInt32 sequence = 1; ClipboardChunk* chunk = ClipboardChunk::end(id, sequence); @@ -122,7 +77,6 @@ TEST(ClipboardChunkTests, end_formatDataChunk) EXPECT_EQ(sequence, temp_m_chunk); EXPECT_EQ(kDataEnd, chunk->m_chunk[5]); EXPECT_EQ('\0', chunk->m_chunk[6]); ->>>>>>> master - delete chunk; + delete chunk; }