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

Build tests again

Browse source 
The tests were accidentally disabled in
688095d0a7. Since then, the code has
drifted slightly: the synergy lib has been renamed from synergy to
synlib in 4263fd1717 and the curl
dependency was dropped in 491bb2de00.

This re-enables the tests, targets the right lib and removes the
obsolete test.
This commit is contained in:
talyz 2020-02-14 16:26:36 +01:00
parent a1421bf13c
commit 3e80a0bfc0
No known key found for this signature in database
GPG key ID: 2DED2151F4671A2B
4 changed files with 4 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/CMakeLists.txt
View file

@ -22,3 +22,5 @@ add_subdirectory(cmd)
if (SYNERGY_BUILD_LEGACY_GUI)
add_subdirectory(gui)
endif (SYNERGY_BUILD_LEGACY_GUI)
add_subdirectory(test)

2
src/test/integtests/CMakeLists.txt
View file

@ -68,4 +68,4 @@ endif()
add_executable(integtests ${sources})
target_link_libraries(integtests
arch base client common io ipc mt net platform server synergy gtest gmock ${libs} ${OPENSSL_LIBS})
arch base client common io ipc mt net platform server synlib gtest gmock ${libs} ${OPENSSL_LIBS})

37
src/test/integtests/arch/ArchInternetTests.cpp
View file

@ -1,37 +0,0 @@
/*
* synergy -- mouse and keyboard sharing utility
* Copyright (C) 2014-2016 Symless Ltd.
*
* This package is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* found in the file LICENSE that should have accompanied this file.
*
* This package is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "arch/Arch.h"
#include "test/global/gtest.h"
#define TEST_URL "https://symless.com/tests/?testString"
//#define TEST_URL "http://localhost/synergy/tests/?testString"
TEST(ArchInternetTests, get)
{
ARCH_INTERNET internet;
String result = internet.get(TEST_URL);
ASSERT_EQ("Hello world!", result);
}
TEST(ArchInternetTests, urlEncode)
{
ARCH_INTERNET internet;
String result = internet.urlEncode("hello=+&world");
ASSERT_EQ("hello%3D%2B%26world", result);
}

2
src/test/unittests/CMakeLists.txt
View file

@ -68,4 +68,4 @@ endif()
add_executable(unittests ${sources})
target_link_libraries(unittests
arch base client server common io net platform server synergy mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS})
arch base client server common io net platform server synlib mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS})