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

Secured BACnetTimeValue codec, and improved unit test coverage. (#648)

Browse Source 
* Secured BACnetTimeValue codec, and improved unit test coverage.
This commit is contained in:
Steve Karg
2024-05-20 12:06:28 -05:00
committed by GitHub
parent 53fd7a2e1f
commit 4cd5e2be97
6 changed files with 202 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/bacnet/bactimevalue/CMakeLists.txt
+1
View File
@@ -24,6 +24,7 @@ add_compile_definitions(
BIG_ENDIAN=0
CONFIG_ZTEST=1
BACAPP_ALL
BACAPP_PRINT_ENABLED
)
include_directories(
test/bacnet/bactimevalue/src/main.c
+97 -10
View File
@@ -2,11 +2,10 @@
* @file
* @brief Unit test for BACnetTimeValue
* @author Steve Karg <skarg@users.sourceforge.net>
* @author Greg Shue <greg.shue@outlook.com>
* @date June 2022
*
* SPDX-License-Identifier: MIT
* @copyright SPDX-License-Identifier: MIT
*/
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
@@ -28,14 +27,16 @@
*/
static void test_BACnetTimeValue(BACNET_TIME_VALUE *value)
{
int len, apdu_len;
int len, apdu_len, null_len = 0;
uint8_t apdu[MAX_APDU] = { 0 };
BACNET_TIME_VALUE test_value = { 0 };
int diff = 0;
bool status = false;
uint8_t tag_number = 0;
null_len = bacnet_time_value_encode(NULL, value);
len = bacnet_time_value_encode(apdu, value);
zassert_equal(len, null_len, NULL);
apdu_len = bacnet_time_value_decode(apdu, len, &test_value);
zassert_true(len > 0, NULL);
zassert_true(apdu_len > 0, NULL);
@@ -45,8 +46,15 @@ static void test_BACnetTimeValue(BACNET_TIME_VALUE *value)
(BACNET_APPLICATION_DATA_VALUE *)&test_value.Value,
(BACNET_APPLICATION_DATA_VALUE *)&value->Value);
zassert_true(status, NULL);
/* apdu too short testing */
while (--apdu_len) {
len = bacnet_time_value_decode(apdu, apdu_len, &test_value);
zassert_true(len < 0, NULL);
}
len = bacnet_time_value_context_encode(apdu, tag_number, value);
null_len = bacnet_time_value_context_encode(NULL,tag_number, value);
zassert_equal(len, null_len, NULL);
apdu_len =
bacnet_time_value_context_decode(apdu, len, tag_number, &test_value);
zassert_true(len > 0, NULL);
@@ -57,6 +65,11 @@ static void test_BACnetTimeValue(BACNET_TIME_VALUE *value)
(BACNET_APPLICATION_DATA_VALUE *)&test_value.Value,
(BACNET_APPLICATION_DATA_VALUE *)&value->Value);
zassert_true(status, NULL);
/* apdu too short testing */
while (--apdu_len) {
len = bacnet_time_value_context_decode(apdu, apdu_len, tag_number, &test_value);
zassert_true(len < 0, NULL);
}
/* negative testing */
tag_number++;
apdu_len =
@@ -73,17 +86,91 @@ ZTEST(BACnetTimeValue_tests, test_BACnetTimeValues)
static void test_BACnetTimeValues(void)
#endif
{
BACNET_APPLICATION_DATA_VALUE value = { 0 };
BACNET_TIME_VALUE time_value = { 0 };
int rc = BACNET_STATUS_OK;
bool status = false;
test_BACnetTimeValue(&time_value);
bacapp_parse_application_data(
BACNET_APPLICATION_TAG_REAL, "4.2", &time_value.Value);
datetime_time_init_ascii(&time_value.Time, "12:00");
status = bacapp_parse_application_data(
BACNET_APPLICATION_TAG_BOOLEAN, "active", &value);
zassert_true(status, NULL);
rc = bacnet_application_to_primitive_data_value(&time_value.Value, &value);
zassert_equal(rc, BACNET_STATUS_OK, NULL);
rc = bacnet_primitive_to_application_data_value(&value, &time_value.Value);
zassert_equal(rc, BACNET_STATUS_OK, NULL);
datetime_time_init_ascii(&time_value.Time, "00:00.01");
test_BACnetTimeValue(&time_value);
bacapp_parse_application_data(
BACNET_APPLICATION_TAG_UNSIGNED_INT, "99999", &time_value.Value);
datetime_time_init_ascii(&time_value.Time, "23:59:59");
status = bacapp_parse_application_data(
BACNET_APPLICATION_TAG_UNSIGNED_INT, "99999", &value);
zassert_true(status, NULL);
rc = bacnet_application_to_primitive_data_value(&time_value.Value, &value);
zassert_equal(rc, BACNET_STATUS_OK, NULL);
rc = bacnet_primitive_to_application_data_value(&value, &time_value.Value);
zassert_equal(rc, BACNET_STATUS_OK, NULL);
status = datetime_time_init_ascii(&time_value.Time, "23:59:59");
zassert_true(status, NULL);
test_BACnetTimeValue(&time_value);
status = bacapp_parse_application_data(
BACNET_APPLICATION_TAG_SIGNED_INT, "-42", &value);
zassert_true(status, NULL);
rc = bacnet_application_to_primitive_data_value(&time_value.Value, &value);
zassert_equal(rc, BACNET_STATUS_OK, NULL);
rc = bacnet_primitive_to_application_data_value(&value, &time_value.Value);
zassert_equal(rc, BACNET_STATUS_OK, NULL);
status = datetime_time_init_ascii(&time_value.Time, "13:00:59.99");
zassert_true(status, NULL);
test_BACnetTimeValue(&time_value);
status = bacapp_parse_application_data(
BACNET_APPLICATION_TAG_REAL, "4.2", &value);
zassert_true(status, NULL);
rc = bacnet_application_to_primitive_data_value(&time_value.Value, &value);
zassert_equal(rc, BACNET_STATUS_OK, NULL);
rc = bacnet_primitive_to_application_data_value(&value, &time_value.Value);
zassert_equal(rc, BACNET_STATUS_OK, NULL);
status = datetime_time_init_ascii(&time_value.Time, "12:00");
zassert_true(status, NULL);
test_BACnetTimeValue(&time_value);
status = bacapp_parse_application_data(
BACNET_APPLICATION_TAG_DOUBLE, "3.141593", &value);
zassert_true(status, NULL);
rc = bacnet_application_to_primitive_data_value(&time_value.Value, &value);
zassert_equal(rc, BACNET_STATUS_OK, NULL);
rc = bacnet_primitive_to_application_data_value(&value, &time_value.Value);
zassert_equal(rc, BACNET_STATUS_OK, NULL);
status = datetime_time_init_ascii(&time_value.Time, "3:14.15.93");
zassert_true(status, NULL);
test_BACnetTimeValue(&time_value);
status = bacapp_parse_application_data(
BACNET_APPLICATION_TAG_ENUMERATED, "42", &value);
zassert_true(status, NULL);
rc = bacnet_application_to_primitive_data_value(&time_value.Value, &value);
zassert_equal(rc, BACNET_STATUS_OK, NULL);
rc = bacnet_primitive_to_application_data_value(&value, &time_value.Value);
zassert_equal(rc, BACNET_STATUS_OK, NULL);
status = datetime_time_init_ascii(&time_value.Time, "8:00.00.00");
zassert_true(status, NULL);
test_BACnetTimeValue(&time_value);
status = bacapp_parse_application_data(
BACNET_APPLICATION_TAG_OBJECT_ID, "8:4194303", &value);
zassert_true(status, NULL);
rc = bacnet_application_to_primitive_data_value(&time_value.Value, &value);
zassert_equal(rc, BACNET_STATUS_ERROR ,"rc=%d", rc);
rc = bacnet_application_to_primitive_data_value(NULL, &value);
zassert_equal(rc, BACNET_STATUS_ERROR ,"rc=%d", rc);
rc = bacnet_application_to_primitive_data_value(&time_value.Value, NULL);
zassert_equal(rc, BACNET_STATUS_ERROR ,"rc=%d", rc);
rc = bacnet_primitive_to_application_data_value(NULL, &time_value.Value);
zassert_equal(rc, BACNET_STATUS_ERROR, NULL);
rc = bacnet_primitive_to_application_data_value(&value, NULL);
zassert_equal(rc, BACNET_STATUS_ERROR, NULL);
}
/**
* @}
test/bacnet/specialevent/src/main.c
+2 -4
View File
@@ -1,13 +1,11 @@
/**
* @file
* @brief Unit test for BACnetSpecialEvent. This test also indirectly tests
* BACnetCalendarEntry
* BACnetCalendarEntry, BACnetDailySchedule, and BACnetTimeValue.
* @author Ondřej Hruška <ondra@ondrovo.com>
* @date Aug 2023
*
* SPDX-License-Identifier: MIT
* @copyright SPDX-License-Identifier: MIT
*/
#include <stdint.h>
#include <stdbool.h>
#include <string.h>