Merged revision(s) 2898 from branches/releases/bacnet-stack-0-8-0:

Cleanup of unit test exports.
........
This commit is contained in:
skarg
2015-10-18 00:27:09 +00:00
parent 3b28372e8b
commit 5a0ed5a9e0
6 changed files with 99 additions and 39 deletions
+21 -16
View File
@@ -762,7 +762,7 @@ int bacapp_decode_context_datetime(
#include <string.h>
#include "ctest.h"
void testBACnetDateTimeWildcard(
static void testBACnetDateTimeWildcard(
Test * pTest)
{
BACNET_DATE_TIME bdatetime;
@@ -777,7 +777,7 @@ void testBACnetDateTimeWildcard(
ct_test(pTest, status == true);
}
void testBACnetDateTimeAdd(
static void testBACnetDateTimeAdd(
Test * pTest)
{
BACNET_DATE_TIME bdatetime, test_bdatetime;
@@ -821,7 +821,7 @@ void testBACnetDateTimeAdd(
ct_test(pTest, diff == 0);
}
void testBACnetDateTimeSeconds(
static void testBACnetDateTimeSeconds(
Test * pTest)
{
uint8_t hour = 0, minute = 0, second = 0;
@@ -843,7 +843,7 @@ void testBACnetDateTimeSeconds(
}
}
void testBACnetDate(
static void testBACnetDate(
Test * pTest)
{
BACNET_DATE bdate1, bdate2;
@@ -905,7 +905,7 @@ void testBACnetDate(
return;
}
void testBACnetTime(
static void testBACnetTime(
Test * pTest)
{
BACNET_TIME btime1, btime2;
@@ -955,7 +955,7 @@ void testBACnetTime(
return;
}
void testBACnetDateTime(
static void testBACnetDateTime(
Test * pTest)
{
BACNET_DATE_TIME bdatetime1, bdatetime2;
@@ -1023,7 +1023,7 @@ void testBACnetDateTime(
return;
}
void testDayOfYear(
static void testDayOfYear(
Test * pTest)
{
uint32_t days = 0;
@@ -1061,7 +1061,7 @@ void testDayOfYear(
}
}
void testDateEpoch(
static void testDateEpoch(
Test * pTest)
{
uint32_t days = 0;
@@ -1091,7 +1091,7 @@ void testDateEpoch(
}
}
void testBACnetDayOfWeek(
static void testBACnetDayOfWeek(
Test * pTest)
{
uint8_t dow = 0;
@@ -1120,7 +1120,7 @@ void testBACnetDayOfWeek(
ct_test(pTest, dow == 3);
}
void testDatetimeCodec(
static void testDatetimeCodec(
Test * pTest)
{
uint8_t apdu[MAX_APDU];
@@ -1156,15 +1156,11 @@ void testDatetimeCodec(
}
#ifdef TEST_DATE_TIME
int main(
void)
void testDateTime(
Test * pTest)
{
Test *pTest;
bool rc;
pTest = ct_create("BACnet Date Time", NULL);
/* individual tests */
rc = ct_addTestFunction(pTest, testBACnetDate);
assert(rc);
@@ -1186,7 +1182,16 @@ int main(
assert(rc);
rc = ct_addTestFunction(pTest, testDayOfYear);
assert(rc);
}
#ifdef TEST_DATE_TIME
int main(
void)
{
Test *pTest;
pTest = ct_create("BACnet Date Time", NULL);
testDateTime(pTest);
ct_setStream(pTest, stdout);
ct_run(pTest);
(void) ct_report(pTest);