Convert the property list values into int32_t to support the larger property values when an int is 8-bit or 16-bit. (#1145)

This commit is contained in:
Steve Karg
2025-11-16 08:34:45 -06:00
committed by GitHub
parent 3ea710f92f
commit e9dd910b55
180 changed files with 1071 additions and 861 deletions
+1 -1
View File
@@ -28,7 +28,7 @@ static void test_Accumulator(void)
int test_len = 0;
BACNET_READ_PROPERTY_DATA rpdata = { 0 };
BACNET_APPLICATION_DATA_VALUE value = { 0 };
const int *required_property = NULL;
const int32_t *required_property = NULL;
BACNET_UNSIGNED_INTEGER unsigned_value = 1;
Accumulator_Init();
@@ -28,7 +28,7 @@ static void testAccessCredential(void)
BACNET_READ_PROPERTY_DATA rpdata = { 0 };
BACNET_APPLICATION_DATA_VALUE value = { 0 };
BACNET_APPLICATION_DATA_VALUE value2 = { 0 };
const int *required_property = NULL;
const int32_t *required_property = NULL;
bool status = false;
Access_Credential_Init();
@@ -28,9 +28,9 @@ static void test_object_access_door(void)
BACNET_READ_PROPERTY_DATA rpdata;
/* for decode value data */
BACNET_APPLICATION_DATA_VALUE value = { 0 };
const int *pRequired = NULL;
const int *pOptional = NULL;
const int *pProprietary = NULL;
const int32_t *pRequired = NULL;
const int32_t *pOptional = NULL;
const int32_t *pProprietary = NULL;
unsigned count = 0;
uint32_t object_instance = 0;
@@ -28,7 +28,7 @@ static void testAccessPoint(void)
int len = 0, test_len = 0;
BACNET_READ_PROPERTY_DATA rpdata = { 0 };
BACNET_APPLICATION_DATA_VALUE value = { 0 };
const int *required_property = NULL;
const int32_t *required_property = NULL;
unsigned count = 0;
uint32_t object_instance = 0;
@@ -26,7 +26,7 @@ static void testAccessRights(void)
bool status = false;
unsigned count = 0;
uint32_t object_instance = 0;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
Access_Rights_Init();
count = Access_Rights_Count();
+1 -1
View File
@@ -28,7 +28,7 @@ static void testAnalogInput(void)
bool status = false;
unsigned count = 0;
uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
Analog_Input_Init();
object_instance = Analog_Input_Create(object_instance);
+1 -1
View File
@@ -28,7 +28,7 @@ static void testAnalogOutput(void)
bool status = false;
unsigned count = 0;
uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
Analog_Output_Init();
object_instance = Analog_Output_Create(object_instance);
+1 -1
View File
@@ -26,7 +26,7 @@ static void testAuditlog(void)
int len = 0, index = 0;
const uint32_t instance = 1;
uint32_t test_instance = 0;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
bool status = false;
BACNET_WRITE_PROPERTY_DATA wp_data = { 0 };
uint32_t buffer_size = 0;
+1 -1
View File
@@ -28,7 +28,7 @@ static void testAnalog_Value(void)
bool status = false;
unsigned count = 0;
uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
Analog_Value_Init();
object_instance = Analog_Value_Create(object_instance);
+1 -1
View File
@@ -30,7 +30,7 @@ static void test_BACnet_File_Object(void)
int len = 0, test_len = 0;
BACNET_READ_PROPERTY_DATA rpdata = { 0 };
BACNET_APPLICATION_DATA_VALUE value = { 0 };
const int *required_property = NULL;
const int32_t *required_property = NULL;
const uint32_t instance = 1;
bacfile_init();
+1 -1
View File
@@ -29,7 +29,7 @@ static void testBinaryInput(void)
bool status = false;
unsigned count = 0;
uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
Binary_Input_Init();
object_instance = Binary_Input_Create(object_instance);
@@ -25,7 +25,7 @@ ZTEST(bitstring_value_object_tests, test_BitString_Value_Object)
static void test_BitString_Value_Object(void)
#endif
{
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
const uint32_t instance = 123;
uint32_t test_instance = 0;
unsigned test_count = 0;
+3 -3
View File
@@ -29,9 +29,9 @@ static void testBinaryLightingOutput(void)
BACNET_READ_PROPERTY_DATA rpdata;
BACNET_WRITE_PROPERTY_DATA wpdata = { 0 };
BACNET_APPLICATION_DATA_VALUE value = { 0 };
const int *pRequired = NULL;
const int *pOptional = NULL;
const int *pProprietary = NULL;
const int32_t *pRequired = NULL;
const int32_t *pOptional = NULL;
const int32_t *pProprietary = NULL;
const uint32_t instance = 123;
uint32_t test_instance = 0;
bool status = false;
+1 -1
View File
@@ -28,7 +28,7 @@ static void testBinaryOutput(void)
bool status = false;
unsigned count = 0;
uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0;
const int skip_fail_property_list[] = { PROP_PRIORITY_ARRAY, -1 };
const int32_t skip_fail_property_list[] = { PROP_PRIORITY_ARRAY, -1 };
Binary_Output_Init();
object_instance = Binary_Output_Create(object_instance);
+1 -1
View File
@@ -27,7 +27,7 @@ static void testBinary_Value(void)
bool status = false;
unsigned count = 0;
uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
Binary_Value_Init();
object_instance = Binary_Value_Create(object_instance);
+3 -3
View File
@@ -30,9 +30,9 @@ static void testCalendar(void)
BACNET_READ_PROPERTY_DATA rpdata = { 0 };
BACNET_WRITE_PROPERTY_DATA wpdata = { 0 };
BACNET_APPLICATION_DATA_VALUE value = { 0 };
const int *pRequired = NULL;
const int *pOptional = NULL;
const int *pProprietary = NULL;
const int32_t *pRequired = NULL;
const int32_t *pOptional = NULL;
const int32_t *pProprietary = NULL;
const uint32_t instance = 1;
uint32_t test_instance = 0;
bool status = false;
+1 -1
View File
@@ -29,7 +29,7 @@ static void test_Channel_Property_Read_Write(void)
const char *test_name = NULL;
uint32_t test_instance = 0;
bool status = false;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
BACNET_CHANNEL_VALUE channel_value = { 0 };
BACNET_WRITE_PROPERTY_DATA wp_data = { 0 };
BACNET_APPLICATION_DATA_VALUE value = { 0 };
@@ -29,9 +29,9 @@ static void testColorObject(void)
int test_len = 0;
BACNET_READ_PROPERTY_DATA rpdata = { 0 };
BACNET_APPLICATION_DATA_VALUE value = { 0 };
const int *pRequired = NULL;
const int *pOptional = NULL;
const int *pProprietary = NULL;
const int32_t *pRequired = NULL;
const int32_t *pOptional = NULL;
const int32_t *pProprietary = NULL;
const uint32_t instance = 123;
BACNET_WRITE_PROPERTY_DATA wpdata = { 0 };
bool status = false;
@@ -29,9 +29,9 @@ static void testColorTemperature(void)
int test_len = 0;
BACNET_READ_PROPERTY_DATA rpdata = { 0 };
BACNET_APPLICATION_DATA_VALUE value = { 0 };
const int *pRequired = NULL;
const int *pOptional = NULL;
const int *pProprietary = NULL;
const int32_t *pRequired = NULL;
const int32_t *pOptional = NULL;
const int32_t *pProprietary = NULL;
const uint32_t instance = 123;
BACNET_WRITE_PROPERTY_DATA wpdata = { 0 };
bool status = false;
+1 -1
View File
@@ -27,7 +27,7 @@ static void test_object_command(void)
bool status = false;
unsigned count = 0;
uint32_t object_instance = 0;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
BACNET_ACTION_LIST *pAction;
Command_Init();
@@ -27,9 +27,9 @@ static void testCredentialDataInput(void)
{
unsigned count = 0;
uint32_t object_instance = 0;
const int skip_fail_property_list[] = { PROP_PRESENT_VALUE,
PROP_UPDATE_TIME,
PROP_SUPPORTED_FORMATS, -1 };
const int32_t skip_fail_property_list[] = { PROP_PRESENT_VALUE,
PROP_UPDATE_TIME,
PROP_SUPPORTED_FORMATS, -1 };
Credential_Data_Input_Init();
count = Credential_Data_Input_Count();
+3 -3
View File
@@ -25,9 +25,9 @@ static void testCharacterString_Value(void)
int len = 0, test_len = 0;
BACNET_READ_PROPERTY_DATA rpdata = { 0 };
BACNET_APPLICATION_DATA_VALUE value = { 0 };
const int *pRequired = NULL;
const int *pOptional = NULL;
const int *pProprietary = NULL;
const int32_t *pRequired = NULL;
const int32_t *pOptional = NULL;
const int32_t *pProprietary = NULL;
unsigned count = 0;
bool status = false;
uint32_t object_instance = BACNET_MAX_INSTANCE;
+3 -3
View File
@@ -26,9 +26,9 @@ static void test_Device_Data_Sharing(void)
BACNET_WRITE_PROPERTY_DATA wpdata = { 0 };
/* for decode value data */
BACNET_APPLICATION_DATA_VALUE value = { 0 };
const int *pRequired = NULL;
const int *pOptional = NULL;
const int *pProprietary = NULL;
const int32_t *pRequired = NULL;
const int32_t *pOptional = NULL;
const int32_t *pProprietary = NULL;
unsigned count = 0;
bool status = false;
+1 -1
View File
@@ -25,7 +25,7 @@ static void testInteger_Value(void)
bool status = false;
unsigned count = 0;
uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
const char *test_name = NULL;
char *sample_name = "sample";
+1 -1
View File
@@ -640,7 +640,7 @@ static void test_Load_Control_Read_Write_Property(void)
uint32_t object_instance = 123;
unsigned index;
bool status = false;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
test_setup(object_instance);
status = Load_Control_Valid_Instance(object_instance);
+1 -1
View File
@@ -64,7 +64,7 @@ static void testLightingOutput(void)
uint32_t unsigned_value, test_unsigned;
unsigned priority, test_priority;
BACNET_OBJECT_ID object_id, test_object_id;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
Lighting_Output_Init();
Lighting_Output_Create(instance);
+1 -1
View File
@@ -151,7 +151,7 @@ static void test_Loop_Read_Write(void)
const char *test_name = NULL;
uint32_t test_instance = 0;
bool status = false;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
BACNET_WRITE_PROPERTY_DATA wp_data = { 0 };
BACNET_APPLICATION_DATA_VALUE value = { 0 };
BACNET_CHARACTER_STRING cstring = { 0 };
+3 -3
View File
@@ -29,9 +29,9 @@ static void testLifeSafetyPoint(void)
int test_len = 0;
BACNET_READ_PROPERTY_DATA rpdata = { 0 };
BACNET_APPLICATION_DATA_VALUE value = { 0 };
const int *pRequired = NULL;
const int *pOptional = NULL;
const int *pProprietary = NULL;
const int32_t *pRequired = NULL;
const int32_t *pOptional = NULL;
const int32_t *pProprietary = NULL;
const uint32_t instance = 123;
BACNET_WRITE_PROPERTY_DATA wpdata = { 0 };
bool status = false;
+1 -1
View File
@@ -27,7 +27,7 @@ static void testLifeSafetyZone(void)
bool status;
unsigned count = 0;
uint32_t object_instance = 0, test_object_instance = 0;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
const char *test_name = NULL;
char *sample_name = "sample";
+1 -1
View File
@@ -29,7 +29,7 @@ static void testMultistateInput(void)
bool status = false;
unsigned count = 0;
uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
Multistate_Input_Init();
object_instance = Multistate_Input_Create(object_instance);
+1 -1
View File
@@ -28,7 +28,7 @@ static void testMultistateOutput(void)
bool status = false;
unsigned count = 0;
uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0;
const int skip_fail_property_list[] = { PROP_PRIORITY_ARRAY, -1 };
const int32_t skip_fail_property_list[] = { PROP_PRIORITY_ARRAY, -1 };
Multistate_Output_Init();
object_instance = Multistate_Output_Create(object_instance);
+1 -1
View File
@@ -29,7 +29,7 @@ static void testMultistateValue(void)
bool status = false;
unsigned count = 0;
uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
Multistate_Value_Init();
object_instance = Multistate_Value_Create(object_instance);
+3 -3
View File
@@ -32,9 +32,9 @@ static void test_Notification_Class_Read_Write_Property(void)
int test_len = 0;
BACNET_READ_PROPERTY_DATA rpdata = { 0 };
BACNET_APPLICATION_DATA_VALUE value = { 0 };
const int *pRequired = NULL;
const int *pOptional = NULL;
const int *pProprietary = NULL;
const int32_t *pRequired = NULL;
const int32_t *pOptional = NULL;
const int32_t *pProprietary = NULL;
const uint32_t instance = 1;
uint32_t test_instance = 0;
BACNET_WRITE_PROPERTY_DATA wpdata = { 0 };
+1 -1
View File
@@ -70,7 +70,7 @@ static void test_network_port(void)
PORT_TYPE_ZIGBEE, PORT_TYPE_VIRTUAL,
PORT_TYPE_NON_BACNET, PORT_TYPE_BIP6,
PORT_TYPE_BSC, PORT_TYPE_MAX };
const int known_fail_property_list[] = { -1 };
const int32_t known_fail_property_list[] = { -1 };
while (port_type[port] != PORT_TYPE_MAX) {
Network_Port_Init();
+1 -1
View File
@@ -28,7 +28,7 @@ static void testOctetString_Value(void)
int len = 0, test_len = 0;
BACNET_READ_PROPERTY_DATA rpdata = { 0 };
BACNET_APPLICATION_DATA_VALUE value = { 0 };
const int *required_property = NULL;
const int32_t *required_property = NULL;
const uint32_t instance = 1;
OctetString_Value_Init();
+1 -1
View File
@@ -29,7 +29,7 @@ static void testPositiveInteger_Value(void)
int len = 0, test_len = 0;
BACNET_READ_PROPERTY_DATA rpdata = { 0 };
BACNET_APPLICATION_DATA_VALUE value = { 0 };
const int *required_property = NULL;
const int32_t *required_property = NULL;
const uint32_t instance = 1;
PositiveInteger_Value_Init();
+1 -1
View File
@@ -112,7 +112,7 @@ static void testProgramObject(void)
bool status = false;
unsigned count = 0;
uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
Program_Init();
object_instance = Program_Create(object_instance);
+1 -1
View File
@@ -27,7 +27,7 @@ static void testSchedule(void)
{
unsigned count = 0;
uint32_t object_instance = 0;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
BACNET_DAILY_SCHEDULE daily_schedule = { 0 }, *test_daily_schedule;
BACNET_SPECIAL_EVENT special_event = { 0 }, *test_special_event;
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE object_property_reference = { 0 },
@@ -28,7 +28,7 @@ static void test_object_structured_view(void)
int diff = 0;
unsigned count = 0, index = 0;
const uint32_t instance = 123;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
const char *test_name = "name-1234";
const char *test_description = "description-1234";
const char *test_node_subtype = "node-subtype-1234";
@@ -6,6 +6,7 @@
*
* @copyright SPDX-License-Identifier: MIT
*/
#include <stdint.h>
#include <zephyr/ztest.h>
#include <bacnet/bactext.h>
#include <bacnet/property.h>
@@ -27,7 +28,7 @@ bool bacnet_object_property_write_test(
BACNET_WRITE_PROPERTY_DATA *wp_data,
write_property_function write_property,
bool commandable,
const int *skip_fail_property_list)
const int32_t *skip_fail_property_list)
{
bool status = false;
bool is_array, is_list;
@@ -143,7 +144,7 @@ void bacnet_object_property_write_parameter_init(
int bacnet_object_property_read_test(
BACNET_READ_PROPERTY_DATA *rpdata,
read_property_function read_property,
const int *skip_fail_property_list)
const int32_t *skip_fail_property_list)
{
int len = 0;
int test_len = 0;
@@ -292,14 +293,14 @@ void bacnet_object_properties_read_write_test(
rpm_property_lists_function property_list,
read_property_function read_property,
write_property_function write_property,
const int *skip_fail_property_list)
const int32_t *skip_fail_property_list)
{
uint8_t apdu[MAX_APDU] = { 0 };
BACNET_READ_PROPERTY_DATA rpdata = { 0 };
BACNET_WRITE_PROPERTY_DATA wpdata = { 0 };
const int *pRequired = NULL;
const int *pOptional = NULL;
const int *pProprietary = NULL;
const int32_t *pRequired = NULL;
const int32_t *pOptional = NULL;
const int32_t *pProprietary = NULL;
BACNET_PROPERTY_ID property;
int len = 0;
bool commandable = false;
@@ -29,18 +29,18 @@ void bacnet_object_properties_read_write_test(
rpm_property_lists_function property_list,
read_property_function read_property,
write_property_function write_property,
const int *skip_fail_property_list);
const int32_t *skip_fail_property_list);
int bacnet_object_property_read_test(
BACNET_READ_PROPERTY_DATA *rpdata,
read_property_function read_property,
const int *skip_fail_property_list);
const int32_t *skip_fail_property_list);
bool bacnet_object_property_write_test(
BACNET_WRITE_PROPERTY_DATA *wpdata,
write_property_function write_property,
bool commandable,
const int *skip_fail_property_list);
const int32_t *skip_fail_property_list);
void bacnet_object_property_write_parameter_init(
BACNET_WRITE_PROPERTY_DATA *wpdata,
@@ -29,7 +29,7 @@ static void testTimeValue(void)
bool status = false;
unsigned count = 0;
uint32_t object_instance = 0;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
Time_Value_Init();
object_instance = Time_Value_Create(BACNET_MAX_INSTANCE);
+1 -1
View File
@@ -40,7 +40,7 @@ static void test_Timer_Read_Write(void)
const char *test_name = NULL;
uint32_t test_instance = 0;
bool status = false;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
BACNET_WRITE_PROPERTY_DATA wp_data = { 0 };
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE member = { 0 }, *test_member = NULL;
BACNET_APPLICATION_DATA_VALUE value = { 0 };
+1 -1
View File
@@ -24,7 +24,7 @@ static void test_Trend_Log_ReadProperty(void)
unsigned count = 0;
uint32_t object_instance = 0;
bool status = false;
const int known_fail_property_list[] = { -1 };
const int32_t known_fail_property_list[] = { -1 };
Trend_Log_Init();
count = Trend_Log_Count();
@@ -24,7 +24,7 @@ static void test_Device_Data_Sharing(void)
unsigned count;
bool status = false;
uint32_t test_instance;
const int skip_fail_property_list[] = { -1 };
const int32_t skip_fail_property_list[] = { -1 };
Device_Init(NULL);
status = Device_Set_Object_Instance_Number(instance);
+2 -2
View File
@@ -287,7 +287,7 @@ static void test_BVLC_Register_Foreign_Device_Message(uint16_t ttl_seconds)
uint8_t message_type = 0;
uint16_t length = 0;
int len = 0, test_len = 0;
const int msg_len = 6;
const int32_t msg_len = 6;
len = bvlc_encode_register_foreign_device(pdu, sizeof(pdu), ttl_seconds);
zassert_equal(len, msg_len, NULL);
@@ -323,7 +323,7 @@ static void test_BVLC_Delete_Foreign_Device_Message(
uint8_t message_type = 0;
uint16_t length = 0;
int len = 0, test_len = 0;
const int msg_len = 0x000A;
const int32_t msg_len = 0x000A;
len = bvlc_encode_delete_foreign_device(
pdu, sizeof(pdu), &fdt_entry->dest_address);
+2 -1
View File
@@ -23,7 +23,8 @@ static void test_ListElement(void)
int application_data_len = 0, test_application_data_len = 0;
unsigned i = 0;
BACNET_DESTINATION destination[5] = { 0 }, test_destination[5] = { 0 };
const int destination_size = sizeof(destination) / sizeof(destination[0]);
const int32_t destination_size =
sizeof(destination) / sizeof(destination[0]);
list_element.application_data = NULL;
list_element.application_data_len = 0;