Fixed unit test for Load Control object and Address module. Thank you to Chris Ellec for the patches.
This commit is contained in:
@@ -526,12 +526,20 @@ bool WPValidateArgType(
|
|||||||
BACNET_ERROR_CLASS * pErrorClass,
|
BACNET_ERROR_CLASS * pErrorClass,
|
||||||
BACNET_ERROR_CODE * pErrorCode)
|
BACNET_ERROR_CODE * pErrorCode)
|
||||||
{
|
{
|
||||||
pValue = pValue;
|
bool bResult;
|
||||||
ucExpectedTag = ucExpectedTag;
|
|
||||||
pErrorClass = pErrorClass;
|
|
||||||
pErrorCode = pErrorCode;
|
|
||||||
|
|
||||||
return false;
|
/*
|
||||||
|
* start out assuming success and only set up error
|
||||||
|
* response if validation fails.
|
||||||
|
*/
|
||||||
|
bResult = true;
|
||||||
|
if (pValue->tag != ucExpectedTag) {
|
||||||
|
bResult = false;
|
||||||
|
*pErrorClass = ERROR_CLASS_PROPERTY;
|
||||||
|
*pErrorCode = ERROR_CODE_INVALID_DATA_TYPE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (bResult);
|
||||||
}
|
}
|
||||||
|
|
||||||
void testAnalogOutput(
|
void testAnalogOutput(
|
||||||
|
|||||||
@@ -1467,6 +1467,7 @@ void testLoadControl(
|
|||||||
uint32_t decoded_instance = 0;
|
uint32_t decoded_instance = 0;
|
||||||
BACNET_READ_PROPERTY_DATA rpdata;
|
BACNET_READ_PROPERTY_DATA rpdata;
|
||||||
|
|
||||||
|
Analog_Output_Init();
|
||||||
Load_Control_Init();
|
Load_Control_Init();
|
||||||
rpdata.application_data = &apdu[0];
|
rpdata.application_data = &apdu[0];
|
||||||
rpdata.application_data_len = sizeof(apdu);
|
rpdata.application_data_len = sizeof(apdu);
|
||||||
|
|||||||
@@ -1045,6 +1045,7 @@ static void set_file_address(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef BACNET_ADDRESS_CACHE_FILE
|
||||||
void testAddressFile(
|
void testAddressFile(
|
||||||
Test * pTest)
|
Test * pTest)
|
||||||
{
|
{
|
||||||
@@ -1091,6 +1092,7 @@ void testAddressFile(
|
|||||||
ct_test(pTest, bacnet_address_same(&test_address, &src));
|
ct_test(pTest, bacnet_address_same(&test_address, &src));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void testAddress(
|
void testAddress(
|
||||||
Test * pTest)
|
Test * pTest)
|
||||||
@@ -1152,8 +1154,10 @@ int main(
|
|||||||
/* individual tests */
|
/* individual tests */
|
||||||
rc = ct_addTestFunction(pTest, testAddress);
|
rc = ct_addTestFunction(pTest, testAddress);
|
||||||
assert(rc);
|
assert(rc);
|
||||||
|
#ifdef BACNET_ADDRESS_CACHE_FILE
|
||||||
rc = ct_addTestFunction(pTest, testAddressFile);
|
rc = ct_addTestFunction(pTest, testAddressFile);
|
||||||
assert(rc);
|
assert(rc);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
ct_setStream(pTest, stdout);
|
ct_setStream(pTest, stdout);
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
CC = gcc
|
CC = gcc
|
||||||
SRC_DIR = ../src
|
SRC_DIR = ../src
|
||||||
INCLUDES = -I../include -I.
|
INCLUDES = -I../include -I.
|
||||||
DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_ADDRESS
|
DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_ADDRESS -DBACNET_ADDRESS_CACHE_FILE
|
||||||
|
|
||||||
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
|
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user