From 3626b302c8a99d294207d1a65c0967df071e7b00 Mon Sep 17 00:00:00 2001 From: skarg Date: Sat, 24 Oct 2009 18:13:59 +0000 Subject: [PATCH] corrected to pass unit testing --- bacnet-stack/src/bacstr.c | 1 + bacnet-stack/src/getevent.c | 14 +++++++++++--- bacnet-stack/test/address.mak | 8 ++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/bacnet-stack/src/bacstr.c b/bacnet-stack/src/bacstr.c index 10b9b0e2..63f64363 100644 --- a/bacnet-stack/src/bacstr.c +++ b/bacnet-stack/src/bacstr.c @@ -596,6 +596,7 @@ bool octetstring_value_same( #include #include #include +#include #include "ctest.h" void testBitString( diff --git a/bacnet-stack/src/getevent.c b/bacnet-stack/src/getevent.c index cc91972e..a0c9b246 100644 --- a/bacnet-stack/src/getevent.c +++ b/bacnet-stack/src/getevent.c @@ -417,12 +417,20 @@ void testGetEventInformationAck( } event_data.next = NULL; - len = - getevent_ack_encode_apdu(&apdu[0], sizeof(apdu), invoke_id, - &event_data, moreEvents); + len = getevent_ack_encode_apdu_init(&apdu[0], sizeof(apdu), invoke_id); ct_test(pTest, len != 0); ct_test(pTest, len != -1); apdu_len = len; + len = getevent_ack_encode_apdu_data(&apdu[apdu_len], + sizeof(apdu)-apdu_len, &event_data); + ct_test(pTest, len != 0); + ct_test(pTest, len != -1); + apdu_len += len; + len = getevent_ack_encode_apdu_end(&apdu[apdu_len], + sizeof(apdu)-apdu_len, moreEvents); + ct_test(pTest, len != 0); + ct_test(pTest, len != -1); + apdu_len += len; len = getevent_ack_decode_apdu(&apdu[0], apdu_len, /* total length of the apdu */ &test_invoke_id, &test_event_data, &test_moreEvents); ct_test(pTest, len != -1); diff --git a/bacnet-stack/test/address.mak b/bacnet-stack/test/address.mak index 0ca25ad7..0940b39e 100644 --- a/bacnet-stack/test/address.mak +++ b/bacnet-stack/test/address.mak @@ -8,6 +8,14 @@ CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g SRCS = $(SRC_DIR)/address.c \ $(SRC_DIR)/bacaddr.c \ + $(SRC_DIR)/bacdcode.c \ + $(SRC_DIR)/bacint.c \ + $(SRC_DIR)/bacstr.c \ + $(SRC_DIR)/bacreal.c \ + $(SRC_DIR)/bacapp.c \ + $(SRC_DIR)/datetime.c \ + $(SRC_DIR)/bactext.c \ + $(SRC_DIR)/indtext.c \ ctest.c OBJS = ${SRCS:.c=.o}