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

Changed testBitstring to use the bitstring library compare function.

Browse Source
This commit is contained in:
skarg
2010-12-24 02:39:21 +00:00
parent db686a4984
commit 4fa4a79b6c
1 changed files with 28 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/src/event.c
+28 -36
View File
@@ -875,19 +875,6 @@ int event_notify_decode_service_request(
BACNET_EVENT_NOTIFICATION_DATA data; BACNET_EVENT_NOTIFICATION_DATA data;
BACNET_EVENT_NOTIFICATION_DATA data2; BACNET_EVENT_NOTIFICATION_DATA data2;
void testBitstring(
Test * pTest,
BACNET_BIT_STRING * bs1,
BACNET_BIT_STRING * bs2)
{
int i;
ct_test(pTest, bs1->bits_used == bs2->bits_used);
for (i = 0; i < MAX_BITSTRING_BYTES; i++) {
ct_test(pTest, bs1->value[i] == bs2->value[i]);
}
}
void testBaseEventState( void testBaseEventState(
Test * pTest) Test * pTest)
{ {
@@ -1033,9 +1020,9 @@ void testEventEventState(
data.notificationParams.changeOfState.newState.state.units == data.notificationParams.changeOfState.newState.state.units ==
data2.notificationParams.changeOfState.newState.state.units); data2.notificationParams.changeOfState.newState.state.units);
testBitstring(pTest, &data.notificationParams.changeOfState.statusFlags, ct_test(pTest, bitstring_same(
&data2.notificationParams.changeOfState.statusFlags); &data.notificationParams.changeOfState.statusFlags,
&data2.notificationParams.changeOfState.statusFlags));
/**********************************************************************************/ /**********************************************************************************/
/**********************************************************************************/ /**********************************************************************************/
@@ -1045,8 +1032,8 @@ void testEventEventState(
/**********************************************************************************/ /**********************************************************************************/
/**********************************************************************************/ /**********************************************************************************/
/* /*
** Same, but timestamp of ** Same, but timestamp of
*/ */
data.timeStamp.tag = TIME_STAMP_DATETIME; data.timeStamp.tag = TIME_STAMP_DATETIME;
data.timeStamp.value.dateTime.time.hour = 1; data.timeStamp.value.dateTime.time.hour = 1;
@@ -1123,13 +1110,13 @@ void testEventEventState(
ct_test(pTest, inLen == outLen); ct_test(pTest, inLen == outLen);
testBaseEventState(pTest); testBaseEventState(pTest);
testBitstring(pTest, ct_test(pTest, bitstring_same(
&data.notificationParams.changeOfBitstring.referencedBitString, &data.notificationParams.changeOfBitstring.referencedBitString,
&data2.notificationParams.changeOfBitstring.referencedBitString); &data2.notificationParams.changeOfBitstring.referencedBitString));
testBitstring(pTest, ct_test(pTest, bitstring_same(
&data.notificationParams.changeOfBitstring.statusFlags, &data.notificationParams.changeOfBitstring.statusFlags,
&data2.notificationParams.changeOfBitstring.statusFlags); &data2.notificationParams.changeOfBitstring.statusFlags));
/**********************************************************************************/ /**********************************************************************************/
/**********************************************************************************/ /**********************************************************************************/
@@ -1167,8 +1154,9 @@ void testEventEventState(
ct_test(pTest, inLen == outLen); ct_test(pTest, inLen == outLen);
testBaseEventState(pTest); testBaseEventState(pTest);
testBitstring(pTest, &data.notificationParams.changeOfValue.statusFlags, ct_test(pTest, bitstring_same(
&data2.notificationParams.changeOfValue.statusFlags); &data.notificationParams.changeOfValue.statusFlags,
&data2.notificationParams.changeOfValue.statusFlags));
ct_test(pTest, ct_test(pTest,
data.notificationParams.changeOfValue.tag == data.notificationParams.changeOfValue.tag ==
@@ -1207,16 +1195,17 @@ void testEventEventState(
ct_test(pTest, inLen == outLen); ct_test(pTest, inLen == outLen);
testBaseEventState(pTest); testBaseEventState(pTest);
testBitstring(pTest, &data.notificationParams.changeOfValue.statusFlags, ct_test(pTest, bitstring_same(
&data2.notificationParams.changeOfValue.statusFlags); &data.notificationParams.changeOfValue.statusFlags,
&data2.notificationParams.changeOfValue.statusFlags));
ct_test(pTest, ct_test(pTest,
data.notificationParams.changeOfValue.tag == data.notificationParams.changeOfValue.tag ==
data2.notificationParams.changeOfValue.tag); data2.notificationParams.changeOfValue.tag);
testBitstring(pTest, ct_test(pTest, bitstring_same(
&data.notificationParams.changeOfValue.newValue.changedBits, &data.notificationParams.changeOfValue.newValue.changedBits,
&data2.notificationParams.changeOfValue.newValue.changedBits); &data2.notificationParams.changeOfValue.newValue.changedBits));
/**********************************************************************************/ /**********************************************************************************/
/**********************************************************************************/ /**********************************************************************************/
@@ -1265,8 +1254,9 @@ void testEventEventState(
ct_test(pTest, ct_test(pTest,
data.notificationParams.floatingLimit.errorLimit == data.notificationParams.floatingLimit.errorLimit ==
data2.notificationParams.floatingLimit.errorLimit); data2.notificationParams.floatingLimit.errorLimit);
testBitstring(pTest, &data.notificationParams.floatingLimit.statusFlags, ct_test(pTest, bitstring_same(
&data2.notificationParams.floatingLimit.statusFlags); &data.notificationParams.floatingLimit.statusFlags,
&data2.notificationParams.floatingLimit.statusFlags));
/**********************************************************************************/ /**********************************************************************************/
@@ -1316,8 +1306,9 @@ void testEventEventState(
ct_test(pTest, ct_test(pTest,
data.notificationParams.outOfRange.exceedingValue == data.notificationParams.outOfRange.exceedingValue ==
data2.notificationParams.outOfRange.exceedingValue); data2.notificationParams.outOfRange.exceedingValue);
testBitstring(pTest, &data.notificationParams.outOfRange.statusFlags, ct_test(pTest, bitstring_same(
&data2.notificationParams.outOfRange.statusFlags); &data.notificationParams.outOfRange.statusFlags,
&data2.notificationParams.outOfRange.statusFlags));
/**********************************************************************************/ /**********************************************************************************/
/**********************************************************************************/ /**********************************************************************************/
@@ -1370,9 +1361,9 @@ void testEventEventState(
data.notificationParams.changeOfLifeSafety.operationExpected == data.notificationParams.changeOfLifeSafety.operationExpected ==
data2.notificationParams.changeOfLifeSafety.operationExpected); data2.notificationParams.changeOfLifeSafety.operationExpected);
testBitstring(pTest, ct_test(pTest, bitstring_same(
&data.notificationParams.changeOfLifeSafety.statusFlags, &data.notificationParams.changeOfLifeSafety.statusFlags,
&data2.notificationParams.changeOfLifeSafety.statusFlags); &data2.notificationParams.changeOfLifeSafety.statusFlags));
/**********************************************************************************/ /**********************************************************************************/
/**********************************************************************************/ /**********************************************************************************/
@@ -1417,8 +1408,9 @@ void testEventEventState(
data.notificationParams.unsignedRange.exceededLimit == data.notificationParams.unsignedRange.exceededLimit ==
data2.notificationParams.unsignedRange.exceededLimit); data2.notificationParams.unsignedRange.exceededLimit);
testBitstring(pTest, &data.notificationParams.unsignedRange.statusFlags, ct_test(pTest, bitstring_same(
&data2.notificationParams.unsignedRange.statusFlags); &data.notificationParams.unsignedRange.statusFlags,
&data2.notificationParams.unsignedRange.statusFlags));
/**********************************************************************************/ /**********************************************************************************/
/**********************************************************************************/ /**********************************************************************************/