Fix bypassed tests by deduplicating test framework and use UnifySDK one

CMakeLists.txt

@@ -14,12 +14,19 @@ if(NOT DEFINED COMMON_LOCATION)
 endif()
 
 if(BUILD_TESTING)
+  include(cmake/modules/FindCMock.cmake)
+  set(THS-CMOCK_LOCATION "${cmock_SOURCE_DIR}")
+  set(THS-UNITY_LOCATION  "${cmock_SOURCE_DIR}/vendor/unity")
   # https://gitlab.kitware.com/cmake/cmake/-/issues/22813#note_1620373
-  option(BUILD_TESTING_PROPERTY_DISABLED "WARNING: Bypass some tests" True)
+  option(BUILD_TESTING_PROPERTY_DISABLED "WARNING: Bypass some tests" false)
   if(BUILD_TESTING_PROPERTY_DISABLED)
     message(WARNING "TODO: Some tests are bypassed, please help fixing them")
   endif()
-  include(${CMAKE_SOURCE_DIR}/components/testframework/target_add_unittest.cmake)
+  # Testframework deduplicated, only one to be used
+  set(ZPC_TESTFRAMEWORK_PATH
+    ${unifysdk_SOURCE_DIR}/components/testframework
+  )
+  include(${ZPC_TESTFRAMEWORK_PATH}/target_add_unittest.cmake)
   include(cmake/include/unittest.cmake)
 endif()
 

applications/zpc/CMakeLists.txt

@@ -33,16 +33,13 @@ include(${COMMON_PATH}/cmake/include/zap.cmake)
 include(${COMMON_PATH}/cmake/include/unittest.cmake)
 include(${COMMON_PATH}/cmake/include/version_file.cmake)
 
-# Overload test system with downstream one (patched for z-wave ?)
-set(UNIFY-TESTFRAMEWORK_PATH
-    ${CMAKE_SOURCE_DIR}/components/testframework)
-message(STATUS "Using: ${UNIFY-TESTFRAMEWORK_PATH}")
-if(NOT EXISTS ${UNIFY-TESTFRAMEWORK_PATH})
-  message(FATAL_ERROR "Path to unify testframework does not exist: ${UNIFY-TESTFRAMEWORK_PATH}")
+message(STATUS "Using: ${ZPC_TESTFRAMEWORK_PATH}")
+if(NOT EXISTS ${ZPC_TESTFRAMEWORK_PATH})
+  message(FATAL_ERROR "Path to unify testframework does not exist: ${ZPC_TESTFRAMEWORK_PATH}")
 endif()
 
-include(${UNIFY-TESTFRAMEWORK_PATH}/add_mock.cmake)
-include(${UNIFY-TESTFRAMEWORK_PATH}/target_add_unittest.cmake)
+include(${ZPC_TESTFRAMEWORK_PATH}/add_mock.cmake)
+include(${ZPC_TESTFRAMEWORK_PATH}/target_add_unittest.cmake)
 
 include_directories(
   include

applications/zpc/components/dotdot_mapper/test/CMakeLists.txt

@@ -48,7 +48,8 @@ target_add_unittest(
   zpc_attribute_store_test_helper
   zwave_network_management_mock
   uic_dotdot_mqtt_mock)
-if(${BUILD_TESTING_PROPERTY_DISABLED})
+if(${ZPC_BUILD_TESTING_PROPERTY_DISABLED})
+  message(WARNING "Please fix this test")
   set_tests_properties(binding_cluster_mapper_test
     PROPERTIES DISABLED True)
 endif()

applications/zpc/components/zwave/zwave_transports/s2/libs/zw-libs2/CMakeLists.txt

@@ -54,7 +54,6 @@ endif()
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g3")
 if(NOT DEFINED SKIP_TESTING OR CMAKE_BUILD_TYPE STREQUAL Test)
   enable_testing()
-  add_subdirectory(TestFramework)
   add_subdirectory(test)
   message(STATUS "Adding unit test for libs2")
 else()