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

Fixed load control object and unit test. Added recipe to Makefile for Zephyr OS twister unit testing. (#710)

Browse Source
This commit is contained in:
Steve Karg
2024-08-06 08:28:01 -05:00
committed by GitHub
parent ebfaa5eb2c
commit 61730e3d87
63 changed files with 1191 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -71,6 +71,7 @@ CMakeLists.txt.user
Obj/
Release/
/twister-out/*
/test/build/
/cmake-build-*
/.idea
Makefile
+13
View File
@@ -450,3 +450,16 @@ test:
.PHONY: retest
retest:
$(MAKE) -s -j -C test retest
# Zephyr unit testing with twister
# expects zephyr to be installed in ../zephyr in Workspace
# expects ZEPHYR_BASE to be set. E.g. source ../zephyr/zephyr-env.sh
# see https://docs.zephyrproject.org/latest/getting_started/index.html
TWISTER_RESULTS=../twister-out.unit_testing
.PHONY: twister
twister:
$(ZEPHYR_BASE)/scripts/twister -O $(TWISTER_RESULTS) -p unit_testing -T zephyr/tests
.PHONY: twister-clean
twister-clean:
-rm -rf $(TWISTER_RESULTS)
src/bacnet/bacapp.c
+321 -13
View File
@@ -81,7 +81,6 @@ static int bacnet_scale_encode(uint8_t *apdu, BACNET_SCALE *value)
static int
bacnet_scale_decode(uint8_t *apdu, size_t apdu_size, BACNET_SCALE *value)
{
int len = 0;
int apdu_len = 0;
BACNET_TAG tag = { 0 };
int32_t signed_value = 0;
@@ -90,28 +89,25 @@ bacnet_scale_decode(uint8_t *apdu, size_t apdu_size, BACNET_SCALE *value)
if (!apdu) {
return BACNET_STATUS_ERROR;
}
len = bacnet_tag_decode(&apdu[apdu_len], apdu_size - apdu_len, &tag);
if (len <= 0) {
apdu_len = bacnet_tag_decode(apdu, apdu_size, &tag);
if (apdu_len <= 0) {
return BACNET_STATUS_ERROR;
}
switch (tag.number) {
case 0:
len = bacnet_real_context_decode(
&apdu[apdu_len], apdu_size - apdu_len, tag.number, &real_value);
if (len > 0) {
apdu_len = bacnet_real_context_decode(
apdu, apdu_size, tag.number, &real_value);
if (apdu_len > 0) {
value->float_scale = true;
value->type.real_scale = real_value;
apdu_len += len;
}
break;
case 1:
len = bacnet_signed_context_decode(
&apdu[apdu_len], apdu_size - apdu_len, tag.number,
&signed_value);
if (len > 0) {
apdu_len = bacnet_signed_context_decode(
apdu, apdu_size, tag.number, &signed_value);
if (apdu_len > 0) {
value->float_scale = false;
value->type.integer_scale = signed_value;
apdu_len += len;
}
break;
default:
@@ -149,6 +145,151 @@ static bool bacnet_scale_same(BACNET_SCALE *value1, BACNET_SCALE *value2)
}
#endif
#if defined(BACAPP_SHED_LEVEL)
/**
* @brief Encode a BACnetScale value.
*
* BACnetScale ::= CHOICE {
* float-scale [0] REAL,
* integer-scale [1] INTEGER
* }
*
* @param apdu - buffer to encode to
* @param value - value to encode
* @return number of bytes encoded
*/
static int bacnet_shed_level_encode(uint8_t *apdu, BACNET_SHED_LEVEL *value)
{
int apdu_len = 0;
if (!value) {
return 0;
}
switch (value->type) {
case BACNET_SHED_TYPE_PERCENT:
apdu_len = encode_context_unsigned(apdu, 0,
value->value.percent);
break;
case BACNET_SHED_TYPE_AMOUNT:
apdu_len = encode_context_real(apdu, 2,
value->value.amount);
break;
case BACNET_SHED_TYPE_LEVEL:
apdu_len = encode_context_unsigned(apdu, 1,
value->value.level);
break;
default:
break;
}
return apdu_len;
}
#endif
#if defined(BACAPP_SHED_LEVEL)
/**
* @brief Decode a BACnetShedLevel value.
*
* BACnetShedLevel ::= CHOICE {
* percent [0] Unsigned,
* level [1] Unsigned,
* amount [2] REAL
* }
*
* @param apdu - buffer to decode to
* @param apdu_size - size of the buffer
* @param value - value to encode
* @return number of bytes decoded, or BACNET_STATUS_ERROR on error
*/
static int
bacnet_shed_level_decode(uint8_t *apdu, size_t apdu_size, BACNET_SHED_LEVEL *value)
{
int apdu_len = 0;
BACNET_TAG tag = { 0 };
BACNET_UNSIGNED_INTEGER unsigned_value = 0;
float real_value = 0.0f;
if (!apdu) {
return BACNET_STATUS_ERROR;
}
apdu_len = bacnet_tag_decode(apdu, apdu_size, &tag);
if (apdu_len <= 0) {
return BACNET_STATUS_ERROR;
}
switch (tag.number) {
case 0:
/* percent - Unsigned */
apdu_len = bacnet_unsigned_context_decode(
apdu, apdu_size, tag.number, &unsigned_value);
if (apdu_len > 0) {
value->value.percent = unsigned_value;
value->type = BACNET_SHED_TYPE_PERCENT;
}
break;
case 1:
/* level - Unsigned */
apdu_len = bacnet_unsigned_context_decode(
apdu, apdu_size, tag.number, &unsigned_value);
if (apdu_len > 0) {
value->value.level = unsigned_value;
value->type = BACNET_SHED_TYPE_LEVEL;
}
break;
case 2:
apdu_len = bacnet_real_context_decode(
apdu, apdu_size, tag.number, &real_value);
if (apdu_len > 0) {
value->type = BACNET_SHED_TYPE_AMOUNT;
value->value.amount = real_value;
}
break;
default:
return BACNET_STATUS_ERROR;
}
return apdu_len;
}
#endif
#if defined(BACAPP_SHED_LEVEL)
static bool
bacnet_shed_level_same(BACNET_SHED_LEVEL *value1, BACNET_SHED_LEVEL *value2)
{
bool status = false;
if (value1 && value2) {
status = true;
if (value1->type != value2->type) {
status = false;
} else {
switch (value1->type) {
case BACNET_SHED_TYPE_PERCENT:
if (value1->value.percent != value2->value.percent) {
status = false;
}
break;
case BACNET_SHED_TYPE_AMOUNT:
if (islessgreater(
value1->value.amount, value2->value.amount)) {
status = false;
}
break;
case BACNET_SHED_TYPE_LEVEL:
if (value1->value.level != value2->value.level) {
status = false;
}
break;
default:
break;
}
}
}
return status;
}
#endif
/**
* @brief Encode application data given by a pointer into the APDU.
* @param apdu - Pointer to the buffer to encode to, or NULL for length
@@ -355,6 +496,13 @@ int bacapp_encode_application_data(
/* BACnetScale */
apdu_len = bacnet_scale_encode(apdu, &value->type.Scale);
break;
#endif
#if defined(BACAPP_SHED_LEVEL)
case BACNET_APPLICATION_TAG_SHED_LEVEL:
/* BACnetShedLevel */
apdu_len = bacnet_shed_level_encode(apdu,
&value->type.Shed_Level);
break;
#endif
default:
break;
@@ -769,6 +917,7 @@ int bacapp_encode_context_data_value(
case BACNET_APPLICATION_TAG_FDT_ENTRY:
case BACNET_APPLICATION_TAG_ACTION_COMMAND:
case BACNET_APPLICATION_TAG_SCALE:
case BACNET_APPLICATION_TAG_SHED_LEVEL:
/* complex data is enclosed in open/close tags */
len = encode_opening_tag(apdu, context_tag_number);
apdu_len += len;
@@ -1098,6 +1247,11 @@ int bacapp_known_property_tag(
case PROP_SCALE:
/* BACnetScale */
return BACNET_APPLICATION_TAG_SCALE;
case PROP_ACTUAL_SHED_LEVEL:
case PROP_EXPECTED_SHED_LEVEL:
case PROP_REQUESTED_SHED_LEVEL:
/* BACnetShedLevel */
return BACNET_APPLICATION_TAG_SHED_LEVEL;
case PROP_FD_BBMD_ADDRESS:
case PROP_BACNET_IP_GLOBAL_ADDRESS:
@@ -1399,6 +1553,13 @@ int bacapp_decode_application_tag_value(
/* BACnetScale */
apdu_len = bacnet_scale_decode(apdu, apdu_size, &value->type.Scale);
break;
#endif
#if defined(BACAPP_SHED_LEVEL)
case BACNET_APPLICATION_TAG_SHED_LEVEL:
/* BACnetShedLevel */
apdu_len = bacnet_shed_level_decode(
apdu, apdu_size, &value->type.Shed_Level);
break;
#endif
default:
break;
@@ -1698,6 +1859,43 @@ int bacapp_snprintf_shift(int len, char **buf, size_t *buf_size)
return len;
}
#if defined(BACAPP_SHED_LEVEL)
/**
* @brief Print a value to a string for EPICS
* @param str - destination string, or NULL for length only
* @param str_len - length of the destination string, or 0 for length only
* @param value - value to be printed
* @return number of characters written to the string
*/
int bacapp_snprintf_shed_level(
char *str, size_t str_len, BACNET_SHED_LEVEL *value)
{
int length = 0;
switch (value->type) {
case BACNET_SHED_TYPE_PERCENT:
length = bacapp_snprintf(
str, str_len, "%u%%",(unsigned)
value->value.percent);
break;
case BACNET_SHED_TYPE_LEVEL:
length = bacapp_snprintf(
str, str_len, "%u",(unsigned)
value->value.level);
break;
case BACNET_SHED_TYPE_AMOUNT:
length = bacapp_snprintf(
str, str_len, "%f",
value->value.amount);
break;
default:
break;
}
return length;
}
#endif
/**
* @brief Print a value to a string for EPICS
* @param str - destination string, or NULL for length only
@@ -3018,6 +3216,12 @@ int bacapp_snprintf_value(
(long)value->type.Scale.type.integer_scale);
}
break;
#endif
#if defined(BACAPP_SHED_LEVEL)
case BACNET_APPLICATION_TAG_SHED_LEVEL:
ret_val = bacapp_snprintf_shed_level(
str, str_len, &value->type.Shed_Level);
break;
#endif
default:
ret_val = bacapp_snprintf(
@@ -3295,6 +3499,97 @@ static bool strtod_checked(const char *s, double *out)
}
#endif
#if defined(BACAPP_SCALE)
/**
* @brief Parse a string into a BACnetScale value
* @param value [out] The BACnetScale value
* @param argv [in] The string to parse
* @return True on success, else False
*/
bool bacnet_scale_from_ascii(BACNET_SCALE *value, const char *argv)
{
bool status = false;
int count;
unsigned integer_scale;
float float_scale;
const char *decimal_point;
if (!status) {
decimal_point = strchr(argv, '.');
if (decimal_point) {
count = sscanf(argv, "%f", &float_scale);
if (count == 1) {
value->float_scale = true;
value->type.real_scale = float_scale;
status = true;
}
}
}
if (!status) {
count = sscanf(argv, "%u", &integer_scale);
if (count == 1) {
value->float_scale = false;
value->type.integer_scale = integer_scale;
status = true;
}
}
return status;
}
#endif
#if defined(BACAPP_SHED_LEVEL)
/**
* @brief Parse a string into a BACnet Shed Level value
* @param value [out] The BACnet Shed Level value
* @param argv [in] The string to parse
* @return True on success, else False
*/
bool bacnet_shed_level_from_ascii(BACNET_SHED_LEVEL *value, const char *argv)
{
bool status = false;
int count;
unsigned percent, level;
float amount;
const char *percentage;
const char *decimal_point;
if (!status) {
percentage = strchr(argv, '%');
if (percentage) {
count = sscanf(argv, "%u", &percent);
if (count == 1) {
value->type = BACNET_SHED_TYPE_PERCENT;
value->value.percent = percent;
status = true;
}
}
}
if (!status) {
decimal_point = strchr(argv, '.');
if (decimal_point) {
count = sscanf(argv, "%f", &amount);
if (count == 1) {
value->type = BACNET_SHED_TYPE_AMOUNT;
value->value.amount = amount;
status = true;
}
}
}
if (!status) {
count = sscanf(argv, "%u", &level);
if (count == 1) {
value->type = BACNET_SHED_TYPE_LEVEL;
value->value.level = level;
status = true;
}
}
return status;
}
#endif
/* used to load the app data struct with the proper data
converted from a command line argument.
"argv" is not const to allow using strtok internally. It MAY be modified. */
@@ -3528,7 +3823,14 @@ bool bacapp_parse_application_data(
#endif
#if defined(BACAPP_SCALE)
case BACNET_APPLICATION_TAG_SCALE:
/* BACnetScale - not implement */
status = bacnet_scale_from_ascii(
&value->type.Scale, argv);
break;
#endif
#if defined(BACAPP_SHED_LEVEL)
case BACNET_APPLICATION_TAG_SHED_LEVEL:
status = bacnet_shed_level_from_ascii(
&value->type.Shed_Level, argv);
break;
#endif
default:
@@ -4075,6 +4377,12 @@ bool bacapp_same_value(
status = bacnet_scale_same(
&value->type.Scale, &test_value->type.Scale);
break;
#endif
#if defined(BACAPP_SHED_LEVEL)
case BACNET_APPLICATION_TAG_SHED_LEVEL:
status = bacnet_shed_level_same(
&value->type.Shed_Level, &test_value->type.Shed_Level);
break;
#endif
case BACNET_APPLICATION_TAG_EMPTYLIST:
status = true;
src/bacnet/bacapp.h
+13
View File
@@ -47,6 +47,16 @@ typedef struct BACnetScale {
} type;
} BACNET_SCALE;
/* The shed levels for the LEVEL choice of BACnetShedLevel. */
typedef struct {
BACNET_SHED_LEVEL_TYPE type;
union {
BACNET_UNSIGNED_INTEGER level;
BACNET_UNSIGNED_INTEGER percent;
float amount;
} value;
} BACNET_SHED_LEVEL;
struct BACnet_Application_Data_Value;
typedef struct BACnet_Application_Data_Value {
bool context_specific; /* true if context specific data */
@@ -146,6 +156,9 @@ typedef struct BACnet_Application_Data_Value {
#endif
#if defined (BACAPP_SCALE)
BACNET_SCALE Scale;
#endif
#if defined(BACAPP_SHED_LEVEL)
BACNET_SHED_LEVEL Shed_Level;
#endif
} type;
/* simple linked list if needed */
src/bacnet/bacenum.h
+9 -1
View File
@@ -1606,7 +1606,9 @@ typedef enum {
/* BACnetActionCommand */
BACNET_APPLICATION_TAG_ACTION_COMMAND,
/* BACnetScale */
BACNET_APPLICATION_TAG_SCALE
BACNET_APPLICATION_TAG_SCALE,
/* BACnetShedLevel */
BACNET_APPLICATION_TAG_SHED_LEVEL
} BACNET_APPLICATION_TAG;
/* note: these are not the real values, */
@@ -2253,6 +2255,12 @@ typedef enum BACnetShedState {
BACNET_SHED_NON_COMPLIANT = 3
} BACNET_SHED_STATE;
typedef enum BACnetShedLevelType {
BACNET_SHED_TYPE_PERCENT, /* Unsigned */
BACNET_SHED_TYPE_LEVEL, /* Unsigned */
BACNET_SHED_TYPE_AMOUNT /* REAL */
} BACNET_SHED_LEVEL_TYPE;
typedef enum BACnetLightingOperation {
BACNET_LIGHTS_NONE = 0,
BACNET_LIGHTS_FADE_TO = 1,
src/bacnet/bactext.c
+1
View File
@@ -144,6 +144,7 @@ INDTEXT_DATA bacnet_application_tag_names[] = { { BACNET_APPLICATION_TAG_NULL,
{ BACNET_APPLICATION_TAG_FDT_ENTRY, "BACnetFDTEntry" },
{ BACNET_APPLICATION_TAG_ACTION_COMMAND, "BACnetActionCommand" },
{ BACNET_APPLICATION_TAG_SCALE, "BACnetScale" },
{ BACNET_APPLICATION_TAG_SHED_LEVEL, "BACnetShedLevel" },
{ 0, NULL } };
const char *bactext_application_tag_name(unsigned index)
src/bacnet/basic/object/ao.c
+2 -1
View File
@@ -317,7 +317,8 @@ bool Analog_Output_Present_Value_Set(
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
if ((priority >= 1) && (priority <= BACNET_MAX_PRIORITY) &&
value >= pObject->Min_Pres_Value && value <= pObject->Max_Pres_Value) {
(value >= pObject->Min_Pres_Value) &&
(value <= pObject->Max_Pres_Value)) {
pObject->Relinquished[priority - 1] = false;
pObject->Priority_Array[priority - 1] = value;
Analog_Output_Present_Value_COV_Detect(
src/bacnet/basic/object/lc.c
+509 -220
View File
File diff suppressed because it is too large Load Diff
src/bacnet/basic/object/lc.h
+34 -2
View File
@@ -16,6 +16,14 @@
#include "bacnet/rp.h"
#include "bacnet/wp.h"
typedef enum bacnet_load_control_state {
SHED_INACTIVE,
SHED_REQUEST_PENDING,
SHED_NON_COMPLIANT,
SHED_COMPLIANT,
MAX_LOAD_CONTROL_STATE
} BACNET_LOAD_CONTROL_STATE;
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
@@ -50,9 +58,21 @@ extern "C" {
BACNET_STACK_EXPORT
void Load_Control_Init(
void);
BACNET_STACK_EXPORT
void Load_Control_State_Machine(
int object_index);
unsigned Load_Control_Priority_For_Writing(
uint32_t object_instance);
BACNET_STACK_EXPORT
bool Load_Control_Priority_For_Writing_Set(
uint32_t object_instance, unsigned priority);
BACNET_STACK_EXPORT
bool Load_Control_Manipulated_Variable_Reference(
uint32_t object_instance,
BACNET_OBJECT_PROPERTY_REFERENCE * object_property_reference);
BACNET_STACK_EXPORT
bool Load_Control_Manipulated_Variable_Reference_Set(
uint32_t object_instance,
BACNET_OBJECT_PROPERTY_REFERENCE * object_property_reference);
BACNET_STACK_EXPORT
int Load_Control_Read_Property(
@@ -62,6 +82,18 @@ extern "C" {
bool Load_Control_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data);
/* functions used for unit testing */
BACNET_STACK_EXPORT
void Load_Control_State_Machine(
int object_index,
BACNET_DATE_TIME *bdatetime);
BACNET_STACK_EXPORT
BACNET_LOAD_CONTROL_STATE Load_Control_State(
int object_index);
BACNET_STACK_EXPORT
BACNET_OBJECT_ID Load_Control_Object_ID(
int object_index);
#ifdef __cplusplus
}
#endif /* __cplusplus */
src/bacnet/config.h
+4 -1
View File
@@ -162,6 +162,7 @@
defined(BACAPP_FDT_ENTRY) || \
defined(BACAPP_ACTION_COMMAND) || \
defined(BACAPP_SCALE) || \
defined(BACAPP_SHED_LEVEL) || \
defined(BACAPP_TYPES_EXTRA))
#define BACAPP_ALL
#endif
@@ -206,6 +207,7 @@
#define BACAPP_FDT_ENTRY
#define BACAPP_ACTION_COMMAND
#define BACAPP_SCALE
#define BACAPP_SHED_LEVEL
#endif
#if defined(BACAPP_DOUBLE) || \
@@ -225,7 +227,8 @@
defined(BACAPP_BDT_ENTRY) || \
defined(BACAPP_FDT_ENTRY) || \
defined(BACAPP_ACTION_COMMAND) || \
defined(BACAPP_SCALE)
defined(BACAPP_SCALE) || \
defined(BACAPP_SHED_LEVEL)
#define BACAPP_COMPLEX_TYPES
#endif
test/CMakeLists.txt
+1 -1
View File
@@ -133,7 +133,7 @@ list(APPEND testdirs
bacnet/basic/object/csv
bacnet/basic/object/device
bacnet/basic/object/iv
#bacnet/basic/object/lc #Tests skipped, redesign to use only API
bacnet/basic/object/lc
bacnet/basic/object/lo
bacnet/basic/object/lsp
bacnet/basic/object/lsz
test/bacnet/basic/object/ai/CMakeLists.txt
+2 -2
View File
@@ -28,7 +28,7 @@ add_compile_definitions(
include_directories(
${SRC_DIR}
${TST_DIR}/bacnet/basic/object
${TST_DIR}/bacnet/basic/object/test
${TST_DIR}/ztest/include
)
@@ -67,7 +67,7 @@ add_executable(${PROJECT_NAME}
# Test and test library files
./src/main.c
./stubs.c
${TST_DIR}/bacnet/basic/object/property_test.c
${TST_DIR}/bacnet/basic/object/test/property_test.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/ao/CMakeLists.txt
+2 -2
View File
@@ -26,7 +26,7 @@ add_compile_definitions(
include_directories(
${SRC_DIR}
${TST_DIR}/bacnet/basic/object
${TST_DIR}/bacnet/basic/object/test
${TST_DIR}/ztest/include
)
@@ -63,7 +63,7 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/basic/sys/keylist.c
# Test and test library files
./src/main.c
${TST_DIR}/bacnet/basic/object/property_test.c
${TST_DIR}/bacnet/basic/object/test/property_test.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/av/CMakeLists.txt
+2 -2
View File
@@ -28,7 +28,7 @@ add_compile_definitions(
include_directories(
${SRC_DIR}
${TST_DIR}/bacnet/basic/object
${TST_DIR}/bacnet/basic/object/test
${TST_DIR}/ztest/include
)
@@ -67,7 +67,7 @@ add_executable(${PROJECT_NAME}
# Test and test library files
./src/main.c
./stubs.c
${TST_DIR}/bacnet/basic/object/property_test.c
${TST_DIR}/bacnet/basic/object/test/property_test.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/bacfile/CMakeLists.txt
+4 -3
View File
@@ -29,6 +29,7 @@ add_compile_definitions(
include_directories(
${SRC_DIR}
${TST_DIR}/ztest/include
${TST_DIR}/bacnet/basic/object/test
)
add_executable(${PROJECT_NAME}
@@ -65,9 +66,9 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/special_event.c
# Test and test library files
./src/main.c
../mock/apdu_mock.c
../mock/device_mock.c
../mock/tsm_mock.c
${TST_DIR}/bacnet/basic/object/test/apdu_mock.c
${TST_DIR}/bacnet/basic/object/test/device_mock.c
${TST_DIR}/bacnet/basic/object/test/tsm_mock.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/bi/CMakeLists.txt
+2 -2
View File
@@ -29,7 +29,7 @@ add_compile_definitions(
include_directories(
${SRC_DIR}
${TST_DIR}/bacnet/basic/object
${TST_DIR}/bacnet/basic/object/test
${TST_DIR}/ztest/include
)
@@ -68,7 +68,7 @@ add_executable(${PROJECT_NAME}
# Test and test library files
./src/main.c
./stubs.c
${TST_DIR}/bacnet/basic/object/property_test.c
${TST_DIR}/bacnet/basic/object/test/property_test.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/bitstring_value/CMakeLists.txt
+2 -2
View File
@@ -27,7 +27,7 @@ add_compile_definitions(
include_directories(
${SRC_DIR}
${TST_DIR}/bacnet/basic/object
${TST_DIR}/bacnet/basic/object/test
${TST_DIR}/ztest/include
)
@@ -64,7 +64,7 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/special_event.c
# Test and test library files
./src/main.c
${TST_DIR}/bacnet/basic/object/property_test.c
${TST_DIR}/bacnet/basic/object/test/property_test.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/blo/CMakeLists.txt
+1 -1
View File
@@ -62,7 +62,7 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/special_event.c
# Test and test library files
./src/main.c
../mock/device_mock.c
${TST_DIR}/bacnet/basic/object/test/device_mock.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/bo/CMakeLists.txt
+2 -2
View File
@@ -27,7 +27,7 @@ add_compile_definitions(
include_directories(
${SRC_DIR}
${TST_DIR}/bacnet/basic/object
${TST_DIR}/bacnet/basic/object/test
${TST_DIR}/ztest/include
)
@@ -65,7 +65,7 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/basic/sys/keylist.c
# Test and test library files
./src/main.c
${TST_DIR}/bacnet/basic/object/property_test.c
${TST_DIR}/bacnet/basic/object/test/property_test.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/bv/CMakeLists.txt
+2 -2
View File
@@ -29,7 +29,7 @@ add_compile_definitions(
include_directories(
${SRC_DIR}
${TST_DIR}/bacnet/basic/object
${TST_DIR}/bacnet/basic/object/test
${TST_DIR}/ztest/include
)
@@ -67,7 +67,7 @@ add_executable(${PROJECT_NAME}
# Test and test library files
./src/main.c
./stubs.c
${TST_DIR}/bacnet/basic/object/property_test.c
${TST_DIR}/bacnet/basic/object/test/property_test.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/calendar/CMakeLists.txt
+1 -1
View File
@@ -64,7 +64,7 @@ add_executable(${PROJECT_NAME}
# Test and test library files
./src/main.c
./stubs.c
../mock/device_mock.c
${TST_DIR}/bacnet/basic/object/test/device_mock.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/channel/CMakeLists.txt
+1 -1
View File
@@ -60,7 +60,7 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/special_event.c
# Test and test library files
./src/main.c
../mock/device_mock.c
${TST_DIR}/bacnet/basic/object/test/device_mock.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/color_object/CMakeLists.txt
+1 -1
View File
@@ -63,7 +63,7 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/special_event.c
# Test and test library files
./src/main.c
../mock/device_mock.c
${TST_DIR}/bacnet/basic/object/test/device_mock.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/color_temperature/CMakeLists.txt
+1 -1
View File
@@ -63,7 +63,7 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/special_event.c
# Test and test library files
./src/main.c
../mock/device_mock.c
${TST_DIR}/bacnet/basic/object/test/device_mock.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/command/CMakeLists.txt
+2 -2
View File
@@ -27,7 +27,7 @@ add_compile_definitions(
include_directories(
${SRC_DIR}
${TST_DIR}/bacnet/basic/object
${TST_DIR}/bacnet/basic/object/test
${TST_DIR}/ztest/include
)
@@ -61,7 +61,7 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/special_event.c
# Test and test library files
./src/main.c
${TST_DIR}/bacnet/basic/object/property_test.c
${TST_DIR}/bacnet/basic/object/test/property_test.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/credential_data_input/CMakeLists.txt
+2 -2
View File
@@ -27,7 +27,7 @@ add_compile_definitions(
include_directories(
${SRC_DIR}
${TST_DIR}/bacnet/basic/object
${TST_DIR}/bacnet/basic/object/test
${TST_DIR}/ztest/include
)
@@ -64,7 +64,7 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/special_event.c
# Test and test library files
./src/main.c
${TST_DIR}/bacnet/basic/object/property_test.c
${TST_DIR}/bacnet/basic/object/test/property_test.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/lc/CMakeLists.txt
+12 -2
View File
@@ -23,11 +23,15 @@ set(ZTST_DIR "${TST_DIR}/ztest/src")
add_compile_definitions(
BIG_ENDIAN=0
CONFIG_ZTEST=1
BACAPP_MINIMAL=1
BACAPP_DATETIME=1
BACAPP_SHED_LEVEL=1
)
include_directories(
${SRC_DIR}
${TST_DIR}/ztest/include
${TST_DIR}/bacnet/basic/object/test
)
add_executable(${PROJECT_NAME}
@@ -47,11 +51,16 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/bactext.c
${SRC_DIR}/bacnet/basic/object/ao.c
${SRC_DIR}/bacnet/basic/sys/bigend.c
${SRC_DIR}/bacnet/datetime.c
${SRC_DIR}/bacnet/basic/sys/debug.c
${SRC_DIR}/bacnet/basic/sys/keylist.c
${SRC_DIR}/bacnet/basic/sys/days.c
${SRC_DIR}/bacnet/cov.c
${SRC_DIR}/bacnet/datetime.c
${SRC_DIR}/bacnet/indtext.c
${SRC_DIR}/bacnet/hostnport.c
${SRC_DIR}/bacnet/lighting.c
${SRC_DIR}/bacnet/proplist.c
${SRC_DIR}/bacnet/rp.c
${SRC_DIR}/bacnet/timestamp.c
${SRC_DIR}/bacnet/wp.c
${SRC_DIR}/bacnet/weeklyschedule.c
@@ -59,9 +68,10 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/dailyschedule.c
${SRC_DIR}/bacnet/calendar_entry.c
${SRC_DIR}/bacnet/special_event.c
./stubs.c
# Test and test library files
./src/main.c
${TST_DIR}/bacnet/basic/object/test/datetime_local.c
${TST_DIR}/bacnet/basic/object/test/property_test.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/lc/src/main.c
+175 -324
View File
@@ -13,6 +13,7 @@
#include <bacnet/bacstr.h>
#include <bacnet/basic/object/ao.h>
#include <bacnet/basic/object/lc.h>
#include <property_test.h>
/* TODO: Refactor basic/object/lc.c to avoid duplication of the following:
*/
@@ -55,7 +56,7 @@ static void
Load_Control_WriteProperty_Request_Shed_Level(int instance, unsigned level)
{
bool status = false;
BACNET_APPLICATION_DATA_VALUE value;
BACNET_APPLICATION_DATA_VALUE value = { 0 };
BACNET_WRITE_PROPERTY_DATA wp_data;
wp_data.object_type = OBJECT_LOAD_CONTROL;
@@ -63,12 +64,11 @@ Load_Control_WriteProperty_Request_Shed_Level(int instance, unsigned level)
wp_data.array_index = BACNET_ARRAY_ALL;
wp_data.priority = BACNET_NO_PRIORITY;
wp_data.object_property = PROP_REQUESTED_SHED_LEVEL;
value.context_specific = true;
value.context_tag = 1;
value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
value.type.Unsigned_Int = level;
wp_data.application_data_len =
bacapp_encode_data(&wp_data.application_data[0], &value);
value.type.Shed_Level.type = BACNET_SHED_TYPE_LEVEL;
value.type.Shed_Level.value.level = level;
wp_data.application_data_len = bacapp_encode_known_property(
&wp_data.application_data[0], &value, wp_data.object_type,
wp_data.object_property);
zassert_true(wp_data.application_data_len > 0, NULL);
status = Load_Control_Write_Property(&wp_data);
zassert_true(status, NULL);
@@ -91,7 +91,7 @@ static void Load_Control_WriteProperty_Enable(int instance, bool enable)
value.tag = BACNET_APPLICATION_TAG_BOOLEAN;
value.type.Boolean = enable;
wp_data.application_data_len =
bacapp_encode_data(&wp_data.application_data[0], &value);
bacapp_encode_application_data(&wp_data.application_data[0], &value);
zassert_true(wp_data.application_data_len > 0, NULL);
status = Load_Control_Write_Property(&wp_data);
zassert_true(status, NULL);
@@ -114,7 +114,7 @@ Load_Control_WriteProperty_Shed_Duration(int instance, unsigned duration)
value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
value.type.Unsigned_Int = duration;
wp_data.application_data_len =
bacapp_encode_data(&wp_data.application_data[0], &value);
bacapp_encode_application_data(&wp_data.application_data[0], &value);
zassert_true(wp_data.application_data_len > 0, NULL);
status = Load_Control_Write_Property(&wp_data);
zassert_true(status, NULL);
@@ -137,7 +137,7 @@ Load_Control_WriteProperty_Duty_Window(int instance, unsigned duration)
value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
value.type.Unsigned_Int = duration;
wp_data.application_data_len =
bacapp_encode_data(&wp_data.application_data[0], &value);
bacapp_encode_application_data(&wp_data.application_data[0], &value);
zassert_true(wp_data.application_data_len > 0, NULL);
status = Load_Control_Write_Property(&wp_data);
zassert_true(status, NULL);
@@ -155,18 +155,12 @@ static void Load_Control_WriteProperty_Start_Time_Wildcards(int instance)
wp_data.array_index = BACNET_ARRAY_ALL;
wp_data.priority = BACNET_NO_PRIORITY;
wp_data.object_property = PROP_START_TIME;
value.context_specific = false;
value.context_tag = 0;
value.tag = BACNET_APPLICATION_TAG_DATE;
datetime_date_wildcard_set(&value.type.Date);
wp_data.application_data_len =
bacapp_encode_data(&wp_data.application_data[0], &value);
zassert_true(wp_data.application_data_len > 0, NULL);
len = wp_data.application_data_len;
value.tag = BACNET_APPLICATION_TAG_TIME;
datetime_time_wildcard_set(&value.type.Time);
wp_data.application_data_len =
bacapp_encode_data(&wp_data.application_data[len], &value);
value.tag = BACNET_APPLICATION_TAG_DATETIME;
datetime_date_wildcard_set(&value.type.Date_Time.date);
datetime_time_wildcard_set(&value.type.Date_Time.time);
wp_data.application_data_len = bacapp_encode_known_property(
&wp_data.application_data[0], &value, wp_data.object_type,
wp_data.object_property);
zassert_true(wp_data.application_data_len > 0, NULL);
wp_data.application_data_len += len;
status = Load_Control_Write_Property(&wp_data);
@@ -193,18 +187,13 @@ static void Load_Control_WriteProperty_Start_Time(
wp_data.array_index = BACNET_ARRAY_ALL;
wp_data.priority = BACNET_NO_PRIORITY;
wp_data.object_property = PROP_START_TIME;
value.context_specific = false;
value.context_tag = 0;
value.tag = BACNET_APPLICATION_TAG_DATE;
datetime_set_date(&value.type.Date, year, month, day);
wp_data.application_data_len =
bacapp_encode_data(&wp_data.application_data[0], &value);
zassert_true(wp_data.application_data_len > 0, NULL);
len = wp_data.application_data_len;
value.tag = BACNET_APPLICATION_TAG_TIME;
datetime_set_time(&value.type.Time, hour, minute, seconds, hundredths);
wp_data.application_data_len =
bacapp_encode_data(&wp_data.application_data[len], &value);
value.tag = BACNET_APPLICATION_TAG_DATETIME;
datetime_set_date(&value.type.Date_Time.date, year, month, day);
datetime_set_time(
&value.type.Date_Time.time, hour, minute, seconds, hundredths);
wp_data.application_data_len = bacapp_encode_known_property(
&wp_data.application_data[0], &value, wp_data.object_type,
wp_data.object_property);
zassert_true(wp_data.application_data_len > 0, NULL);
wp_data.application_data_len += len;
status = Load_Control_Write_Property(&wp_data);
@@ -217,42 +206,45 @@ ZTEST(lc_tests, testLoadControlStateMachine)
static void testLoadControlStateMachine(void)
#endif
{
// TODO: unsigned i = 0, j = 0;
uint8_t level = 0;
unsigned i = 0, j = 0;
float level = 0;
unsigned count = 0;
BACNET_DATE_TIME bdatetime = { 0 };
uint32_t object_instance = 0;
BACNET_OBJECT_PROPERTY_REFERENCE object_property_reference;
bool status;
Analog_Output_Init();
Load_Control_Init();
// TODO: /* validate the triggers for each state change */
// TODO: for (j = 0; j < 20; j++) {
// TODO: Load_Control_State_Machine(0);
// TODO: for (i = 0; i < MAX_LOAD_CONTROLS; i++) {
// TODO: zassert_equal(Load_Control_State[i], SHED_INACTIVE,
// NULL);
// TODO: }
// TODO: }
object_instance = Load_Control_Index_To_Instance(0);
/* validate the triggers for each state change */
for (j = 0; j < 20; j++) {
Load_Control_State_Machine(0, &bdatetime);
count = Load_Control_Count();
for (i = 0; i < count; i++) {
zassert_equal(Load_Control_State(i), SHED_INACTIVE, NULL);
}
}
/* SHED_REQUEST_PENDING */
/* CancelShed - Start time has wildcards */
Load_Control_WriteProperty_Enable(0, true);
Load_Control_WriteProperty_Shed_Duration(0, 60);
Load_Control_WriteProperty_Start_Time_Wildcards(0);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING,
// NULL);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_INACTIVE, NULL);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_REQUEST_PENDING, NULL);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_INACTIVE, NULL);
/* CancelShed - Requested_Shed_Level equal to default value */
Load_Control_Init();
Load_Control_WriteProperty_Request_Shed_Level(0, 0);
Load_Control_WriteProperty_Start_Time(0, 2007, 2, 27, 15, 0, 0, 0);
Load_Control_WriteProperty_Shed_Duration(0, 5);
// TODO: datetime_set_values(&Current_Time, 2007, 2, 27, 15, 0, 0, 0);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING,
// NULL);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_INACTIVE, NULL);
datetime_set_values(&bdatetime, 2007, 2, 27, 15, 0, 0, 0);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_REQUEST_PENDING, NULL);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_INACTIVE, NULL);
/* CancelShed - Non-default values, but Start time is passed */
Load_Control_Init();
@@ -260,12 +252,11 @@ static void testLoadControlStateMachine(void)
Load_Control_WriteProperty_Request_Shed_Level(0, 1);
Load_Control_WriteProperty_Shed_Duration(0, 5);
Load_Control_WriteProperty_Start_Time(0, 2007, 2, 27, 15, 0, 0, 0);
// TODO: datetime_set_values(&Current_Time, 2007, 2, 28, 15, 0, 0, 0);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING,
// NULL);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_INACTIVE, NULL);
datetime_set_values(&bdatetime, 2007, 2, 28, 15, 0, 0, 0);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_REQUEST_PENDING, NULL);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_INACTIVE, NULL);
/* ReconfigurePending - new write received while pending */
Load_Control_Init();
@@ -273,35 +264,27 @@ static void testLoadControlStateMachine(void)
Load_Control_WriteProperty_Request_Shed_Level(0, 1);
Load_Control_WriteProperty_Shed_Duration(0, 5);
Load_Control_WriteProperty_Start_Time(0, 2007, 2, 27, 15, 0, 0, 0);
// TODO: datetime_set_values(&Current_Time, 2007, 2, 27, 5, 0, 0, 0);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING,
// NULL);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING,
// NULL);
datetime_set_values(&bdatetime, 2007, 2, 27, 5, 0, 0, 0);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_REQUEST_PENDING, NULL);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_REQUEST_PENDING, NULL);
Load_Control_WriteProperty_Request_Shed_Level(0, 2);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING,
// NULL);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_REQUEST_PENDING, NULL);
Load_Control_WriteProperty_Shed_Duration(0, 6);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING,
// NULL);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_REQUEST_PENDING, NULL);
Load_Control_WriteProperty_Duty_Window(0, 60);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING,
// NULL);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_REQUEST_PENDING, NULL);
Load_Control_WriteProperty_Start_Time(0, 2007, 2, 27, 15, 0, 0, 1);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING,
// NULL);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING,
// NULL);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING,
// NULL);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_REQUEST_PENDING, NULL);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_REQUEST_PENDING, NULL);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_REQUEST_PENDING, NULL);
/* CannotMeetShed -> FinishedUnsuccessfulShed */
Load_Control_Init();
@@ -309,24 +292,35 @@ static void testLoadControlStateMachine(void)
Load_Control_WriteProperty_Request_Shed_Level(0, 1);
Load_Control_WriteProperty_Shed_Duration(0, 120);
Load_Control_WriteProperty_Start_Time(0, 2007, 2, 27, 15, 0, 0, 0);
// TODO: datetime_set_values(&Current_Time, 2007, 2, 27, 5, 0, 0, 0);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING,
// NULL);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING,
// NULL);
datetime_set_values(&bdatetime, 2007, 2, 27, 5, 0, 0, 0);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_REQUEST_PENDING, NULL);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_REQUEST_PENDING, NULL);
/* set to lowest value so we cannot meet the shed level */
// TODO: datetime_set_values(&Current_Time, 2007, 2, 27, 16, 0, 0, 0);
Analog_Output_Present_Value_Set(0, 0, 16);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_NON_COMPLIANT, NULL);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_NON_COMPLIANT, NULL);
datetime_set_values(&bdatetime, 2007, 2, 27, 16, 0, 0, 0);
Load_Control_Manipulated_Variable_Reference(
object_instance, &object_property_reference);
if ((object_property_reference.object_identifier.type ==
OBJECT_ANALOG_OUTPUT) &&
(object_property_reference.property_identifier == PROP_PRESENT_VALUE)) {
status = Analog_Output_Present_Value_Set(
object_property_reference.object_identifier.instance, 0.0f,
BACNET_MAX_PRIORITY);
zassert_true(status, NULL);
} else {
zassert_true(false, NULL);
}
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_NON_COMPLIANT, NULL);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_NON_COMPLIANT, NULL);
/* FinishedUnsuccessfulShed */
// TODO: datetime_set_values(&Current_Time, 2007, 2, 27, 23, 0, 0, 0);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_INACTIVE, NULL);
datetime_set_values(&bdatetime, 2007, 2, 27, 23, 0, 0, 0);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_INACTIVE, NULL);
/* CannotMeetShed -> UnsuccessfulShedReconfigured */
Load_Control_Init();
@@ -334,45 +328,78 @@ static void testLoadControlStateMachine(void)
Load_Control_WriteProperty_Request_Shed_Level(0, 1);
Load_Control_WriteProperty_Shed_Duration(0, 120);
Load_Control_WriteProperty_Start_Time(0, 2007, 2, 27, 15, 0, 0, 0);
// TODO: datetime_set_values(&Current_Time, 2007, 2, 27, 5, 0, 0, 0);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING,
// NULL);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING,
// NULL);
datetime_set_values(&bdatetime, 2007, 2, 27, 5, 0, 0, 0);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_REQUEST_PENDING, NULL);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_REQUEST_PENDING, NULL);
/* set to lowest value so we cannot meet the shed level */
// TODO: datetime_set_values(&Current_Time, 2007, 2, 27, 16, 0, 0, 0);
Analog_Output_Present_Value_Set(0, 0, 16);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_NON_COMPLIANT, NULL);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_NON_COMPLIANT, NULL);
datetime_set_values(&bdatetime, 2007, 2, 27, 16, 0, 0, 0);
Load_Control_Manipulated_Variable_Reference(
object_instance, &object_property_reference);
if ((object_property_reference.object_identifier.type ==
OBJECT_ANALOG_OUTPUT) &&
(object_property_reference.property_identifier == PROP_PRESENT_VALUE)) {
status = Analog_Output_Present_Value_Set(
object_property_reference.object_identifier.instance, 0.0f,
BACNET_MAX_PRIORITY);
zassert_true(status, NULL);
} else {
zassert_true(false, NULL);
}
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_NON_COMPLIANT, NULL);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_NON_COMPLIANT, NULL);
/* FinishedUnsuccessfulShed */
Load_Control_WriteProperty_Start_Time(0, 2007, 2, 27, 16, 0, 0, 0);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING,
// NULL);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING,
// NULL);
// TODO: datetime_set_values(&Current_Time, 2007, 2, 27, 16, 0, 1, 0);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_NON_COMPLIANT, NULL);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_REQUEST_PENDING, NULL);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_REQUEST_PENDING, NULL);
datetime_set_values(&bdatetime, 2007, 2, 27, 16, 0, 1, 0);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_NON_COMPLIANT, NULL);
/* CanNowComplyWithShed */
Analog_Output_Present_Value_Set(0, 100, 16);
// TODO: datetime_set_values(&Current_Time, 2007, 2, 27, 16, 0, 2, 0);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_COMPLIANT, NULL);
level = Analog_Output_Present_Value(0);
// TODO: Fails: zassert_equal(level, 90, NULL);
Load_Control_Manipulated_Variable_Reference(
object_instance, &object_property_reference);
if ((object_property_reference.object_identifier.type ==
OBJECT_ANALOG_OUTPUT) &&
(object_property_reference.property_identifier == PROP_PRESENT_VALUE)) {
status = Analog_Output_Present_Value_Set(
object_property_reference.object_identifier.instance, 100.0f,
BACNET_MAX_PRIORITY);
zassert_true(status, NULL);
} else {
zassert_true(false, NULL);
}
datetime_set_values(&bdatetime, 2007, 2, 27, 16, 0, 2, 0);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_COMPLIANT, NULL);
Load_Control_Manipulated_Variable_Reference(
object_instance, &object_property_reference);
if ((object_property_reference.object_identifier.type ==
OBJECT_ANALOG_OUTPUT) &&
(object_property_reference.property_identifier == PROP_PRESENT_VALUE)) {
level = Analog_Output_Present_Value(
object_property_reference.object_identifier.instance);
} else {
zassert_true(false, NULL);
}
zassert_false(islessgreater(90.0f, level), "AO Present Value = %f", level);
/* FinishedSuccessfulShed */
// TODO: datetime_set_values(&Current_Time, 2007, 2, 27, 23, 0, 0, 0);
Load_Control_State_Machine(0);
// TODO: zassert_equal(Load_Control_State[0], SHED_INACTIVE, NULL);
level = Analog_Output_Present_Value(0);
// TODO: Fails: zassert_equal(level, 100, NULL);
(void)level; // TODO: remove when level will be checked
datetime_set_values(&bdatetime, 2007, 2, 27, 23, 0, 0, 0);
Load_Control_State_Machine(0, &bdatetime);
zassert_equal(Load_Control_State(0), SHED_INACTIVE, NULL);
if ((object_property_reference.object_identifier.type ==
OBJECT_ANALOG_OUTPUT) &&
(object_property_reference.property_identifier == PROP_PRESENT_VALUE)) {
level = Analog_Output_Present_Value(
object_property_reference.object_identifier.instance);
} else {
zassert_true(false, NULL);
}
zassert_false(islessgreater(100.0f, level), "AO Present Value = %f", level);
}
#ifndef MAX_LOAD_CONTROLS
@@ -421,56 +448,21 @@ ZTEST(lc_tests, test_Load_Control_Read_Write_Property)
static void test_Load_Control_Read_Write_Property(void)
#endif
{
uint8_t apdu[MAX_APDU] = { 0 };
int len = 0;
int test_len = 0;
BACNET_READ_PROPERTY_DATA rpdata;
/* for decode value data */
BACNET_APPLICATION_DATA_VALUE value;
const int *pRequired = NULL;
const int *pOptional = NULL;
const int *pProprietary = NULL;
bool status = false;
unsigned count = 0;
uint32_t object_instance = 0;
zassert_equal(Load_Control_Read_Property(NULL), 0, NULL);
zassert_false(Load_Control_Write_Property(NULL), NULL);
uint32_t object_instance = BACNET_MAX_INSTANCE, test_object_instance = 0;
const int skip_fail_property_list[] = { -1 };
object_instance = Load_Control_Index_To_Instance(0);
Load_Control_Init();
count = Load_Control_Count();
zassert_true(count > 0, NULL);
rpdata.application_data = &apdu[0];
rpdata.application_data_len = sizeof(apdu);
rpdata.object_type = OBJECT_LOAD_CONTROL;
rpdata.object_instance = object_instance;
Load_Control_Property_Lists(&pRequired, &pOptional, &pProprietary);
while ((*pRequired) != -1) {
rpdata.object_property = *pRequired;
rpdata.array_index = BACNET_ARRAY_ALL;
len = Load_Control_Read_Property(&rpdata);
zassert_not_equal(len, BACNET_STATUS_ERROR, NULL);
if (len > 0) {
test_len = bacapp_decode_application_data(
rpdata.application_data, (uint8_t)rpdata.application_data_len,
&value);
zassert_true(test_len >= 0, NULL);
}
pRequired++;
}
while ((*pOptional) != -1) {
rpdata.object_property = *pOptional;
rpdata.array_index = BACNET_ARRAY_ALL;
len = Load_Control_Read_Property(&rpdata);
zassert_not_equal(len, BACNET_STATUS_ERROR, NULL);
if (len > 0) {
test_len = bacapp_decode_application_data(
rpdata.application_data, (uint8_t)rpdata.application_data_len,
&value);
zassert_true(test_len >= 0, NULL);
}
pOptional++;
}
test_object_instance = Load_Control_Index_To_Instance(0);
zassert_equal(object_instance, test_object_instance, NULL);
bacnet_object_properties_read_write_test(
OBJECT_LOAD_CONTROL, object_instance, Load_Control_Property_Lists,
Load_Control_Read_Property, Load_Control_Write_Property,
skip_fail_property_list);
}
static bool init_wp_data_and_value(
@@ -529,136 +521,6 @@ static void test_ShedInactive_gets_RcvShedRequests(void)
zassert_false(Load_Control_Write_Property(&wp_data), NULL);
zassert_equal(wp_data.error_class, ERROR_CLASS_PROPERTY, NULL);
zassert_equal(wp_data.error_code, ERROR_CODE_VALUE_OUT_OF_RANGE, NULL);
/* Verify calls to dependencies are properly made */
// object_property == PROP_REQUESTED_SHED_LEVEL calls
// bacapp_decode_context_data() object_property == PROP_START_TIME calls
// bacapp_decode_application_data() object_property == PROP_SHED_DURATION
// calls nothing object_property == PROP_DUTY_WINDOW calls nothing
// object_property == PROP_SHED_LEVELS calls nothing
// object_property == PROP_ENABLE calls nothing
// default returns error
}
#if defined(CONFIG_ZTEST_NEW_API)
ZTEST(lc_tests, test_ShedReqPending_gets_ReconfigPending)
#else
static void test_ShedReqPending_gets_ReconfigPending(void)
#endif
{
#ifndef UNIT_TESTING
ztest_test_skip();
#endif
}
#if defined(CONFIG_ZTEST_NEW_API)
ZTEST(lc_tests, test_ShedReqPending_gets_CancelShed)
#else
static void test_ShedReqPending_gets_CancelShed(void)
#endif
{
#ifndef UNIT_TESTING
ztest_test_skip();
#endif
}
#if defined(CONFIG_ZTEST_NEW_API)
ZTEST(lc_tests, test_ShedReqPending_gets_CannotMeetShed)
#else
static void test_ShedReqPending_gets_CannotMeetShed(void)
#endif
{
#ifndef UNIT_TESTING
ztest_test_skip();
#endif
}
#if defined(CONFIG_ZTEST_NEW_API)
ZTEST(lc_tests, test_ShedReqPending_gets_PrepareToShed)
#else
static void test_ShedReqPending_gets_PrepareToShed(void)
#endif
{
#ifndef UNIT_TESTING
ztest_test_skip();
#endif
}
#if defined(CONFIG_ZTEST_NEW_API)
ZTEST(lc_tests, test_ShedReqPending_gets_AbleToMeetShed)
#else
static void test_ShedReqPending_gets_AbleToMeetShed(void)
#endif
{
#ifndef UNIT_TESTING
ztest_test_skip();
#endif
}
#if defined(CONFIG_ZTEST_NEW_API)
ZTEST(lc_tests, test_ShedNonCommpliant_gets_UnsuccessfulShedReconfig)
#else
static void test_ShedNonCommpliant_gets_UnsuccessfulShedReconfig(void)
#endif
{
#ifndef UNIT_TESTING
ztest_test_skip();
#endif
}
#if defined(CONFIG_ZTEST_NEW_API)
ZTEST(lc_tests, test_ShedNonCommpliant_gets_FinishedUnsuccessfulShed)
#else
static void test_ShedNonCommpliant_gets_FinishedUnsuccessfulShed(void)
#endif
{
#ifndef UNIT_TESTING
ztest_test_skip();
#endif
}
#if defined(CONFIG_ZTEST_NEW_API)
ZTEST(lc_tests, test_ShedNonCommpliant_gets_CanNowComplyWithShed)
#else
static void test_ShedNonCommpliant_gets_CanNowComplyWithShed(void)
#endif
{
#ifndef UNIT_TESTING
ztest_test_skip();
#endif
}
#if defined(CONFIG_ZTEST_NEW_API)
ZTEST(lc_tests, test_ShedCommpliant_gets_FinishedSuccessfulShed)
#else
static void test_ShedCommpliant_gets_FinishedSuccessfulShed(void)
#endif
{
#ifndef UNIT_TESTING
ztest_test_skip();
#endif
}
#if defined(CONFIG_ZTEST_NEW_API)
ZTEST(lc_tests, test_ShedCommpliant_gets_SuccessfulShedReconfig)
#else
static void test_ShedCommpliant_gets_SuccessfulShedReconfig(void)
#endif
{
#ifndef UNIT_TESTING
ztest_test_skip();
#endif
}
#if defined(CONFIG_ZTEST_NEW_API)
ZTEST(lc_tests, test_ShedCommpliant_gets_CanNoLongerComplyWithShed)
#else
static void test_ShedCommpliant_gets_CanNoLongerComplyWithShed(void)
#endif
{
#ifndef UNIT_TESTING
ztest_test_skip();
#endif
}
/**
@@ -675,18 +537,7 @@ void test_main(void)
ztest_unit_test(test_Load_Control_Count),
ztest_unit_test(test_Load_Control_Read_Write_Property),
ztest_unit_test(testLoadControlStateMachine),
ztest_unit_test(test_ShedInactive_gets_RcvShedRequests),
ztest_unit_test(test_ShedReqPending_gets_ReconfigPending),
ztest_unit_test(test_ShedReqPending_gets_CancelShed),
ztest_unit_test(test_ShedReqPending_gets_CannotMeetShed),
ztest_unit_test(test_ShedReqPending_gets_PrepareToShed),
ztest_unit_test(test_ShedReqPending_gets_AbleToMeetShed),
ztest_unit_test(test_ShedNonCommpliant_gets_UnsuccessfulShedReconfig),
ztest_unit_test(test_ShedNonCommpliant_gets_FinishedUnsuccessfulShed),
ztest_unit_test(test_ShedNonCommpliant_gets_CanNowComplyWithShed),
ztest_unit_test(test_ShedCommpliant_gets_FinishedSuccessfulShed),
ztest_unit_test(test_ShedCommpliant_gets_SuccessfulShedReconfig),
ztest_unit_test(test_ShedCommpliant_gets_CanNoLongerComplyWithShed));
ztest_unit_test(test_ShedInactive_gets_RcvShedRequests));
ztest_run_test_suite(lc_tests);
}
test/bacnet/basic/object/lc/stubs.c
-44
View File
@@ -1,44 +0,0 @@
/**************************************************************************
*
* Copyright (C) 2006 Steve Karg <skarg@users.sourceforge.net>
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*********************************************************************/
/* Binary Input Objects customize for your use */
#include <stdbool.h>
#include <stdint.h>
#include "bacnet/bacapp.h"
#include "bacnet/datetime.h"
void datetime_init(void)
{
}
bool datetime_local(
BACNET_DATE *bdate,
BACNET_TIME *btime,
int16_t *utc_offset_minutes,
bool *dst_active)
{
return true;
}
test/bacnet/basic/object/lo/CMakeLists.txt
+1 -1
View File
@@ -63,7 +63,7 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/special_event.c
# Test and test library files
./src/main.c
../mock/device_mock.c
${TST_DIR}/bacnet/basic/object/test/device_mock.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/lsz/CMakeLists.txt
+2 -2
View File
@@ -26,7 +26,7 @@ add_compile_definitions(
include_directories(
${SRC_DIR}
${TST_DIR}/bacnet/basic/object
${TST_DIR}/bacnet/basic/object/test
${TST_DIR}/ztest/include
)
@@ -62,7 +62,7 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/special_event.c
# Test and test library files
./src/main.c
${TST_DIR}/bacnet/basic/object/property_test.c
${TST_DIR}/bacnet/basic/object/test/property_test.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/ms-input/CMakeLists.txt
+2 -2
View File
@@ -27,7 +27,7 @@ add_compile_definitions(
include_directories(
${SRC_DIR}
${TST_DIR}/bacnet/basic/object
${TST_DIR}/bacnet/basic/object/test
${TST_DIR}/ztest/include
)
@@ -64,7 +64,7 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/basic/sys/keylist.c
# Test and test library files
./src/main.c
${TST_DIR}/bacnet/basic/object/property_test.c
${TST_DIR}/bacnet/basic/object/test/property_test.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/mso/CMakeLists.txt
+2 -2
View File
@@ -27,7 +27,7 @@ add_compile_definitions(
include_directories(
${SRC_DIR}
${TST_DIR}/bacnet/basic/object
${TST_DIR}/bacnet/basic/object/test
${TST_DIR}/ztest/include
)
@@ -65,7 +65,7 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/basic/sys/keylist.c
# Test and test library files
./src/main.c
${TST_DIR}/bacnet/basic/object/property_test.c
${TST_DIR}/bacnet/basic/object/test/property_test.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/msv/CMakeLists.txt
+2 -2
View File
@@ -27,7 +27,7 @@ add_compile_definitions(
include_directories(
${SRC_DIR}
${TST_DIR}/bacnet/basic/object
${TST_DIR}/bacnet/basic/object/test
${TST_DIR}/ztest/include
)
@@ -64,7 +64,7 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/basic/sys/keylist.c
# Test and test library files
./src/main.c
${TST_DIR}/bacnet/basic/object/property_test.c
${TST_DIR}/bacnet/basic/object/test/property_test.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/netport/CMakeLists.txt
+2 -2
View File
@@ -27,7 +27,7 @@ add_compile_definitions(
include_directories(
${SRC_DIR}
${TST_DIR}/bacnet/basic/object
${TST_DIR}/bacnet/basic/object/test
${TST_DIR}/ztest/include
)
@@ -63,7 +63,7 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/special_event.c
# Test and test library files
./src/main.c
${TST_DIR}/bacnet/basic/object/property_test.c
${TST_DIR}/bacnet/basic/object/test/property_test.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/schedule/CMakeLists.txt
+2 -2
View File
@@ -27,7 +27,7 @@ add_compile_definitions(
include_directories(
${SRC_DIR}
${TST_DIR}/bacnet/basic/object
${TST_DIR}/bacnet/basic/object/test
${TST_DIR}/ztest/include
)
@@ -61,7 +61,7 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/special_event.c
# Test and test library files
./src/main.c
${TST_DIR}/bacnet/basic/object/property_test.c
${TST_DIR}/bacnet/basic/object/test/property_test.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/structured_view/CMakeLists.txt
+2 -2
View File
@@ -28,7 +28,7 @@ add_compile_definitions(
include_directories(
${SRC_DIR}
${TST_DIR}/bacnet/basic/object
${TST_DIR}/bacnet/basic/object/test
${TST_DIR}/ztest/include
)
@@ -66,7 +66,7 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/basic/sys/keylist.c
# Test and test library files
./src/main.c
${TST_DIR}/bacnet/basic/object/property_test.c
${TST_DIR}/bacnet/basic/object/test/property_test.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/mock/apdu_mock.c → test/bacnet/basic/object/test/apdu_mock.c
View File
test/bacnet/basic/object/time_value/stubs.c → test/bacnet/basic/object/test/datetime_local.c
+22 -6
View File
@@ -10,19 +10,35 @@
#include <stdint.h>
#include "bacnet/datetime.h"
static BACNET_DATE BACnet_Date;
static BACNET_TIME BACnet_Time;
bool datetime_local(
BACNET_DATE *bdate,
BACNET_TIME *btime,
int16_t *utc_offset_minutes,
bool *dst_active)
{
bdate->year = 2023;
bdate->month = 6;
bdate->day = 26;
bdate->wday = 1;
(void)btime;
if (bdate) {
datetime_copy_date(bdate, &BACnet_Date);
}
if (btime) {
datetime_copy_time(btime, &BACnet_Time);
}
(void)utc_offset_minutes;
(void)dst_active;
return true;
}
void datetime_timesync(
BACNET_DATE *bdate, BACNET_TIME *btime, bool utc)
{
if (bdate) {
datetime_copy_date(&BACnet_Date, bdate);
}
if (btime) {
datetime_copy_time(&BACnet_Time, btime);
}
(void)utc;
}
test/bacnet/basic/object/mock/device_mock.c → test/bacnet/basic/object/test/device_mock.c
View File
test/bacnet/basic/object/property_test.c → test/bacnet/basic/object/test/property_test.c
View File
test/bacnet/basic/object/property_test.h → test/bacnet/basic/object/test/property_test.h
View File
test/bacnet/basic/object/mock/tsm_mock.c → test/bacnet/basic/object/test/tsm_mock.c
View File
test/bacnet/basic/object/time_value/CMakeLists.txt
+4 -4
View File
@@ -27,7 +27,7 @@ add_compile_definitions(
include_directories(
${SRC_DIR}
${TST_DIR}/bacnet/basic/object
${TST_DIR}/bacnet/basic/object/test
${TST_DIR}/ztest/include
)
@@ -64,9 +64,9 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/special_event.c
# Test and test library files
./src/main.c
./stubs.c
../mock/device_mock.c
../property_test.c
${TST_DIR}/bacnet/basic/object/test/datetime_local.c
${TST_DIR}/bacnet/basic/object/test/device_mock.c
${TST_DIR}/bacnet/basic/object/test/property_test.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/trendlog/CMakeLists.txt
+3 -3
View File
@@ -27,7 +27,7 @@ add_compile_definitions(
include_directories(
${SRC_DIR}
${TST_DIR}/bacnet/basic/object
${TST_DIR}/bacnet/basic/object/test
${TST_DIR}/ztest/include
)
@@ -61,8 +61,8 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/special_event.c
# Test and test library files
./src/main.c
../mock/device_mock.c
${TST_DIR}/bacnet/basic/object/property_test.c
${TST_DIR}/bacnet/basic/object/test/device_mock.c
${TST_DIR}/bacnet/basic/object/test/property_test.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
zephyr/tests/bacnet/basic/object/ai/CMakeLists.txt
+1 -1
View File
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
# Update include path for this module
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
if(BOARD STREQUAL unit_testing)
zephyr/tests/bacnet/basic/object/ao/CMakeLists.txt
+1 -1
View File
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
# Update include path for this module
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
if(BOARD STREQUAL unit_testing)
zephyr/tests/bacnet/basic/object/av/CMakeLists.txt
+1 -1
View File
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
# Update include path for this module
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
if(BOARD STREQUAL unit_testing)
zephyr/tests/bacnet/basic/object/bi/CMakeLists.txt
+1 -1
View File
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
# Update include path for this module
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
if(BOARD STREQUAL unit_testing)
zephyr/tests/bacnet/basic/object/bo/CMakeLists.txt
+1 -1
View File
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
# Update include path for this module
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
if(BOARD STREQUAL unit_testing)
zephyr/tests/bacnet/basic/object/bv/CMakeLists.txt
+1 -1
View File
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
# Update include path for this module
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
if(BOARD STREQUAL unit_testing)
zephyr/tests/bacnet/basic/object/calendar/CMakeLists.txt
+2 -1
View File
@@ -19,6 +19,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
# Update include path for this module
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
if(BOARD STREQUAL unit_testing)
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
@@ -27,7 +28,7 @@ if(BOARD STREQUAL unit_testing)
${BACNET_SRC_PATH}.c
${BACNET_TEST_PATH}/src/main.c
${BACNET_TEST_PATH}/stubs.c
${BACNET_TEST_PATH}/../mock/device_mock.c
${TEST_OBJECT_SRC}/device_mock.c
)
get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH)
zephyr/tests/bacnet/basic/object/color_object/CMakeLists.txt
+2 -1
View File
@@ -19,6 +19,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
# Update include path for this module
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
if(BOARD STREQUAL unit_testing)
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
@@ -26,7 +27,7 @@ if(BOARD STREQUAL unit_testing)
list(APPEND SOURCES
${BACNET_SRC_PATH}.c
${BACNET_TEST_PATH}/src/main.c
${BACNET_TEST_PATH}/../mock/device_mock.c
${TEST_OBJECT_SRC}/device_mock.c
)
get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH)
zephyr/tests/bacnet/basic/object/color_temperature/CMakeLists.txt
+2 -1
View File
@@ -19,6 +19,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
# Update include path for this module
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
if(BOARD STREQUAL unit_testing)
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
@@ -26,7 +27,7 @@ if(BOARD STREQUAL unit_testing)
list(APPEND SOURCES
${BACNET_SRC_PATH}.c
${BACNET_TEST_PATH}/src/main.c
${BACNET_TEST_PATH}/../mock/device_mock.c
${TEST_OBJECT_SRC}/device_mock.c
)
get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH)
zephyr/tests/bacnet/basic/object/command/CMakeLists.txt
+1 -1
View File
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
# Update include path for this module
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
if(BOARD STREQUAL unit_testing)
zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt
+1 -1
View File
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
# Update include path for this module
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
if(BOARD STREQUAL unit_testing)
zephyr/tests/bacnet/basic/object/lo/CMakeLists.txt
+2 -1
View File
@@ -19,6 +19,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
# Update include path for this module
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
if(BOARD STREQUAL unit_testing)
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
@@ -26,7 +27,7 @@ if(BOARD STREQUAL unit_testing)
list(APPEND SOURCES
${BACNET_SRC_PATH}.c
${BACNET_TEST_PATH}/src/main.c
${BACNET_TEST_PATH}/../mock/device_mock.c
${TEST_OBJECT_SRC}/device_mock.c
)
get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH)
zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt
+1 -1
View File
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
# Update include path for this module
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
if(BOARD STREQUAL unit_testing)
zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt
+1 -1
View File
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
# Update include path for this module
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
if(BOARD STREQUAL unit_testing)
zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt
+1 -1
View File
@@ -19,7 +19,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
# Update include path for this module
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
if(BOARD STREQUAL unit_testing)
zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt
+1 -1
View File
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
# Update include path for this module
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
if(BOARD STREQUAL unit_testing)
zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt
+1 -1
View File
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
# Update include path for this module
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
if(BOARD STREQUAL unit_testing)
zephyr/tests/bacnet/basic/object/time_value/CMakeLists.txt
+3 -3
View File
@@ -20,7 +20,7 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
# Update include path for this module
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
if(BOARD STREQUAL unit_testing)
@@ -30,9 +30,9 @@ if(BOARD STREQUAL unit_testing)
list(APPEND SOURCES
${BACNET_SRC_PATH}.c
${BACNET_TEST_PATH}/src/main.c
${BACNET_TEST_PATH}/stubs.c
${TEST_OBJECT_SRC}/datetime_local.c
${TEST_OBJECT_SRC}/property_test.c
${BACNET_TEST_PATH}/../mock/device_mock.c
${TEST_OBJECT_SRC}/device_mock.c
)
get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH)