dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tests: (#314)

Browse Source 
- misprint in ports/zephyr/bip-init.c
- error processing PROP_TRACKING_VALUE for the Color Temperature object in
  src/bacnet/bacapp.c
- misprint MSV test
- add hostnport.c for each zephyr tests
- fix colors and ms-input tests - remove mocking Device_Inc_Database_Revision()
  for zephyr tests
- debug the color temperature test
This commit is contained in:
Mikhail Antropov
2022-07-30 11:31:38 +03:00
committed by GitHub
parent a945588340
commit 4b742effe1
46 changed files with 233 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zephyr/CMakeLists.txt
+4
View File
@@ -111,6 +111,8 @@ set(BACNETSTACK_SRCS
${BACNETSTACK_SRC}/bacnet/basic/object/bo.h
${BACNETSTACK_SRC}/bacnet/basic/object/bv.h
${BACNETSTACK_SRC}/bacnet/basic/object/channel.h
${BACNETSTACK_SRC}/bacnet/basic/object/color_object.h
${BACNETSTACK_SRC}/bacnet/basic/object/color_temperature.h
${BACNETSTACK_SRC}/bacnet/basic/object/command.h
${BACNETSTACK_SRC}/bacnet/basic/object/credential_data_input.h
${BACNETSTACK_SRC}/bacnet/basic/object/csv.h
@@ -327,6 +329,8 @@ set(BACNETSTACK_BASIC_SRCS
${BACNETSTACK_SRC}/bacnet/basic/object/channel.c
#${BACNETSTACK_SRC}/bacnet/basic/object/client/device-client.c
${BACNETSTACK_SRC}/bacnet/basic/object/command.c
${BACNETSTACK_SRC}/bacnet/basic/object/color_object.c
${BACNETSTACK_SRC}/bacnet/basic/object/color_temperature.c
${BACNETSTACK_SRC}/bacnet/basic/object/credential_data_input.c
${BACNETSTACK_SRC}/bacnet/basic/object/csv.c
${BACNETSTACK_SRC}/bacnet/basic/object/device.c
zephyr/tests/bacnet/basic/object/acc/CMakeLists.txt
+1
View File
@@ -44,6 +44,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactext.c
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/access_credential/CMakeLists.txt
+1
View File
@@ -48,6 +48,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/authentication_factor.c
${BACNET_SRC}/assigned_access_rights.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/access_door/CMakeLists.txt
+1
View File
@@ -45,6 +45,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/access_point/CMakeLists.txt
+1
View File
@@ -44,6 +44,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/bactext.c
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/access_rights/CMakeLists.txt
+1
View File
@@ -46,6 +46,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/access_rule.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/access_user/CMakeLists.txt
+1
View File
@@ -45,6 +45,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/access_zone/CMakeLists.txt
+1
View File
@@ -45,6 +45,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/ai/CMakeLists.txt
+1
View File
@@ -47,6 +47,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/wp.c
${BACNET_SRC}/cov.c
${BACNET_SRC}/memcopy.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/ao/CMakeLists.txt
+1
View File
@@ -45,6 +45,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/av/CMakeLists.txt
+1
View File
@@ -45,6 +45,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/bi/CMakeLists.txt
+1
View File
@@ -45,6 +45,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/bo/CMakeLists.txt
+1
View File
@@ -45,6 +45,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/bv/CMakeLists.txt
+1
View File
@@ -45,6 +45,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/color_object/CMakeLists.txt
+63
View File
@@ -0,0 +1,63 @@
# SPDX-License-Identifier: MIT
cmake_minimum_required(VERSION 3.13.1)
# Extract module path and names
string(REGEX REPLACE
"/zephyr/tests/[a-zA-Z_/-]*$" ""
BACNET_BASE
${CMAKE_CURRENT_SOURCE_DIR})
string(REGEX REPLACE
"/zephyr/tests/" "/src/"
BACNET_SRC_PATH
${CMAKE_CURRENT_SOURCE_DIR})
string(REGEX REPLACE
"/zephyr/tests/" "/test/"
BACNET_TEST_PATH
${CMAKE_CURRENT_SOURCE_DIR})
get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
# Update include path for this module
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
if(BOARD STREQUAL unit_testing)
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
list(APPEND INCLUDE ${BACNET_INCLUDE})
list(APPEND SOURCES
${BACNET_SRC_PATH}.c
${BACNET_TEST_PATH}/src/main.c
${BACNET_TEST_PATH}/../mock/device_mock.c
)
get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH)
get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
list(APPEND SOURCES
${BACNET_SRC}/bacapp.c
${BACNET_SRC}/bacdcode.c
${BACNET_SRC}/bacstr.c
${BACNET_SRC}/bacint.c
${BACNET_SRC}/bacreal.c
${BACNET_SRC}/datetime.c
${BACNET_SRC}/timestamp.c
${BACNET_SRC}/basic/sys/days.c
${BACNET_SRC}/basic/sys/keylist.c
${BACNET_SRC}/bacdevobjpropref.c
${BACNET_SRC}/bactext.c
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/wp.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
target_sources(app PRIVATE
${BACNET_TEST_PATH}/src/main.c
)
endif()
zephyr/tests/bacnet/basic/object/color_object/prj.conf
+2
View File
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/color_object/testcase.yaml
+6
View File
@@ -0,0 +1,6 @@
tests:
bacnet.basic.object.color_object:
tags: bacnet
bacnet.basic.object.color_object.unit:
tags: bacnet
type: unit
zephyr/tests/bacnet/basic/object/color_temperature/CMakeLists.txt
+63
View File
@@ -0,0 +1,63 @@
# SPDX-License-Identifier: MIT
cmake_minimum_required(VERSION 3.13.1)
# Extract module path and names
string(REGEX REPLACE
"/zephyr/tests/[a-zA-Z_/-]*$" ""
BACNET_BASE
${CMAKE_CURRENT_SOURCE_DIR})
string(REGEX REPLACE
"/zephyr/tests/" "/src/"
BACNET_SRC_PATH
${CMAKE_CURRENT_SOURCE_DIR})
string(REGEX REPLACE
"/zephyr/tests/" "/test/"
BACNET_TEST_PATH
${CMAKE_CURRENT_SOURCE_DIR})
get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
# Update include path for this module
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
if(BOARD STREQUAL unit_testing)
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
list(APPEND INCLUDE ${BACNET_INCLUDE})
list(APPEND SOURCES
${BACNET_SRC_PATH}.c
${BACNET_TEST_PATH}/src/main.c
${BACNET_TEST_PATH}/../mock/device_mock.c
)
get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH)
get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
list(APPEND SOURCES
${BACNET_SRC}/bacapp.c
${BACNET_SRC}/bacdcode.c
${BACNET_SRC}/bacstr.c
${BACNET_SRC}/bacint.c
${BACNET_SRC}/bacreal.c
${BACNET_SRC}/datetime.c
${BACNET_SRC}/timestamp.c
${BACNET_SRC}/basic/sys/days.c
${BACNET_SRC}/basic/sys/keylist.c
${BACNET_SRC}/bacdevobjpropref.c
${BACNET_SRC}/bactext.c
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
project(${BACNET_NAME})
else()
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
project(${BACNET_NAME})
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
target_sources(app PRIVATE
${BACNET_TEST_PATH}/src/main.c
)
endif()
zephyr/tests/bacnet/basic/object/color_temperature/prj.conf
+2
View File
@@ -0,0 +1,2 @@
CONFIG_ZTEST=y
CONFIG_BACNETSTACK=y
zephyr/tests/bacnet/basic/object/color_temperature/testcase.yaml
+6
View File
@@ -0,0 +1,6 @@
tests:
bacnet.basic.object.color_temperature:
tags: bacnet
bacnet.basic.object.color_temperature.unit:
tags: bacnet
type: unit
zephyr/tests/bacnet/basic/object/command/CMakeLists.txt
+1
View File
@@ -45,6 +45,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt
+1
View File
@@ -47,6 +47,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/wp.c
${BACNET_SRC}/authentication_factor.c
${BACNET_SRC}/authentication_factor_format.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/device/CMakeLists.txt
+16 -1
View File
@@ -54,6 +54,11 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/npdu.c
${BACNET_SRC}/proplist.c
${BACNET_SRC}/reject.c
${BACNET_SRC}/abort.c
${BACNET_SRC}/bacaddr.c
${BACNET_SRC}/bactimevalue.c
${BACNET_SRC}/bacerror.c
${BACNET_SRC}/basic/binding/address.c
${BACNET_SRC}/basic/object/acc.c
${BACNET_SRC}/basic/object/ai.c
${BACNET_SRC}/basic/object/ao.c
@@ -62,6 +67,8 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/basic/object/bo.c
${BACNET_SRC}/basic/object/bv.c
${BACNET_SRC}/basic/object/channel.c
${BACNET_SRC}/basic/object/color_object.c
${BACNET_SRC}/basic/object/color_temperature.c
${BACNET_SRC}/basic/object/command.c
${BACNET_SRC}/basic/object/csv.c
${BACNET_SRC}/basic/object/iv.c
@@ -76,6 +83,14 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/basic/object/piv.c
${BACNET_SRC}/basic/object/schedule.c
${BACNET_SRC}/basic/object/trendlog.c
${BACNET_SRC}/hostnport.c
${BACNET_SRC}/basic/service/h_apdu.c
${BACNET_SRC}/basic/service/h_cov.c
${BACNET_SRC}/basic/service/h_wp.c
${BACNET_SRC}/basic/sys/bigend.c
${BACNET_SRC}/basic/sys/keylist.c
${BACNET_SRC}/basic/tsm/tsm.c
${BACNET_SRC}/datalink/bvlc.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
@@ -87,6 +102,6 @@ else()
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
target_sources(app PRIVATE
${BACNET_TEST_PATH}/src/main.c
${BACNET_TEST_PATH}/stubs.c
#${BACNET_TEST_PATH}/stubs.c
)
endif()
zephyr/tests/bacnet/basic/object/lc/CMakeLists.txt
+1
View File
@@ -47,6 +47,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_OBJECT_SRC}/ao.c
${BACNET_SRC}/hostnport.c
)
add_definitions(-DUNIT_TESTING)
zephyr/tests/bacnet/basic/object/lo/CMakeLists.txt
+1
View File
@@ -45,6 +45,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/lsp/CMakeLists.txt
+1
View File
@@ -45,6 +45,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt
+2
View File
@@ -26,6 +26,7 @@ if(BOARD STREQUAL unit_testing)
list(APPEND SOURCES
${BACNET_SRC_PATH}.c
${BACNET_TEST_PATH}/src/main.c
${BACNET_TEST_PATH}/../mock/device_mock.c
)
get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH)
@@ -45,6 +46,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt
+1
View File
@@ -45,6 +45,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt
+1
View File
@@ -47,6 +47,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/wp.c
${BACNET_SRC}/cov.c
${BACNET_SRC}/memcopy.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt
+1
View File
@@ -47,6 +47,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/wp.c
${BACNET_SRC}/proplist.c
${BACNET_SRC}/datalink/bvlc.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/netport/prj.conf
+9
View File
@@ -1,2 +1,11 @@
CONFIG_ZTEST=y
CONFIG_BACNETSTACK=y
# BIP Options
CONFIG_BACDL_BIP=y
CONFIG_BACDL_BIP_PORT=47808
CONFIG_BACDL_BIP_ADDRESS_INDEX=0
# networking
CONFIG_NETWORKING=y
CONFIG_NET_IPV4=y
zephyr/tests/bacnet/basic/object/objects/CMakeLists.txt
+1
View File
@@ -46,6 +46,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_BASIC_SRC}/sys/keylist.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/osv/CMakeLists.txt
+1
View File
@@ -45,6 +45,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/piv/CMakeLists.txt
+1
View File
@@ -45,6 +45,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/indtext.c
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt
+1
View File
@@ -46,6 +46,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC}/lighting.c
${BACNET_SRC}/wp.c
${BACNET_SRC}/bactimevalue.c
${BACNET_SRC}/hostnport.c
)
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)