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

Fixed unit test compiler warnings

Browse Source
This commit is contained in:
Steve Karg
2024-08-06 16:19:08 -05:00
parent 1be0aa39b9
commit be65abe159
35 changed files with 143 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1
View File
@@ -105,6 +105,7 @@ if (CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_COMPILER_ID MATCHES "AppleCla
add_compile_options(-Wall -Wextra -pedantic)
add_compile_options(-Wfloat-equal -Wconversion)
add_compile_options(-Wredundant-decls -Wswitch-default)
add_compile_options(-Wunused-variable)
# don't warn about conversion, sign, compares, long long and attributes
# since they are common in embedded
add_compile_options(-Wno-sign-conversion -Wno-conversion)
apps/Makefile
+5 -2
View File
@@ -146,12 +146,15 @@ CSTANDARD ?= -std=gnu89
OPTIMIZATION ?= -Os
DEBUGGING ?=
# enable all relevant warnings that find bugs
WARNING_ALL := -Wall -Wextra -Wfloat-equal -Wconversion
WARNING_ALL += -Wredundant-decls -Wswitch-default -pedantic
WARNING_ALL := -Wall -Wextra -pedantic
WARNING_ALL += -Wfloat-equal -Wconversion
WARNING_ALL += -Wredundant-decls -Wswitch-default
WARNING_ALL += -Wunused-variable
# don't warn about conversion, sign, compares, long long and attributes
# since they are common in embedded
WARNING_ALL += -Wno-sign-conversion -Wno-conversion -Wno-sign-compare
WARNING_ALL += -Wno-long-long -Wno-attributes
# don't warn about implicit fallthrough since it's common in network protocols
WARNING_ALL += -Wno-implicit-fallthrough
#WARNING_ALL += -Werror
WARNINGS ?= $(WARNING_ALL)
src/bacnet/bacapp.c
+1 -1
View File
@@ -1069,8 +1069,8 @@ static int decode_priority_array_value(
BACNET_OBJECT_TYPE object_type)
{
int apdu_len = 0;
int len = 0;
#if defined(BACAPP_COMPLEX_TYPES)
int len = 0;
BACNET_APPLICATION_TAG tag = MAX_BACNET_APPLICATION_TAG;
if (bacnet_is_opening_tag_number(apdu, apdu_size, 0, &len)) {
src/bacnet/datalink/bvlc6.c
-1
View File
@@ -1602,7 +1602,6 @@ int bvlc6_broadcast_distribution_table_entry_encode(uint8_t *apdu,
{
int len = 0;
int apdu_len = 0;
int entry_size = 0;
BACNET_OCTET_STRING octet_string;
if (bdt_entry) {
test/CMakeLists.txt
+2 -5
View File
@@ -15,20 +15,17 @@ if (CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_COMPILER_ID MATCHES "GNU")
add_definitions(-fprofile-arcs -ftest-coverage)
add_compile_options(-g -O0 -W -fprofile-arcs -ftest-coverage)
# enable all relevant warnings that find bugs
add_compile_options(-Werror)
add_compile_options(-Wall -Wextra -pedantic)
add_compile_options(-Wfloat-equal -Wconversion)
add_compile_options(-Wredundant-decls -Wswitch-default)
add_compile_options(-Wunused-variable)
# don't warn about conversion, sign, compares, long long and attributes
# since they are common in embedded
add_compile_options(-Wno-sign-conversion -Wno-conversion)
add_compile_options(-Wno-sign-compare -Wno-long-long -Wno-attributes)
# don't warn about implicit fallthrough since it's common in network protocols
add_compile_options(-Wno-implicit-fallthrough)
# FIXME: ignore some warnings that occur in the unit tests
add_compile_options(-Wno-missing-braces)
add_compile_options(-Wno-unused-variable)
add_compile_options(-Wno-unused-function)
add_compile_options(-Wno-unused-parameter)
add_link_options(-fprofile-arcs -ftest-coverage)
endif()
test/Makefile
+4 -2
View File
@@ -7,7 +7,7 @@
# all: demos router-ipv6 ${DEMO_LINUX}
.PHONY: all
all: test
all: test coverage
BUILD_DIR=build
@@ -56,12 +56,14 @@ test:
[ -d $(BUILD_DIR) ] && cd $(BUILD_DIR) && cmake .. && cd ..
[ -d $(BUILD_DIR) ] && cd $(BUILD_DIR) && cmake --build . $(JOBS) --clean-first && cd ..
[ -d $(BUILD_DIR) ] && cd $(BUILD_DIR) && ctest $(CTEST_OPTIONS)
[ -d $(BUILD_DIR) ] && $(MAKE) -C $(BUILD_DIR) lcov
.PHONY: retest
retest:
[ -d $(BUILD_DIR) ] && cd $(BUILD_DIR) && cmake --build . $(JOBS) && cd ..
[ -d $(BUILD_DIR) ] && cd $(BUILD_DIR) && ctest $(CTEST_OPTIONS)
.PHONY: coverage
coverage:
[ -d $(BUILD_DIR) ] && $(MAKE) -C $(BUILD_DIR) lcov
.PHONY: report
test/bacnet/bacaddr/src/main.c
-1
View File
@@ -21,7 +21,6 @@ static void test_BACNET_ADDRESS(void)
#endif
{
BACNET_ADDRESS src = { 0 }, dest = { 0 };
BACNET_ADDRESS test_src = { 0 }, test_dest = { 0 };
BACNET_MAC_ADDRESS mac = { 0 }, adr = { 0 };
uint16_t dnet = 0;
bool status = false;
test/bacnet/bacapp/src/main.c
+3 -1
View File
@@ -71,7 +71,9 @@ static const BACNET_APPLICATION_TAG tag_list[] = {
/* BACnetActionCommand */
BACNET_APPLICATION_TAG_ACTION_COMMAND,
/* BACnetScale */
BACNET_APPLICATION_TAG_SCALE
BACNET_APPLICATION_TAG_SCALE,
/* BACnetShedLevel */
BACNET_APPLICATION_TAG_SHED_LEVEL
};
/**
test/bacnet/bacdcode/src/main.c
+2 -6
View File
@@ -578,7 +578,6 @@ static void testBACnetDateRangeDecodes(void)
int len;
int null_len;
int test_len;
int outLen2;
BACNET_DATE_RANGE data;
BACNET_DATE_RANGE test_data;
@@ -1212,8 +1211,6 @@ static void testBACDCodeBitString(void)
BACNET_BIT_STRING value;
BACNET_BIT_STRING test_value;
uint8_t apdu[MAX_APDU] = { 0 };
uint32_t len_value = 0;
uint8_t tag_number = 0;
int len, null_len, apdu_len, test_len;
BACNET_TAG tag = { 0 };
@@ -1386,12 +1383,12 @@ static void testSignedContextDecodes(void)
value = BIT(i);
for (j = 0; j < 8; j++) {
context_tag = BIT(j);
test_unsigned_context_codec(value, context_tag);
test_signed_context_codec(value, context_tag);
}
value = BIT(i) | BIT(31);
for (j = 0; j < 8; j++) {
context_tag = BIT(j);
test_unsigned_context_codec(value, context_tag);
test_signed_context_codec(value, context_tag);
}
}
}
@@ -1438,7 +1435,6 @@ ZTEST(bacdcode_tests, testEnumeratedContextDecodes)
static void testEnumeratedContextDecodes(void)
#endif
{
uint8_t apdu[MAX_APDU] = { 0 };
uint8_t context_tag = 10;
/* 32-bit value */
test/bacnet/bacdest/src/main.c
+13 -1
View File
@@ -73,16 +73,28 @@ static void testBACnetDestination(void)
{
uint8_t apdu[MAX_APDU] = { 0 };
BACNET_DESTINATION destination = { 0 }, test_destination = { 0 };
int len = 0, apdu_len = 0, null_len = 0, test_len = 0;
int apdu_len = 0, null_len = 0, test_len = 0;
destination.Recipient.tag = BACNET_RECIPIENT_TAG_DEVICE;
destination.Recipient.type.device.type = OBJECT_DEVICE;
destination.Recipient.type.device.instance = 1234;
null_len = bacnet_destination_encode(NULL, &destination);
apdu_len = bacnet_destination_encode(apdu, &destination);
zassert_equal(apdu_len, null_len, NULL);
test_len = bacnet_destination_decode(apdu, apdu_len, &test_destination);
zassert_equal(apdu_len, test_len, NULL);
testBACnetRecipientData(&destination.Recipient,
&test_destination.Recipient);
destination.Recipient.tag = BACNET_RECIPIENT_TAG_ADDRESS;
destination.Recipient.type.address.net = 1234;
destination.Recipient.type.address.len = 6;
destination.Recipient.type.address.adr[0] = 1;
destination.Recipient.type.address.adr[1] = 2;
destination.Recipient.type.address.adr[2] = 3;
destination.Recipient.type.address.adr[3] = 4;
destination.Recipient.type.address.adr[4] = 5;
destination.Recipient.type.address.adr[5] = 6;
null_len = bacnet_destination_encode(NULL, &destination);
apdu_len = bacnet_destination_encode(apdu, &destination);
zassert_equal(apdu_len, null_len, NULL);
test/bacnet/basic/bbmd/src/main.c
+5
View File
@@ -51,6 +51,11 @@ static BACNET_IP_ADDRESS Test_Sent_Message_Dest;
uint16_t bip_receive(
BACNET_ADDRESS *src, uint8_t *npdu, uint16_t max_npdu, unsigned timeout)
{
(void)src;
(void)npdu;
(void)max_npdu;
(void)timeout;
return 0;
}
test/bacnet/basic/bbmd6/src/main.c
+5
View File
@@ -56,6 +56,11 @@ static BACNET_IP6_ADDRESS Test_Sent_Message_Dest;
uint16_t bip6_receive(
BACNET_ADDRESS *src, uint8_t *npdu, uint16_t max_npdu, unsigned timeout)
{
(void)src;
(void)npdu;
(void)max_npdu;
(void)timeout;
return 0;
}
test/bacnet/basic/binding/address/src/main.c
+4 -1
View File
@@ -23,8 +23,9 @@
* @addtogroup bacnet_tests
* @{
*/
#ifdef BACNET_ADDRESS_CACHE_FILE
static const char *Address_Cache_Filename = "address_cache";
#endif
/**
* @brief Test
@@ -44,6 +45,7 @@ static void set_address(unsigned index, BACNET_ADDRESS *dest)
}
}
#ifdef BACNET_ADDRESS_CACHE_FILE
static void set_file_address(
const char *pFilename,
uint32_t device_id,
@@ -78,6 +80,7 @@ static void set_file_address(
fclose(pFile);
}
}
#endif
#ifdef BACNET_ADDRESS_CACHE_FILE
/* Validate that the address data in the file */
test/bacnet/basic/object/bitstring_value/src/main.c
-6
View File
@@ -25,9 +25,6 @@ ZTEST(bitstring_value_object_tests, test_BitString_Value_Object)
static void test_BitString_Value_Object(void)
#endif
{
uint8_t apdu[MAX_APDU] = { 0 };
int len = 0;
int test_len = 0;
const int skip_fail_property_list[] = { -1 };
const uint32_t instance = 123;
uint32_t test_instance = 0;
@@ -37,9 +34,6 @@ static void test_BitString_Value_Object(void)
BACNET_WRITE_PROPERTY_DATA wpdata = { 0 };
BACNET_APPLICATION_DATA_VALUE value = { 0 };
BACNET_PROPERTY_VALUE value_list[2] = { 0 };
const int *required_property = NULL;
const int *optional_property = NULL;
const int *proprietary_property = NULL;
BitString_Value_Init();
status = BitString_Value_Create(instance);
test/bacnet/basic/object/blo/src/main.c
-1
View File
@@ -175,7 +175,6 @@ static void testBinaryLightingOutputBlink(void)
BACNET_BINARY_LIGHTING_PV pv, test_pv, expect_pv;
unsigned test_priority;
BACNET_WRITE_PROPERTY_DATA wpdata = { 0 };
BACNET_APPLICATION_DATA_VALUE value = { 0 };
Binary_Lighting_Output_Init();
Binary_Lighting_Output_Create(object_instance);
test/bacnet/basic/object/device/stubs.c
+11
View File
@@ -41,11 +41,17 @@ bool datetime_local(
int16_t *utc_offset_minutes,
bool *dst_active)
{
(void)bdate;
(void)btime;
(void)utc_offset_minutes;
(void)dst_active;
return true;
}
void bip_get_my_address(BACNET_ADDRESS *my_address)
{
(void)my_address;
}
int bip_send_pdu(
@@ -54,5 +60,10 @@ int bip_send_pdu(
uint8_t *pdu,
unsigned pdu_len)
{
(void)dest;
(void)npdu_data;
(void)pdu;
(void)pdu_len;
return 0;
}
test/bacnet/basic/object/lc/src/main.c
-1
View File
@@ -448,7 +448,6 @@ ZTEST(lc_tests, test_Load_Control_Read_Write_Property)
static void test_Load_Control_Read_Write_Property(void)
#endif
{
bool status = false;
unsigned count = 0;
uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0;
const int skip_fail_property_list[] = { -1 };
test/bacnet/basic/object/lsz/src/main.c
-1
View File
@@ -27,7 +27,6 @@ ZTEST(testsLifeSafetyZone, testLifeSafetyZone)
static void testLifeSafetyZone(void)
#endif
{
bool status = false;
unsigned count = 0;
uint32_t object_instance = 0, test_object_instance = 0;
const int skip_fail_property_list[] = { -1 };
test/bacnet/basic/object/osv/src/main.c
+1 -1
View File
@@ -35,7 +35,7 @@ static void testOctetString_Value(void)
rpdata.application_data = &apdu[0];
rpdata.application_data_len = sizeof(apdu);
rpdata.object_type = OBJECT_OCTETSTRING_VALUE;
rpdata.object_instance = 1;
rpdata.object_instance = instance;
rpdata.array_index = BACNET_ARRAY_ALL;
OctetString_Value_Property_Lists(&required_property, NULL, NULL);
test/bacnet/basic/object/piv/src/main.c
+1 -1
View File
@@ -36,7 +36,7 @@ static void testPositiveInteger_Value(void)
rpdata.application_data = &apdu[0];
rpdata.application_data_len = sizeof(apdu);
rpdata.object_type = OBJECT_POSITIVE_INTEGER_VALUE;
rpdata.object_instance = 1;
rpdata.object_instance = instance;
rpdata.array_index = BACNET_ARRAY_ALL;
PositiveInteger_Value_Property_Lists(&required_property, NULL, NULL);
test/bacnet/basic/object/test/property_test.c
-5
View File
@@ -27,8 +27,6 @@ bool bacnet_object_property_write_test(
const int *skip_fail_property_list)
{
bool status = false;
int len = 0;
int test_len = 0;
(void)skip_fail_property_list;
if (wpdata && write_property) {
@@ -82,14 +80,12 @@ int bacnet_object_property_read_test(
read_property_function read_property,
const int *skip_fail_property_list)
{
bool status = false;
int len = 0;
int test_len = 0;
int apdu_len = 0;
int read_len = 0;
uint8_t *apdu;
BACNET_ARRAY_INDEX array_index = 0;
BACNET_WRITE_PROPERTY_DATA wpdata = { 0 };
BACNET_APPLICATION_DATA_VALUE value = { 0 };
read_len = read_property(rpdata);
@@ -174,7 +170,6 @@ void bacnet_object_properties_read_write_test(
const int *pRequired = NULL;
const int *pOptional = NULL;
const int *pProprietary = NULL;
unsigned count = 0;
int len = 0;
bool status = false;
test/bacnet/basic/sys/color_rgb/src/main.c
-3
View File
@@ -151,9 +151,6 @@ static void test_color_rgb_ascii(void)
uint8_t red, green, blue;
uint8_t test_red, test_green, test_blue;
unsigned test_index;
float x_coordinate;
float y_coordinate;
float brightness;
for (unsigned i = 0; i < count; i++) {
name = color_rgb_from_index(i, &red, &green, &blue);
test/bacnet/create_object/src/main.c
-2
View File
@@ -41,7 +41,6 @@ static void test_CreateObject(void)
#endif
{
BACNET_CREATE_OBJECT_DATA data = { 0 };
int len = 0, apdu_len = 0, null_len = 0, test_len = 0;
test_CreateObjectCodec(&data);
data.object_instance = BACNET_MAX_INSTANCE;
@@ -83,7 +82,6 @@ static void test_CreateObjectACK(void)
#endif
{
BACNET_CREATE_OBJECT_DATA data = { 0 };
int len = 0, apdu_len = 0, null_len = 0, test_len = 0;
test_CreateObjectAckCodec(&data);
data.object_instance = BACNET_MAX_INSTANCE;
test/bacnet/datalink/bvlc/src/main.c
+2 -24
View File
@@ -538,8 +538,6 @@ static void test_BVLC_Broadcast_Distribution_Table_Encode(void)
}
static void test_BVLC_Write_Broadcast_Distribution_Table_Message(
uint8_t *npdu,
uint16_t npdu_len,
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_list)
{
uint8_t pdu[480] = { 0 };
@@ -578,8 +576,6 @@ ZTEST(bvlc_tests, test_BVLC_Write_Broadcast_Distribution_Table)
static void test_BVLC_Write_Broadcast_Distribution_Table(void)
#endif
{
uint8_t npdu[480] = { 0 };
uint16_t npdu_len = 0;
uint16_t i = 0;
uint16_t count = 0;
uint16_t test_count = 0;
@@ -620,20 +616,10 @@ static void test_BVLC_Write_Broadcast_Distribution_Table(void)
&bdt_list[0], &bdt_list[i]);
zassert_true(status, NULL);
}
test_BVLC_Write_Broadcast_Distribution_Table_Message(
npdu, npdu_len, &bdt_list[0]);
/* now with some NPDU data */
for (i = 0; i < sizeof(npdu); i++) {
npdu[i] = i;
}
npdu_len = sizeof(npdu);
test_BVLC_Write_Broadcast_Distribution_Table_Message(
npdu, npdu_len, &bdt_list[0]);
test_BVLC_Write_Broadcast_Distribution_Table_Message(&bdt_list[0]);
}
static void test_BVLC_Read_Foreign_Device_Table_Ack_Message(
uint8_t *npdu,
uint16_t npdu_len,
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *fdt_list)
{
uint8_t pdu[480] = { 0 };
@@ -669,8 +655,6 @@ ZTEST(bvlc_tests, test_BVLC_Read_Foreign_Device_Table_Ack)
static void test_BVLC_Read_Foreign_Device_Table_Ack(void)
#endif
{
uint8_t npdu[480] = { 0 };
uint16_t npdu_len = 0;
uint16_t i = 0;
uint16_t count = 0;
uint16_t test_count = 0;
@@ -701,13 +685,7 @@ static void test_BVLC_Read_Foreign_Device_Table_Ack(void)
}
test_count = bvlc_foreign_device_table_valid_count(fdt_list);
zassert_equal(test_count, count, NULL);
test_BVLC_Read_Foreign_Device_Table_Ack_Message(npdu, npdu_len, fdt_list);
/* now with some NPDU data */
for (i = 0; i < sizeof(npdu); i++) {
npdu[i] = i;
}
npdu_len = sizeof(npdu);
test_BVLC_Read_Foreign_Device_Table_Ack_Message(npdu, npdu_len, fdt_list);
test_BVLC_Read_Foreign_Device_Table_Ack_Message(fdt_list);
/* cleanup */
for (i = 0; i < count; i++) {
dest_address.port = test_port_start + i;
test/bacnet/datalink/mstp/src/main.c
+17 -41
View File
@@ -103,7 +103,10 @@ uint16_t MSTP_Put_Receive(struct mstp_port_struct_t *mstp_port)
* @return amount of PDU data
*/
uint16_t MSTP_Get_Send(struct mstp_port_struct_t *mstp_port, unsigned timeout)
{ /* milliseconds to wait for a packet */
{
(void)mstp_port;
(void)timeout;
return 0;
}
@@ -114,7 +117,10 @@ uint16_t MSTP_Get_Send(struct mstp_port_struct_t *mstp_port, unsigned timeout)
* @return amount of PDU data
*/
uint16_t MSTP_Get_Reply(struct mstp_port_struct_t *mstp_port, unsigned timeout)
{ /* milliseconds to wait for a packet */
{
(void)mstp_port;
(void)timeout;
return 0;
}
@@ -593,8 +599,6 @@ static void testMasterNodeFSM(void)
static void testSlaveNodeFSM(void)
{
struct mstp_port_struct_t MSTP_Port = { 0 }; /* port data */
bool transition_now, non_zero;
unsigned slots, silence, i;
MSTP_Port.InputBuffer = &RxBuffer[0];
MSTP_Port.InputBufferSize = sizeof(RxBuffer);
@@ -677,8 +681,7 @@ static void testZeroConfigNode_Init(struct mstp_port_struct_t *mstp_port)
static void
testZeroConfigNode_No_Events_Timeout(struct mstp_port_struct_t *mstp_port)
{
bool transition_now, non_zero;
unsigned slots, silence, i;
bool transition_now;
SilenceTime = mstp_port->Zero_Config_Silence + 1;
transition_now = MSTP_Master_Node_FSM(mstp_port);
@@ -690,8 +693,7 @@ testZeroConfigNode_No_Events_Timeout(struct mstp_port_struct_t *mstp_port)
static void testZeroConfigNode_Test_Request_Unsupported(
struct mstp_port_struct_t *mstp_port)
{
bool transition_now, non_zero;
unsigned slots, silence, i;
bool transition_now;
/* test case: remote node does not support Test-Request; timeout */
SilenceTime = mstp_port->Treply_timeout + 1;
@@ -703,31 +705,10 @@ static void testZeroConfigNode_Test_Request_Unsupported(
mstp_port->This_Station == mstp_port->Zero_Config_Station, NULL);
}
static void
testZeroConfigNode_Test_Request_Supported(struct mstp_port_struct_t *mstp_port)
{
bool transition_now, non_zero;
unsigned slots, silence, i;
/* test case: remote node supports Test-Request */
SilenceTime = 0;
mstp_port->DestinationAddress = mstp_port->Zero_Config_Station;
mstp_port->SourceAddress = 0;
mstp_port->FrameType = FRAME_TYPE_TEST_RESPONSE;
transition_now = MSTP_Master_Node_FSM(mstp_port);
zassert_true(transition_now, NULL);
zassert_true(
mstp_port->Zero_Config_State == MSTP_ZERO_CONFIG_STATE_USE, NULL);
zassert_true(
mstp_port->This_Station == mstp_port->Zero_Config_Station, NULL);
}
static void
testZeroConfigNode_Test_IDLE_InvalidFrame(struct mstp_port_struct_t *mstp_port)
{
bool transition_now, non_zero;
unsigned slots, silence, i;
bool transition_now;
/* test case: waiting for a invalid frame */
SilenceTime = 0;
@@ -747,8 +728,7 @@ testZeroConfigNode_Test_IDLE_InvalidFrame(struct mstp_port_struct_t *mstp_port)
static void testZeroConfigNode_Test_IDLE_ValidFrameTimeout(
struct mstp_port_struct_t *mstp_port)
{
bool transition_now, non_zero;
unsigned slots, silence, i;
bool transition_now;
/* test case: get a valid frame, followed by timeout */
SilenceTime = 0;
@@ -775,8 +755,7 @@ static void testZeroConfigNode_Test_IDLE_ValidFrameTimeout(
static void
testZeroConfigNode_Test_IDLE_ValidFrame(struct mstp_port_struct_t *mstp_port)
{
bool transition_now, non_zero;
unsigned slots, silence, i;
bool transition_now;
/* test case: get a valid frame, followed by timeout */
SilenceTime = 0;
@@ -793,8 +772,7 @@ testZeroConfigNode_Test_IDLE_ValidFrame(struct mstp_port_struct_t *mstp_port)
static void
testZeroConfigNode_Test_LURK_AddressInUse(struct mstp_port_struct_t *mstp_port)
{
bool transition_now, non_zero;
unsigned slots, silence, i;
bool transition_now;
uint8_t src, dst;
/* test case: src emits a token from each MAC in the zero-config range */
@@ -820,9 +798,8 @@ testZeroConfigNode_Test_LURK_AddressInUse(struct mstp_port_struct_t *mstp_port)
static void testZeroConfigNode_Test_LURK_LearnMaxMaster(
struct mstp_port_struct_t *mstp_port)
{
bool transition_now, non_zero;
unsigned slots, silence, i;
uint8_t src, dst;
bool transition_now;
uint8_t dst;
/* test case: src emits a token from each MAC in the zero-config range */
SilenceTime = 0;
@@ -843,8 +820,7 @@ static void testZeroConfigNode_Test_LURK_LearnMaxMaster(
static void
testZeroConfigNode_Test_LURK_Claim(struct mstp_port_struct_t *mstp_port)
{
bool transition_now, non_zero;
unsigned slots, silence, i;
bool transition_now;
uint8_t src = 0, dst, count, count_max, count_claim;
/* test case: src emits a PFM from each MAC in the zero-config range */
test/bacnet/delete_object/src/main.c
-1
View File
@@ -41,7 +41,6 @@ static void test_DeleteObject(void)
#endif
{
BACNET_DELETE_OBJECT_DATA data = { 0 };
int len = 0, apdu_len = 0, null_len = 0, test_len = 0;
test_DeleteObjectCodec(&data);
data.object_instance = BACNET_MAX_INSTANCE;
test/bacnet/getalarm/src/main.c
-3
View File
@@ -26,8 +26,6 @@
static int get_alarm_summary_decode_apdu(
uint8_t *apdu, unsigned apdu_size, uint8_t *invoke_id)
{
int len = 0;
if (!apdu) {
return BACNET_STATUS_ERROR;
}
@@ -99,7 +97,6 @@ static void testGetAlarmSummaryAck(void)
uint8_t test_invoke_id = 0;
BACNET_GET_ALARM_SUMMARY_DATA alarm_data;
BACNET_GET_ALARM_SUMMARY_DATA test_alarm_data;
unsigned i = 0;
alarm_data.objectIdentifier.type = OBJECT_BINARY_INPUT;
alarm_data.objectIdentifier.instance = 1;
test/bacnet/hostnport/src/main.c
-1
View File
@@ -63,7 +63,6 @@ static void test_HostNPort(void)
#endif
{
BACNET_HOST_N_PORT data = { 0 };
int len = 0, apdu_len = 0, null_len = 0, test_len = 0;
/* none */
test_HostNPortCodec(&data);
test/bacnet/list_element/src/main.c
+2 -2
View File
@@ -18,7 +18,7 @@ static void test_ListElement(void)
{
uint8_t apdu[MAX_APDU] = { 0 };
BACNET_LIST_ELEMENT_DATA list_element = { 0 }, test_list_element = { 0 };
int len = 0, apdu_len = 0, null_len = 0, test_len = 0;
int apdu_len = 0, null_len = 0, test_len = 0;
uint8_t application_data[MAX_APDU] = { 0 }, *test_application_data = NULL;
int application_data_len = 0, test_application_data_len = 0;
unsigned i = 0;
@@ -79,7 +79,7 @@ static void test_ListElementError(void)
{
uint8_t apdu[MAX_APDU] = { 0 };
BACNET_LIST_ELEMENT_DATA list_element = { 0 }, test_list_element = { 0 };
int len = 0, apdu_len = 0, null_len = 0, test_len = 0;
int apdu_len = 0, null_len = 0, test_len = 0;
list_element.error_class = ERROR_CLASS_SERVICES;
list_element.error_code = ERROR_CODE_REJECT_PARAMETER_OUT_OF_RANGE;
test/bacnet/npdu/stubs.c
+5
View File
@@ -36,5 +36,10 @@ int bip_send_pdu(
uint8_t *pdu,
unsigned pdu_len)
{
(void)dest;
(void)npdu_data;
(void)pdu;
(void)pdu_len;
return 0;
}
test/bacnet/specialevent/src/main.c
+55 -116
View File
@@ -36,51 +36,29 @@ static void test_BACnetSpecialEvent_CalendarRef(void)
int len, apdu_len, null_len;
uint8_t apdu[MAX_APDU] = { 0 };
BACNET_SPECIAL_EVENT in = {
.periodTag = BACNET_SPECIAL_EVENT_PERIOD_CALENDAR_REFERENCE,
.period = {
.calendarReference = {
.instance = 5,
.type = OBJECT_CALENDAR,
}
},
.timeValues = {
.TV_Count = 2,
.Time_Values = {
{
.Time = {
.hour = 12,
.min = 30,
.sec = 15,
.hundredths = 5
},
.Value = {
.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT,
.type = {
.Unsigned_Int = 15,
},
}
},
{
.Time = {
.hour = 16,
.min = 1,
.sec = 2,
.hundredths = 3
},
.Value = {
.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT,
.type = {
.Unsigned_Int = 0,
},
}
},
}
},
.priority = 5,
};
BACNET_SPECIAL_EVENT in = { 0 };
BACNET_SPECIAL_EVENT out = { 0 };
in.periodTag = BACNET_SPECIAL_EVENT_PERIOD_CALENDAR_REFERENCE;
in.period.calendarReference.instance = 5;
in.period.calendarReference.type = OBJECT_CALENDAR;
in.timeValues.TV_Count = 2;
in.timeValues.Time_Values[0].Time.hour = 12;
in.timeValues.Time_Values[0].Time.min = 30;
in.timeValues.Time_Values[0].Time.sec = 15;
in.timeValues.Time_Values[0].Time.hundredths = 5;
in.timeValues.Time_Values[0].Value.tag =
BACNET_APPLICATION_TAG_UNSIGNED_INT;
in.timeValues.Time_Values[0].Value.type.Unsigned_Int = 15;
in.timeValues.Time_Values[1].Time.hour = 16;
in.timeValues.Time_Values[1].Time.min = 1;
in.timeValues.Time_Values[1].Time.sec = 2;
in.timeValues.Time_Values[1].Time.hundredths = 3;
in.timeValues.Time_Values[1].Value.tag =
BACNET_APPLICATION_TAG_UNSIGNED_INT;
in.timeValues.Time_Values[1].Value.type.Unsigned_Int = 0;
in.priority = 5;
len = bacnet_special_event_encode(apdu, &in);
null_len = bacnet_special_event_encode(NULL, &in);
zassert_equal(len, null_len, NULL);
@@ -152,29 +130,18 @@ static void test_BACnetSpecialEvent_Date(void)
int len, apdu_len, null_len;
uint8_t apdu[MAX_APDU] = { 0 };
BACNET_SPECIAL_EVENT in = {
.periodTag = BACNET_SPECIAL_EVENT_PERIOD_CALENDAR_ENTRY,
.period = {
.calendarEntry = {
.tag = BACNET_CALENDAR_DATE,
.type = {
.Date = {
.year = 2155,
.month = 10,
.day = 0xff,
.wday = 0xff,
}
}
}
},
.timeValues = {
.TV_Count = 0,
.Time_Values = { 0 }
},
.priority = 16,
};
BACNET_SPECIAL_EVENT in = { 0 };
BACNET_SPECIAL_EVENT out = { 0 };
in.periodTag = BACNET_SPECIAL_EVENT_PERIOD_CALENDAR_ENTRY;
in.period.calendarEntry.tag = BACNET_CALENDAR_DATE;
in.period.calendarEntry.type.Date.year = 2155;
in.period.calendarEntry.type.Date.month = 10;
in.period.calendarEntry.type.Date.day = 0xff;
in.period.calendarEntry.type.Date.wday = 0xff;
in.timeValues.TV_Count = 0;
in.priority = 16;
len = bacnet_special_event_encode(apdu, &in);
null_len = bacnet_special_event_encode(NULL, &in);
zassert_equal(len, null_len, NULL);
@@ -212,38 +179,22 @@ static void test_BACnetSpecialEvent_DateRange(void)
{
int len, apdu_len, null_len;
uint8_t apdu[MAX_APDU] = { 0 };
BACNET_SPECIAL_EVENT in = {
.periodTag = BACNET_SPECIAL_EVENT_PERIOD_CALENDAR_ENTRY,
.period = {
.calendarEntry = {
.tag = BACNET_CALENDAR_DATE_RANGE,
.type = {
.DateRange = {
.startdate = {
.day = 1,
.month = 12,
.year = 2155,
.wday = 0xff,
},
.enddate = {
.day = 31,
.month = 12,
.year = 2155,
.wday = 0xff,
},
}
}
}
},
.timeValues = {
.TV_Count = 0,
.Time_Values = { 0 }
},
.priority = 0,
};
BACNET_SPECIAL_EVENT in = { 0 };
BACNET_SPECIAL_EVENT out = { 0 };
in.periodTag = BACNET_SPECIAL_EVENT_PERIOD_CALENDAR_ENTRY;
in.period.calendarEntry.tag = BACNET_CALENDAR_DATE_RANGE;
in.period.calendarEntry.type.DateRange.startdate.year = 2155;
in.period.calendarEntry.type.DateRange.startdate.month = 12;
in.period.calendarEntry.type.DateRange.startdate.day = 1;
in.period.calendarEntry.type.DateRange.startdate.wday = 0xff;
in.period.calendarEntry.type.DateRange.enddate.year = 2155;
in.period.calendarEntry.type.DateRange.enddate.month = 12;
in.period.calendarEntry.type.DateRange.enddate.day = 31;
in.period.calendarEntry.type.DateRange.enddate.wday = 0xff;
in.timeValues.TV_Count = 0;
in.priority = 0;
len = bacnet_special_event_encode(apdu, &in);
null_len = bacnet_special_event_encode(NULL, &in);
zassert_equal(len, null_len, NULL);
@@ -296,29 +247,17 @@ static void test_BACnetSpecialEvent_WeekNDate(void)
{
int len, apdu_len, null_len;
uint8_t apdu[MAX_APDU] = { 0 };
BACNET_SPECIAL_EVENT in = {
.periodTag = BACNET_SPECIAL_EVENT_PERIOD_CALENDAR_ENTRY,
.period = {
.calendarEntry = {
.tag = BACNET_CALENDAR_WEEK_N_DAY,
.type = {
.WeekNDay = {
.month = 0xff,
.dayofweek = 1, /* mondays */
.weekofmonth = 0xff,
}
}
}
},
.timeValues = {
.TV_Count = 0,
.Time_Values = { 0 }
},
.priority = 16,
};
BACNET_SPECIAL_EVENT in = { 0 };
BACNET_SPECIAL_EVENT out = { 0 };
in.periodTag = BACNET_SPECIAL_EVENT_PERIOD_CALENDAR_ENTRY;
in.period.calendarEntry.tag = BACNET_CALENDAR_WEEK_N_DAY;
in.period.calendarEntry.type.WeekNDay.month = 0xff;
in.period.calendarEntry.type.WeekNDay.dayofweek = 1; /* mondays */
in.period.calendarEntry.type.WeekNDay.weekofmonth = 0xff;
in.timeValues.TV_Count = 0;
in.priority = 16;
len = bacnet_special_event_encode(apdu, &in);
null_len = bacnet_special_event_encode(NULL, &in);
zassert_equal(len, null_len, NULL);
@@ -350,7 +289,7 @@ ZTEST(BACnetSpecialEvent_tests, test_BACnetSpecialEvent_DecodeRealAPDU)
static void test_BACnetSpecialEvent_DecodeRealAPDU(void)
#endif
{
int len, apdu_len;
int apdu_len;
BACNET_SPECIAL_EVENT out = { 0 };
uint8_t sample[18] = {
0x0e, 0x0c, 0xff, 0x0a, 0x1c, 0xff, 0x0f, 0x2e, 0xb4,
test/bacnet/weeklyschedule/src/main.c
-1
View File
@@ -39,7 +39,6 @@ static void test_BACnetWeeklySchedule(void)
BACNET_WEEKLY_SCHEDULE empty_value = { 0 };
BACNET_WEEKLY_SCHEDULE value = { 0 };
BACNET_WEEKLY_SCHEDULE decoded = { 0 };
int diff = 0;
bool status = false;
uint8_t tag_number = 0;
test/bacnet/wpm/src/main.c
+1
View File
@@ -21,6 +21,7 @@ static int wpm_decode_apdu(uint8_t *apdu, unsigned apdu_len, uint8_t *invoke_id)
{
int len = 0;
(void)apdu_len;
if (!apdu) {
return BACNET_STATUS_ERROR;
}
test/ztest/include/zephyr/tc_util.h
+2
View File
@@ -116,6 +116,8 @@ static inline void test_time_ms(void)
uint32_t spend_cycle = k_cycle_get_32() - tc_start_time;
tc_spend_time = k_cyc_to_ms_ceil32(spend_cycle);
#else
tc_spend_time = 0;
#endif
}
test/ztest/include/zephyr/ztest_assert.h
+1
View File
@@ -100,6 +100,7 @@ static inline bool z_zassert(bool cond,
bool _ret = z_zassert(cond, msg ? ("(" default_msg ")") : (default_msg), \
__FILE__, __LINE__, __func__, \
msg ? msg : "", ##__VA_ARGS__); \
(void)_ret; \
} while (0)
/**