diff --git a/src/bacnet/datalink/datalink.c b/src/bacnet/datalink/datalink.c index d581fa2f..be897456 100644 --- a/src/bacnet/datalink/datalink.c +++ b/src/bacnet/datalink/datalink.c @@ -44,7 +44,7 @@ #include "bacnet/basic/bbmd6/h_bbmd6.h" #include "bacnet/datalink/arcnet.h" #include "bacnet/datalink/dlmstp.h" -#include +#include static enum { DATALINK_NONE = 0, diff --git a/test/bacnet/datalink/mock/CMakeLists.txt b/test/bacnet/datalink/mock/CMakeLists.txt index fd831a44..800d8025 100644 --- a/test/bacnet/datalink/mock/CMakeLists.txt +++ b/test/bacnet/datalink/mock/CMakeLists.txt @@ -24,13 +24,11 @@ add_compile_definitions( BIG_ENDIAN=0 CONFIG_ZTEST=1 BACDL_ALL=1 - UNIT_TESTING=1 ) include_directories( ${SRC_DIR} ${TST_DIR}/ztest/include - ./src/ ) file(GLOB SRC_TEST ./src/*.c) @@ -38,9 +36,7 @@ file(GLOB SRC_TEST ./src/*.c) add_executable(${PROJECT_NAME} # File(s) under test ${SRC_DIR}/bacnet/datalink/datalink.c - ${SRC_DIR}/../ports/rx62n/bacnet.c # Support files and stubs (pathname alphabetical) - ${SRC_DIR}/bacnet/basic/sys/mstimer.c ${SRC_DIR}/bacnet/bacdcode.c ${SRC_DIR}/bacnet/bacint.c ${SRC_DIR}/bacnet/bacreal.c diff --git a/test/bacnet/datalink/mock/src/YRDKRX62N.h b/test/bacnet/datalink/mock/src/YRDKRX62N.h deleted file mode 100644 index 22f5f9bd..00000000 --- a/test/bacnet/datalink/mock/src/YRDKRX62N.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright (c) 2020 Legrand North America, LLC. - * - * SPDX-License-Identifier: MIT - */ - -// Mock header diff --git a/test/bacnet/datalink/mock/src/lcd.h b/test/bacnet/datalink/mock/src/lcd.h deleted file mode 100644 index babed6fb..00000000 --- a/test/bacnet/datalink/mock/src/lcd.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2020 Legrand North America, LLC. - * - * SPDX-License-Identifier: MIT - */ - -// Mock header - -inline void led_on(uint8_t index) -{ - (void)index; -} - -inline void led_off(uint8_t index) -{ - (void)index; -} diff --git a/test/bacnet/datalink/mock/src/main.c b/test/bacnet/datalink/mock/src/main.c index b6baf92a..7f370e42 100644 --- a/test/bacnet/datalink/mock/src/main.c +++ b/test/bacnet/datalink/mock/src/main.c @@ -11,7 +11,6 @@ #include /* For calloc() */ #include #include -#include <../ports/rx62n/bacnet.h> #include "bacnet/apdu.h" extern bool check_arcnet_receive_src; @@ -426,177 +425,6 @@ static void test_datalink_ethernet(void) datalink_maintenance_timer(42); } -/** - * @brief Test bacnet.c - */ - -#ifdef UNIT_TESTING - -uint8_t Handler_Transmit_Buffer[MAX_PDU] = { 0 }; - -// Mock functions - -bool Binary_Output_Out_Of_Service(uint32_t instance) -{ - (void)instance; - return true; -} - -BACNET_BINARY_PV Binary_Output_Present_Value(uint32_t instance) -{ - (void)instance; - return BINARY_INACTIVE; -} - -BACNET_POLARITY Binary_Output_Polarity(uint32_t instance) -{ - (void)instance; - return POLARITY_NORMAL; -} - -void Device_Init(void) -{} - -void apdu_set_unrecognized_service_handler_handler(void* pFunction) -{ - (void)pFunction; -} - -void apdu_set_unconfirmed_handler(BACNET_UNCONFIRMED_SERVICE service_choice, - void* pFunction) -{ - (void)service_choice; - (void)pFunction; -} - -void apdu_set_confirmed_handler(BACNET_CONFIRMED_SERVICE service_choice, - void* pFunction) -{ - (void)service_choice; - (void)pFunction; -} - -void handler_unrecognized_service(uint8_t * service_request, - uint16_t service_len, BACNET_ADDRESS * dest, - BACNET_CONFIRMED_SERVICE_DATA * service_data) -{ - (void)service_request; - (void)service_len; - (void)dest; - (void)service_data; -} -void handler_who_is(uint8_t * service_request, uint16_t service_len, - BACNET_ADDRESS * src) -{ - (void)service_request; - (void)service_len; - (void)src; -} -void handler_who_has(uint8_t * service_request, uint16_t service_len, - BACNET_ADDRESS * src) -{ - (void)service_request; - (void)service_len; - (void)src; -} -void handler_read_property(uint8_t *service_request, - uint16_t service_len, BACNET_ADDRESS *src, - BACNET_CONFIRMED_SERVICE_DATA *service_data) -{ - (void)service_request; - (void)service_len; - (void)src; - (void)service_data; -} -void handler_read_property_multiple(uint8_t * service_request, - uint16_t service_len, BACNET_ADDRESS * src, - BACNET_CONFIRMED_SERVICE_DATA * service_data) -{ - (void)service_request; - (void)service_len; - (void)src; - (void)service_data; -} -void handler_reinitialize_device( uint8_t * service_request, - uint16_t service_len, BACNET_ADDRESS * src, - BACNET_CONFIRMED_SERVICE_DATA * service_data) -{ - (void)service_request; - (void)service_len; - (void)src; - (void)service_data; -} -void handler_write_property(uint8_t * service_request, - uint16_t service_len, BACNET_ADDRESS * src, - BACNET_CONFIRMED_SERVICE_DATA * service_data) -{ - (void)service_request; - (void)service_len; - (void)src; - (void)service_data; -} -void handler_device_communication_control(uint8_t * service_request, - uint16_t service_len, BACNET_ADDRESS * src, - BACNET_CONFIRMED_SERVICE_DATA * service_data) -{ - (void)service_request; - (void)service_len; - (void)src; - (void)service_data; -} - -void Send_I_Am(uint8_t *buffer) -{ - (void)buffer; -} - -unsigned long mstimer_now(void) -{ - static unsigned long l = 1; - return l++; -} - - -void dcc_timer_seconds(uint32_t seconds) -{ - ztest_check_expected_value(seconds); -} - -void npdu_handler(BACNET_ADDRESS *src, uint8_t *pdu, uint16_t pdu_len) -{ - ztest_check_expected_value(pdu_len); - ztest_check_expected_data(pdu, pdu_len); -} - -#endif /* UNIT_TESTING */ - -// test - -static void test_bacnet_task(void) -{ -#ifdef UNIT_TESTING - uint8_t expected_data[MAX_MPDU] = { 0x5A, 0xA5, 0xDE, 0xAD }; - uint8_t expected_data2[MAX_MPDU] = { 0xAA, 0xBB, 0xCC, 0xDD }; - - check_arcnet_receive_src = false; - zassert_equal(z_cleanup_mock(), 0, NULL); - datalink_set("arcnet"); - - ztest_expect_value(arcnet_receive, timeout, 0); - ztest_expect_data(arcnet_receive, pdu, expected_data); - ztest_returns_value(arcnet_receive, 4); - ztest_expect_value(npdu_handler, pdu_len, 4); - ztest_expect_data(npdu_handler, pdu, expected_data); - bacnet_task(); - zassert_equal(z_cleanup_mock(), 0, NULL); - - ztest_expect_value(arcnet_receive, timeout, 0); - ztest_expect_data(arcnet_receive, pdu, expected_data2); - ztest_returns_value(arcnet_receive, 0); - bacnet_task(); - zassert_equal(z_cleanup_mock(), 0, NULL); -#endif /* UNIT_TESTING */ -} /** * @} @@ -609,8 +437,7 @@ void test_main(void) ztest_unit_test(test_datalink_bip), ztest_unit_test(test_datalink_bip6), ztest_unit_test(test_datalink_dlmstp), - ztest_unit_test(test_datalink_ethernet), - ztest_unit_test(test_bacnet_task) + ztest_unit_test(test_datalink_ethernet) ); ztest_run_test_suite(datalink_tests); diff --git a/test/bacnet/datalink/mock/src/r_ether.h b/test/bacnet/datalink/mock/src/r_ether.h deleted file mode 100644 index 22f5f9bd..00000000 --- a/test/bacnet/datalink/mock/src/r_ether.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright (c) 2020 Legrand North America, LLC. - * - * SPDX-License-Identifier: MIT - */ - -// Mock header diff --git a/test/bacnet/datalink/mock/src/r_pdl_cmt.h b/test/bacnet/datalink/mock/src/r_pdl_cmt.h deleted file mode 100644 index 22f5f9bd..00000000 --- a/test/bacnet/datalink/mock/src/r_pdl_cmt.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright (c) 2020 Legrand North America, LLC. - * - * SPDX-License-Identifier: MIT - */ - -// Mock header diff --git a/test/bacnet/datalink/mock/src/r_pdl_definitions.h b/test/bacnet/datalink/mock/src/r_pdl_definitions.h deleted file mode 100644 index 22f5f9bd..00000000 --- a/test/bacnet/datalink/mock/src/r_pdl_definitions.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright (c) 2020 Legrand North America, LLC. - * - * SPDX-License-Identifier: MIT - */ - -// Mock header diff --git a/test/bacnet/datalink/mock/src/r_pdl_io_port.h b/test/bacnet/datalink/mock/src/r_pdl_io_port.h deleted file mode 100644 index 22f5f9bd..00000000 --- a/test/bacnet/datalink/mock/src/r_pdl_io_port.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright (c) 2020 Legrand North America, LLC. - * - * SPDX-License-Identifier: MIT - */ - -// Mock header diff --git a/zephyr/tests/bacnet/datalink/mock/CMakeLists.txt b/zephyr/tests/bacnet/datalink/mock/CMakeLists.txt index 8980e9c2..430f0abb 100644 --- a/zephyr/tests/bacnet/datalink/mock/CMakeLists.txt +++ b/zephyr/tests/bacnet/datalink/mock/CMakeLists.txt @@ -25,22 +25,16 @@ get_filename_component(BACNET_SRC ${BACNET_DATALINK_SRC} PATH) if(BOARD STREQUAL unit_testing) file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) - list(APPEND INCLUDE - ${BACNET_INCLUDE} - ${BACNET_INCLUDE}/../test/bacnet/datalink/mock/src - ) + list(APPEND INCLUDE ${BACNET_INCLUDE}) file(GLOB SRC_TEST ${BACNET_TEST_PATH}/src/*.c) list(APPEND SOURCES ${SRC_TEST} ) list(APPEND SOURCES ${BACNET_DATALINK_SRC}/datalink.c - ${BACNET_SRC}/basic/sys/mstimer.c - ${BACNET_SRC}/../../ports/rx62n/bacnet.c ) add_definitions(-DBACDL_ALL=1) - add_definitions(-DUNIT_TESTING=1) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) project(${BACNET_NAME}) @@ -48,17 +42,13 @@ else() include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) project(${BACNET_NAME}) - target_include_directories(app PRIVATE - ${BACNET_INCLUDE} - ${BACNET_INCLUDE}/../test/bacnet/datalink/mock/src - ) + target_include_directories(app PRIVATE ${BACNET_INCLUDE}) file(GLOB SRC_TEST ${BACNET_TEST_PATH}/src/*.c) add_definitions(-DBACDL_ALL=1 -DBACNET_ETHERNET_NO_REMAP_DEFINES=1) target_sources(app PRIVATE ${BACNET_DATALINK_SRC}/datalink.c - ${BACNET_SRC}/../../ports/rx62n/bacnet.c ${SRC_TEST} ) endif()