Fix code review.

Added datalink_receive test using ports/rx62n/bacnet.c as an example.

test/bacnet/datalink/mock/CMakeLists.txt

@@ -36,6 +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/bacdcode.c
 	${SRC_DIR}/bacnet/bacint.c

test/bacnet/datalink/mock/src/YRDKRX62N.h

@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2020 Legrand North America, LLC.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+// Mock header

test/bacnet/datalink/mock/src/arcnet-mock.c

@@ -32,10 +32,13 @@ int arcnet_send_pdu(BACNET_ADDRESS *dest, BACNET_NPDU_DATA *npdu_data,
     return ztest_get_return_value();
 }
 
+bool check_arcnet_receive_src = true;
+
 uint16_t arcnet_receive(BACNET_ADDRESS *src, uint8_t *pdu, uint16_t max_pdu,
                         unsigned timeout)
 {
-    ztest_check_expected_value(src);
+    if (check_arcnet_receive_src)
+        ztest_check_expected_value(src);
     ztest_check_expected_value(timeout);
     ztest_copy_return_data(pdu, max_pdu);
     return ztest_get_return_value();

test/bacnet/datalink/mock/src/lcd.h

@@ -0,0 +1,17 @@
+/*
+ * 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;
+}

test/bacnet/datalink/mock/src/main.c

@@ -11,11 +11,10 @@
 #include <stdlib.h>  /* For calloc() */
 #include <ztest.h>
 #include <bacnet/datalink/datalink.h>
+#include <../ports/rx62n/bacnet.h>
+#include "bacnet/apdu.h"
 
-/**
- * @addtogroup bacnet_tests
- * @{
- */
+extern bool check_arcnet_receive_src;
 
 void bvlc_maintenance_timer(uint16_t seconds)
 {
@@ -28,7 +27,12 @@ void bvlc6_maintenance_timer(uint16_t seconds)
 }
 
 /**
- * @brief Test
+ * @addtogroup bacnet_tests
+ * @{
+ */
+
+/**
+ * @brief Test datalink
  */
 
 static void test_datalink_arcnet(void)
@@ -47,16 +51,20 @@ static void test_datalink_arcnet(void)
     BACNET_ADDRESS addr2 = {0};
     BACNET_NPDU_DATA npdu = {0};
 
+    check_arcnet_receive_src = true;
+    zassert_equal(z_cleanup_mock(), 0, NULL);
     datalink_set("arcnet");
 
     // init
     ztest_expect_value(arcnet_init, interface_name, iface);
     ztest_returns_value(arcnet_init, true);
     zassert_equal(datalink_init(iface), true, NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     ztest_expect_value(arcnet_init, interface_name, iface2);
     ztest_returns_value(arcnet_init, false);
     zassert_equal(datalink_init(iface2), false, NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // send_pdu
     ztest_expect_value(arcnet_send_pdu, dest, &addr);
@@ -65,6 +73,7 @@ static void test_datalink_arcnet(void)
     ztest_returns_value(arcnet_send_pdu, 4);
     zassert_equal(datalink_send_pdu(&addr, &npdu, expected_data,
         sizeof(expected_data)), 4, NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // receive
     ztest_expect_value(arcnet_receive, src, &addr);
@@ -73,16 +82,29 @@ static void test_datalink_arcnet(void)
     ztest_returns_value(arcnet_receive, 4);
     zassert_equal(datalink_receive(&addr, data, sizeof(data), 10), 4, NULL);
     zassert_mem_equal(expected_data, data, sizeof(data), NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
+
+    memset(expected_data, 0xff, sizeof(expected_data));
+    memset(data, 0x00, sizeof(data));
+    ztest_expect_value(arcnet_receive, src, &addr);
+    ztest_expect_value(arcnet_receive, timeout, 15);
+    ztest_expect_data(arcnet_receive, pdu, expected_data);
+    ztest_returns_value(arcnet_receive, 0);
+    zassert_equal(datalink_receive(&addr, data, sizeof(data), 15), 0, NULL);
+    zassert_mem_equal(expected_data, data, sizeof(data), NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // get_broadcast_address
     ztest_expect_value(arcnet_get_broadcast_address, dest, &addr);
     datalink_get_broadcast_address(&addr2);
     zassert_mem_equal(&addr, &addr2, sizeof(addr), NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // get_my_address
     ztest_expect_value(arcnet_get_my_address, my_address, &addr);
     datalink_get_my_address(&addr2);
     zassert_mem_equal(&addr, &addr2, sizeof(addr), NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // set_interface - do nothing
     datalink_set_interface(iface);
@@ -107,16 +129,19 @@ static void test_datalink_bip(void)
     BACNET_ADDRESS addr2 = {0};
     BACNET_NPDU_DATA npdu = {0};
 
+    zassert_equal(z_cleanup_mock(), 0, NULL);
     datalink_set("bip");
 
     // init
     ztest_expect_value(bip_init, ifname, iface);
     ztest_returns_value(bip_init, true);
     zassert_equal(datalink_init(iface), true, NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     ztest_expect_value(bip_init, ifname, iface2);
     ztest_returns_value(bip_init, false);
     zassert_equal(datalink_init(iface2), false, NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // send_pdu
     ztest_expect_value(bip_send_pdu, dest, &addr);
@@ -125,6 +150,7 @@ static void test_datalink_bip(void)
     ztest_returns_value(bip_send_pdu, 4);
     zassert_equal(datalink_send_pdu(&addr, &npdu, expected_data,
         sizeof(expected_data)), 4, NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // receive
     ztest_expect_value(bip_receive, src, &addr);
@@ -133,23 +159,38 @@ static void test_datalink_bip(void)
     ztest_returns_value(bip_receive, 4);
     zassert_equal(datalink_receive(&addr, data, sizeof(data), 10), 4, NULL);
     zassert_mem_equal(expected_data, data, sizeof(data), NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
+
+    memset(expected_data, 0xff, sizeof(expected_data));
+    memset(data, 0x00, sizeof(data));
+    ztest_expect_value(bip_receive, src, &addr);
+    ztest_expect_value(bip_receive, timeout, 15);
+    ztest_expect_data(bip_receive, pdu, expected_data);
+    ztest_returns_value(bip_receive, 0);
+    zassert_equal(datalink_receive(&addr, data, sizeof(data), 15), 0, NULL);
+    zassert_mem_equal(expected_data, data, sizeof(data), NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // get_broadcast_address
     ztest_expect_value(bip_get_broadcast_address, dest, &addr);
     datalink_get_broadcast_address(&addr2);
     zassert_mem_equal(&addr, &addr2, sizeof(addr), NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // get_my_address
     ztest_expect_value(bip_get_my_address, my_address, &addr);
     datalink_get_my_address(&addr2);
     zassert_mem_equal(&addr, &addr2, sizeof(addr), NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // set_interface - do nothing
     datalink_set_interface(iface);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // maintenance_timer
     ztest_expect_value(bvlc_maintenance_timer, seconds, 42);
     datalink_maintenance_timer(42);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 }
 
 static void test_datalink_bip6(void)
@@ -168,16 +209,19 @@ static void test_datalink_bip6(void)
     BACNET_ADDRESS addr2 = {0};
     BACNET_NPDU_DATA npdu = {0};
 
+    zassert_equal(z_cleanup_mock(), 0, NULL);
     datalink_set("bip6");
 
     // init
     ztest_expect_value(bip6_init, ifname, iface);
     ztest_returns_value(bip6_init, true);
     zassert_equal(datalink_init(iface), true, NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     ztest_expect_value(bip6_init, ifname, iface2);
     ztest_returns_value(bip6_init, false);
     zassert_equal(datalink_init(iface2), false, NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // send_pdu
     ztest_expect_value(bip6_send_pdu, dest, &addr);
@@ -186,6 +230,7 @@ static void test_datalink_bip6(void)
     ztest_returns_value(bip6_send_pdu, 4);
     zassert_equal(datalink_send_pdu(&addr, &npdu, expected_data,
         sizeof(expected_data)), 4, NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // receive
     ztest_expect_value(bip6_receive, src, &addr);
@@ -194,16 +239,29 @@ static void test_datalink_bip6(void)
     ztest_returns_value(bip6_receive, 4);
     zassert_equal(datalink_receive(&addr, data, sizeof(data), 10), 4, NULL);
     zassert_mem_equal(expected_data, data, sizeof(data), NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
+
+    memset(expected_data, 0xff, sizeof(expected_data));
+    memset(data, 0x00, sizeof(data));
+    ztest_expect_value(bip6_receive, src, &addr);
+    ztest_expect_value(bip6_receive, timeout, 15);
+    ztest_expect_data(bip6_receive, pdu, expected_data);
+    ztest_returns_value(bip6_receive, 0);
+    zassert_equal(datalink_receive(&addr, data, sizeof(data), 15), 0, NULL);
+    zassert_mem_equal(expected_data, data, sizeof(data), NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // get_broadcast_address
     ztest_expect_value(bip6_get_broadcast_address, my_address, &addr);
     datalink_get_broadcast_address(&addr2);
     zassert_mem_equal(&addr, &addr2, sizeof(addr), NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // get_my_address
     ztest_expect_value(bip6_get_my_address, my_address, &addr);
     datalink_get_my_address(&addr2);
     zassert_mem_equal(&addr, &addr2, sizeof(addr), NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // set_interface - do nothing
     datalink_set_interface(iface);
@@ -211,6 +269,7 @@ static void test_datalink_bip6(void)
     // maintenance_timer
     ztest_expect_value(bvlc6_maintenance_timer, seconds, 42);
     datalink_maintenance_timer(42);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 }
 
 static void test_datalink_dlmstp(void)
@@ -229,16 +288,19 @@ static void test_datalink_dlmstp(void)
     BACNET_ADDRESS addr2 = {0};
     BACNET_NPDU_DATA npdu = {0};
 
+    zassert_equal(z_cleanup_mock(), 0, NULL);
     datalink_set("mstp");
 
     // init
     ztest_expect_value(dlmstp_init, ifname, iface);
     ztest_returns_value(dlmstp_init, true);
     zassert_equal(datalink_init(iface), true, NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     ztest_expect_value(dlmstp_init, ifname, iface2);
     ztest_returns_value(dlmstp_init, false);
     zassert_equal(datalink_init(iface2), false, NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // send_pdu
     ztest_expect_value(dlmstp_send_pdu, dest, &addr);
@@ -247,6 +309,7 @@ static void test_datalink_dlmstp(void)
     ztest_returns_value(dlmstp_send_pdu, 4);
     zassert_equal(datalink_send_pdu(&addr, &npdu, expected_data,
         sizeof(expected_data)), 4, NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // receive
     ztest_expect_value(dlmstp_receive, src, &addr);
@@ -255,16 +318,29 @@ static void test_datalink_dlmstp(void)
     ztest_returns_value(dlmstp_receive, 4);
     zassert_equal(datalink_receive(&addr, data, sizeof(data), 10), 4, NULL);
     zassert_mem_equal(expected_data, data, sizeof(data), NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
+
+    memset(expected_data, 0xff, sizeof(expected_data));
+    memset(data, 0x00, sizeof(data));
+    ztest_expect_value(dlmstp_receive, src, &addr);
+    ztest_expect_value(dlmstp_receive, timeout, 15);
+    ztest_expect_data(dlmstp_receive, pdu, expected_data);
+    ztest_returns_value(dlmstp_receive, 0);
+    zassert_equal(datalink_receive(&addr, data, sizeof(data), 15), 0, NULL);
+    zassert_mem_equal(expected_data, data, sizeof(data), NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // get_broadcast_address
     ztest_expect_value(dlmstp_get_broadcast_address, dest, &addr);
     datalink_get_broadcast_address(&addr2);
     zassert_mem_equal(&addr, &addr2, sizeof(addr), NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // get_my_address
     ztest_expect_value(dlmstp_get_my_address, my_address, &addr);
     datalink_get_my_address(&addr2);
     zassert_mem_equal(&addr, &addr2, sizeof(addr), NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // set_interface - do nothing
     datalink_set_interface(iface);
@@ -289,16 +365,19 @@ static void test_datalink_ethernet(void)
     BACNET_ADDRESS addr2 = {0};
     BACNET_NPDU_DATA npdu = {0};
 
+    zassert_equal(z_cleanup_mock(), 0, NULL);
     datalink_set("ethernet");
 
     // init
     ztest_expect_value(ethernet_init, interface_name, iface);
     ztest_returns_value(ethernet_init, true);
     zassert_equal(datalink_init(iface), true, NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     ztest_expect_value(ethernet_init, interface_name, iface2);
     ztest_returns_value(ethernet_init, false);
     zassert_equal(datalink_init(iface2), false, NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // send_pdu
     ztest_expect_value(ethernet_send_pdu, dest, &addr);
@@ -307,6 +386,7 @@ static void test_datalink_ethernet(void)
     ztest_returns_value(ethernet_send_pdu, 4);
     zassert_equal(datalink_send_pdu(&addr, &npdu, expected_data,
         sizeof(expected_data)), 4, NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // receive
     ztest_expect_value(ethernet_receive, src, &addr);
@@ -315,16 +395,29 @@ static void test_datalink_ethernet(void)
     ztest_returns_value(ethernet_receive, 4);
     zassert_equal(datalink_receive(&addr, data, sizeof(data), 10), 4, NULL);
     zassert_mem_equal(expected_data, data, sizeof(data), NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
+
+    memset(expected_data, 0xff, sizeof(expected_data));
+    memset(data, 0x00, sizeof(data));
+    ztest_expect_value(ethernet_receive, src, &addr);
+    ztest_expect_value(ethernet_receive, timeout, 15);
+    ztest_expect_data(ethernet_receive, pdu, expected_data);
+    ztest_returns_value(ethernet_receive, 0);
+    zassert_equal(datalink_receive(&addr, data, sizeof(data), 15), 0, NULL);
+    zassert_mem_equal(expected_data, data, sizeof(data), NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // get_broadcast_address
     ztest_expect_value(ethernet_get_broadcast_address, dest, &addr);
     datalink_get_broadcast_address(&addr2);
     zassert_mem_equal(&addr, &addr2, sizeof(addr), NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // get_my_address
     ztest_expect_value(ethernet_get_my_address, my_address, &addr);
     datalink_get_my_address(&addr2);
     zassert_mem_equal(&addr, &addr2, sizeof(addr), NULL);
+    zassert_equal(z_cleanup_mock(), 0, NULL);
 
     // set_interface - do nothing
     datalink_set_interface(iface);
@@ -333,6 +426,171 @@ static void test_datalink_ethernet(void)
     datalink_maintenance_timer(42);
 }
 
+/**
+ * @brief Test bacnet.c
+ */
+
+
+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);
+}
+
+//  test
+
+static void test_bacnet_task(void)
+{
+    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);
+}
 
 /**
  * @}
@@ -345,7 +603,8 @@ 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_datalink_ethernet),
+     ztest_unit_test(test_bacnet_task)
      );
 
     ztest_run_test_suite(datalink_tests);

test/bacnet/datalink/mock/src/r_ether.h

@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2020 Legrand North America, LLC.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+// Mock header

test/bacnet/datalink/mock/src/r_pdl_cmt.h

@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2020 Legrand North America, LLC.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+// Mock header

test/bacnet/datalink/mock/src/r_pdl_definitions.h

@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2020 Legrand North America, LLC.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+// Mock header

test/bacnet/datalink/mock/src/r_pdl_io_port.h

@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2020 Legrand North America, LLC.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+// Mock header

zephyr/tests/bacnet/datalink/mock/CMakeLists.txt

@@ -20,17 +20,21 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
 # Update include path for this module
 list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
 
+get_filename_component(BACNET_DATALINK_SRC ${BACNET_SRC_PATH} PATH)
+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})
+  list(APPEND INCLUDE ${BACNET_INCLUDE} ${BACNET_INCLUDE}/../test/bacnet/datalink/mock/src)
+  message(STATUS "tdh="${BACNET_TEST_PATH}/src)
 
   file(GLOB SRC_TEST ${BACNET_TEST_PATH}/src/*.c)
   list(APPEND SOURCES ${SRC_TEST} )
 
-  get_filename_component(BACNET_DATALINK_SRC ${BACNET_SRC_PATH} PATH)
-  get_filename_component(BACNET_SRC ${BACNET_DATALINK_SRC} PATH)
   list(APPEND SOURCES
-    ${BACNET_SRC}/datalink/datalink.c
+    ${BACNET_DATALINK_SRC}/datalink.c
+    ${BACNET_SRC}/basic/sys/mstimer.c
+    ${BACNET_SRC}/../../ports/rx62n/bacnet.c
     )
 
   add_definitions(-DBACDL_ALL=1)
@@ -46,11 +50,9 @@ else()
 
   add_definitions(-DBACDL_ALL=1 -DBACNET_ETHERNET_NO_REMAP_DEFINES=1)
 
-  get_filename_component(BACNET_DATALINK_SRC ${BACNET_SRC_PATH} PATH)
-  get_filename_component(BACNET_SRC ${BACNET_DATALINK_SRC} PATH)
-
   target_sources(app PRIVATE
-    ${BACNET_SRC}/datalink/datalink.c
+    ${BACNET_DATALINK_SRC}/datalink.c
+    ${BACNET_SRC}/../../ports/rx62n/bacnet.c
     ${SRC_TEST}
     )
 endif()