From b6fcd46b932768b26c92d1f0b206f69dd2efd77d Mon Sep 17 00:00:00 2001 From: skarg Date: Mon, 22 Jan 2007 22:13:34 +0000 Subject: [PATCH] Added datetime to unit tests that depended on it. --- bacnet-stack/bacapp.c | 10 ++++++---- bacnet-stack/bacapp.mak | 2 +- bacnet-stack/cov.mak | 2 +- bacnet-stack/datetime.h | 18 +++++++++--------- bacnet-stack/demo/object/ao.mak | 2 +- bacnet-stack/demo/object/av.mak | 2 +- bacnet-stack/demo/object/bo.mak | 2 +- bacnet-stack/demo/object/bv.mak | 2 +- bacnet-stack/demo/object/device.mak | 2 +- bacnet-stack/demo/object/lc.mak | 2 +- bacnet-stack/demo/object/lsp.mak | 2 +- bacnet-stack/demo/object/mso.mak | 2 +- bacnet-stack/rpm.mak | 2 +- bacnet-stack/tsm.mak | 2 +- bacnet-stack/wp.mak | 2 +- 15 files changed, 28 insertions(+), 26 deletions(-) diff --git a/bacnet-stack/bacapp.c b/bacnet-stack/bacapp.c index 36733ea4..7dd66470 100644 --- a/bacnet-stack/bacapp.c +++ b/bacnet-stack/bacapp.c @@ -765,12 +765,14 @@ bool bacapp_same_value(BACNET_APPLICATION_DATA_VALUE * value, status = false; break; case BACNET_APPLICATION_TAG_DATE: - status = bacapp_same_date(&test_value->type.Date, - &value->type.Date); + if (datetime_compare_date(&test_value->type.Date, + &value->type.Date) != 0) + status = false; break; case BACNET_APPLICATION_TAG_TIME: - status = bacapp_same_time(&test_value->type.Time, - &value->type.Time); + if (datetime_compare_time(&test_value->type.Time, + &value->type.Time) != 0) + status = false; break; case BACNET_APPLICATION_TAG_OBJECT_ID: if (test_value->type.Object_Id.type != diff --git a/bacnet-stack/bacapp.mak b/bacnet-stack/bacapp.mak index 04b30e2a..458c2e90 100644 --- a/bacnet-stack/bacapp.mak +++ b/bacnet-stack/bacapp.mak @@ -9,7 +9,7 @@ CFLAGS = -Wall -I. -Itest -DTEST -DTEST_BACNET_APPLICATION_DATA -g SRCS = bacdcode.c \ bacstr.c \ bacapp.c \ - bigend.c \ + datetime.c \ bactext.c \ indtext.c \ test/ctest.c diff --git a/bacnet-stack/cov.mak b/bacnet-stack/cov.mak index 6e1280fc..adab2c62 100644 --- a/bacnet-stack/cov.mak +++ b/bacnet-stack/cov.mak @@ -8,7 +8,7 @@ CFLAGS = -Wall -I. -Itest -Idemo/object -DTEST -DTEST_COV -g SRCS = bacdcode.c \ bacstr.c \ - bigend.c \ + datetime.c \ bacapp.c \ indtext.c \ bactext.c \ diff --git a/bacnet-stack/datetime.h b/bacnet-stack/datetime.h index 9b9f9aa2..ea1b7076 100644 --- a/bacnet-stack/datetime.h +++ b/bacnet-stack/datetime.h @@ -31,8 +31,8 @@ License. ------------------------------------------- ####COPYRIGHTEND####*/ -#ifndef DATETIME_H -#define DATETIME_H +#ifndef DATE_TIME_H +#define DATE_TIME_H #include #include @@ -67,10 +67,10 @@ extern "C" { uint16_t year, uint8_t month, uint8_t day); void datetime_set_time(BACNET_TIME * btime, uint8_t hour, uint8_t minute, uint8_t seconds, uint8_t hundredths); - void datetime_set_datetime(BACNET_DATE_TIME * bdatetime, + void datetime_set(BACNET_DATE_TIME * bdatetime, BACNET_DATE * bdate, BACNET_TIME * btime); - void datetime_set_datetime_values(BACNET_DATE_TIME * bdatetime, + void datetime_set_values(BACNET_DATE_TIME * bdatetime, uint16_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t seconds, uint8_t hundredths); @@ -78,16 +78,16 @@ extern "C" { if the date/times are the same, return is 0 if date1 is before date2, returns negative if date1 is after date2, returns positive */ - int datetime_date_compare(BACNET_DATE * date1, BACNET_DATE * date2); - int datetime_time_compare(BACNET_TIME * time1, BACNET_TIME * time2); - int datetime_datetime_compare( + int datetime_compare_date(BACNET_DATE * date1, BACNET_DATE * date2); + int datetime_compare_time(BACNET_TIME * time1, BACNET_TIME * time2); + int datetime_compare( BACNET_DATE_TIME * datetime1, BACNET_DATE_TIME * datetime2); /* utility copy functions */ void datetime_copy_date(BACNET_DATE * date1, BACNET_DATE * date2); void datetime_copy_time(BACNET_TIME * time1, BACNET_TIME * time2); - void datetime_copy_datetime( + void datetime_copy( BACNET_DATE_TIME * datetime1, BACNET_DATE_TIME * datetime2); @@ -95,5 +95,5 @@ extern "C" { } #endif /* __cplusplus */ -#endif /* DATETIME_H */ +#endif /* DATE_TIME_H */ diff --git a/bacnet-stack/demo/object/ao.mak b/bacnet-stack/demo/object/ao.mak index 84b17d05..d5beabbf 100755 --- a/bacnet-stack/demo/object/ao.mak +++ b/bacnet-stack/demo/object/ao.mak @@ -9,7 +9,7 @@ CFLAGS = -Wall -I. -Itest -DTEST -DTEST_ANALOG_OUTPUT -g # NOTE: this file is normally called by the unittest.sh from up directory SRCS = bacdcode.c \ bacstr.c \ - bigend.c \ + datetime.c \ bacapp.c \ bactext.c \ indtext.c \ diff --git a/bacnet-stack/demo/object/av.mak b/bacnet-stack/demo/object/av.mak index 26306169..c9af62bd 100644 --- a/bacnet-stack/demo/object/av.mak +++ b/bacnet-stack/demo/object/av.mak @@ -9,7 +9,7 @@ CFLAGS = -Wall -I. -Itest -DTEST -DTEST_ANALOG_VALUE -g # NOTE: this file is normally called by the unittest.sh from up directory SRCS = bacdcode.c \ bacstr.c \ - bigend.c \ + datetime.c \ bacapp.c \ bactext.c \ indtext.c \ diff --git a/bacnet-stack/demo/object/bo.mak b/bacnet-stack/demo/object/bo.mak index 3810dea4..84cefbab 100755 --- a/bacnet-stack/demo/object/bo.mak +++ b/bacnet-stack/demo/object/bo.mak @@ -9,7 +9,7 @@ CFLAGS = -Wall -I. -Itest -DTEST -DTEST_BINARY_OUTPUT -g # NOTE: this file is normally called by the unittest.sh from up directory SRCS = bacdcode.c \ bacstr.c \ - bigend.c \ + datetime.c \ bacapp.c \ bactext.c \ indtext.c \ diff --git a/bacnet-stack/demo/object/bv.mak b/bacnet-stack/demo/object/bv.mak index cd6d6a30..2d24d359 100644 --- a/bacnet-stack/demo/object/bv.mak +++ b/bacnet-stack/demo/object/bv.mak @@ -9,7 +9,7 @@ CFLAGS = -Wall -I. -Itest -DTEST -DTEST_BINARY_VALUE -g # NOTE: this file is normally called by the unittest.sh from up directory SRCS = bacdcode.c \ bacstr.c \ - bigend.c \ + datetime.c \ bacapp.c \ bactext.c \ indtext.c \ diff --git a/bacnet-stack/demo/object/device.mak b/bacnet-stack/demo/object/device.mak index 23cad631..ca3893dc 100644 --- a/bacnet-stack/demo/object/device.mak +++ b/bacnet-stack/demo/object/device.mak @@ -8,7 +8,7 @@ CFLAGS = -Wall -I. -Itest -DTEST -DTEST_DEVICE -g # NOTE: this file is normally called by the unittest.sh from up directory SRCS = bacdcode.c \ - bigend.c \ + datetime.c \ bacstr.c \ bacapp.c \ bactext.c \ diff --git a/bacnet-stack/demo/object/lc.mak b/bacnet-stack/demo/object/lc.mak index 23e1c041..6e8ae3ba 100644 --- a/bacnet-stack/demo/object/lc.mak +++ b/bacnet-stack/demo/object/lc.mak @@ -9,7 +9,7 @@ CFLAGS = -Wall -I. -Itest -DTEST -DTEST_LOAD_CONTROL -g # NOTE: this file is normally called by the unittest.sh from up directory SRCS = bacdcode.c \ bacstr.c \ - bigend.c \ + datetime.c \ demo/object/lc.c \ test/ctest.c diff --git a/bacnet-stack/demo/object/lsp.mak b/bacnet-stack/demo/object/lsp.mak index d465d6a3..1210a96c 100755 --- a/bacnet-stack/demo/object/lsp.mak +++ b/bacnet-stack/demo/object/lsp.mak @@ -9,7 +9,7 @@ CFLAGS = -Wall -I. -Itest -DTEST -DTEST_LIFE_SAFETY_POINT -g # NOTE: this file is normally called by the unittest.sh from up directory SRCS = bacdcode.c \ bacstr.c \ - bigend.c \ + datetime.c \ bacapp.c \ bactext.c \ indtext.c \ diff --git a/bacnet-stack/demo/object/mso.mak b/bacnet-stack/demo/object/mso.mak index d83d2919..971374c6 100644 --- a/bacnet-stack/demo/object/mso.mak +++ b/bacnet-stack/demo/object/mso.mak @@ -9,7 +9,7 @@ CFLAGS = -Wall -I. -Itest -DTEST -DTEST_MULTISTATE_OUTPUT -g # NOTE: this file is normally called by the unittest.sh from up directory SRCS = bacdcode.c \ bacstr.c \ - bigend.c \ + datetime.c \ bacapp.c \ bactext.c \ indtext.c \ diff --git a/bacnet-stack/rpm.mak b/bacnet-stack/rpm.mak index 6d320400..3051d5b1 100644 --- a/bacnet-stack/rpm.mak +++ b/bacnet-stack/rpm.mak @@ -12,7 +12,7 @@ SRCS = bacdcode.c \ bactext.c \ indtext.c \ bacstr.c \ - bigend.c \ + datetime.c \ rpm.c \ test/ctest.c diff --git a/bacnet-stack/tsm.mak b/bacnet-stack/tsm.mak index 32acb3cd..754f52ec 100644 --- a/bacnet-stack/tsm.mak +++ b/bacnet-stack/tsm.mak @@ -8,7 +8,7 @@ CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g SRCS = address.c \ bacdcode.c \ bacstr.c \ - bigend.c \ + datetime.c \ bacapp.c \ bactext.c \ indtext.c \ diff --git a/bacnet-stack/wp.mak b/bacnet-stack/wp.mak index d02545e1..e4025128 100644 --- a/bacnet-stack/wp.mak +++ b/bacnet-stack/wp.mak @@ -8,7 +8,7 @@ CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g SRCS = bacdcode.c \ bacstr.c \ - bigend.c \ + datetime.c \ bacapp.c \ bactext.c \ indtext.c \