Peter M. Groen / hueplusplus

Commit c404e66f0d6c326ed7ba5af1cec52957c9595014

Authored by Moritz Wirger
1 parent 2780404a

Fix unit and coverage tests

Inline Side-by-side
Showing 3 changed files with 9 additions and 8 deletions
CMakeLists.txt
  View file @c404e66
... ... @@ -69,7 +69,7 @@ if (1 AND APPLE)
69 69 set(CMAKE_MACOSX_RPATH 1)
70 70 endif()
71 71  
72   -add_subdirectory("lib/mbedtls")
  72 +add_subdirectory("lib/mbedtls" EXCLUDE_FROM_ALL)
73 73  
74 74 add_subdirectory(src)
75 75  
... ...
test/CMakeLists.txt
  View file @c404e66
... ... @@ -40,7 +40,7 @@ set(TEST_SOURCES
40 40 test_ColorUnits.cpp
41 41 test_ExtendedColorHueStrategy.cpp
42 42 test_ExtendedColorTemperatureStrategy.cpp
43   - test_Group.cpp
  43 + test_Group.cpp
44 44 test_HueCommandAPI.cpp
45 45 test_Light.cpp
46 46 test_LightFactory.cpp
... ... @@ -93,10 +93,11 @@ if(LCOV_PATH AND GCOV_PATH)
93 93 add_executable(testcov_HuePlusPlus ${TEST_SOURCES} ${hueplusplus_SOURCES})
94 94 target_include_directories(testcov_HuePlusPlus PUBLIC "${PROJECT_SOURCE_DIR}/include")
95 95 target_compile_features(testcov_HuePlusPlus PUBLIC cxx_std_14)
96   - set_property(TARGET testcov_HuePlusPlus PROPERTY CXX_EXTENSIONS OFF)
  96 + set_property(TARGET testcov_HuePlusPlus PROPERTY CXX_EXTENSIONS OFF)
97 97  
98   - target_link_libraries(testcov_HuePlusPlus PUBLIC gtest gmock)
99   - target_include_directories(testcov_HuePlusPlus PUBLIC ${GTest_INCLUDE_DIRS})
  98 + target_link_libraries(testcov_HuePlusPlus PRIVATE mbedtls)
  99 + target_link_libraries(testcov_HuePlusPlus PUBLIC gtest gmock)
  100 + target_include_directories(testcov_HuePlusPlus PUBLIC ${GTest_INCLUDE_DIRS})
100 101 # this will be already done by APPEND_COVERAGE_COMPILER_FLAGS()
101 102 #set_target_properties(
102 103 # testcov_HuePlusPlus PROPERTIES
... ...
test/test_Rule.cpp
  View file @c404e66
... ... @@ -240,18 +240,18 @@ TEST_F(RuleTest, setActions)
240 240 TEST(CreateRule, setName)
241 241 {
242 242 const std::string name = "New rule";
243   - const nlohmann::json request = {{"conditions", {}}, {"actions", {}}, {"name", name}};
  243 + const nlohmann::json request = {{"conditions", nullptr}, {"actions", nullptr}, {"name", name}};
244 244 EXPECT_EQ(request, CreateRule({}, {}).setName(name).getRequest());
245 245 }
246 246  
247 247 TEST(CreateRule, setStatus)
248 248 {
249 249 {
250   - const nlohmann::json request = {{"conditions", {}}, {"actions", {}}, {"status", "enabled"}};
  250 + const nlohmann::json request = {{"conditions", nullptr}, {"actions", nullptr}, {"status", "enabled"}};
251 251 EXPECT_EQ(request, CreateRule({}, {}).setStatus(true).getRequest());
252 252 }
253 253 {
254   - const nlohmann::json request = {{"conditions", {}}, {"actions", {}}, {"status", "disabled"}};
  254 + const nlohmann::json request = {{"conditions", nullptr}, {"actions", nullptr}, {"status", "disabled"}};
255 255 EXPECT_EQ(request, CreateRule({}, {}).setStatus(false).getRequest());
256 256 }
257 257 }
... ...