Fixed unit tests under Linux after DCC changes.

This commit is contained in:
skarg
2006-02-13 22:14:03 +00:00
parent c3f87b3ad3
commit a550441f4e
11 changed files with 36 additions and 3 deletions
+2 -2
View File
@@ -739,10 +739,10 @@ void testBACnetApplicationData(Test * pTest)
status = bacapp_parse_application_data(
BACNET_APPLICATION_TAG_DATE,
"5/5/22:1",
"2005/5/22:1",
&value);
ct_test(pTest,status == true);
ct_test(pTest,value.type.Date.year == 5);
ct_test(pTest,value.type.Date.year == 2005);
ct_test(pTest,value.type.Date.month == 5);
ct_test(pTest,value.type.Date.day == 22);
ct_test(pTest,value.type.Date.wday == 1);
+2
View File
@@ -10,6 +10,8 @@ SRCS = bacdcode.c \
bacstr.c \
bacapp.c \
bigend.c \
bactext.c \
indtext.c \
test/ctest.c
OBJS = ${SRCS:.c=.o}
+8
View File
@@ -1393,6 +1393,14 @@ int decode_bacnet_time(uint8_t * apdu, int *hour, int *min, int *sec,
int encode_bacnet_date(uint8_t * apdu, int year, int month, int day,
int wday)
{
/* allow 2 digit years */
if (year < 1900)
{
if (year <= 38)
year += 2000;
else
year += 1900;
}
apdu[0] = year - 1900;
apdu[1] = month;
apdu[2] = day;
+1
View File
@@ -11,6 +11,7 @@ SRCS = bacdcode.c \
bigend.c \
bacstr.c \
apdu.c \
dcc.c \
demo/object/device.c \
test/ctest.c
+1
View File
@@ -11,6 +11,7 @@ SRCS = bacdcode.c \
bigend.c \
npdu.c \
apdu.c \
dcc.c \
iam.c \
test/ctest.c
+1
View File
@@ -11,6 +11,7 @@ SRCS = bacdcode.c \
bigend.c \
npdu.c \
apdu.c \
dcc.c \
test/ctest.c
OBJS = ${SRCS:.c=.o}
+2
View File
@@ -9,6 +9,8 @@ CFLAGS = -Wall -I. -Itest -DTEST -DTEST_READ_PROPERTY_MULTIPLE -g
SRCS = bacdcode.c \
bacerror.c \
bacapp.c \
bactext.c \
indtext.c \
bacstr.c \
bigend.c \
rpm.c \
+1
View File
@@ -13,6 +13,7 @@ SRCS = address.c \
demo/object/ai.c \
demo/object/ao.c \
iam.c \
dcc.c \
npdu.c \
apdu.c \
datalink.c \
+15
View File
@@ -14,6 +14,11 @@ make -f address.mak
./address >> test.log
make -f address.mak clean
make -f dcc.mak clean
make -f dcc.mak
./dcc >> test.log
make -f dcc.mak clean
make -f demo/object/ai.mak clean
make -f demo/object/ai.mak
./analog_input >> test.log
@@ -84,6 +89,11 @@ make -f npdu.mak
./npdu >> test.log
make -f npdu.mak clean
make -f rd.mak clean
make -f rd.mak
./reinitialize_device >> test.log
make -f rd.mak clean
make -f reject.mak clean
make -f reject.mak
./reject >> test.log
@@ -119,6 +129,11 @@ make -f whois.mak
./whois >> test.log
make -f whois.mak clean
make -f whohas.mak clean
make -f whohas.mak
./whohas >> test.log
make -f whohas.mak clean
make -f wp.mak clean
make -f wp.mak
./writeproperty >> test.log
+1 -1
View File
@@ -332,7 +332,7 @@ void testWriteProperty(Test * pTest)
testWritePropertyTag(pTest, &data);
data.value.tag = BACNET_APPLICATION_TAG_DATE;
data.value.type.Date.year = 5;
data.value.type.Date.year = 2005;
data.value.type.Date.month = 5;
data.value.type.Date.day = 22;
data.value.type.Date.wday = 1;
+2
View File
@@ -10,6 +10,8 @@ SRCS = bacdcode.c \
bacstr.c \
bigend.c \
bacapp.c \
bactext.c \
indtext.c \
wp.c \
test/ctest.c