Corrected unit tests to work with new datalink file.

This commit is contained in:
skarg
2007-02-02 02:20:21 +00:00
parent f9f53c1ec6
commit 5e7c88b171
7 changed files with 68 additions and 20 deletions
+11 -4
View File
@@ -716,17 +716,24 @@ void npdu_encode_npdu_data(BACNET_NPDU_DATA * npdu,
}
/* dummy function stubs */
int datalink_send_pdu(BACNET_ADDRESS * dest, /* destination address */
BACNET_NPDU_DATA * npdu_data, /* network information */
uint8_t * pdu, /* any data to be sent - may be null */
int datalink_send_pdu(
BACNET_ADDRESS * dest,
BACNET_NPDU_DATA * npdu_data,
uint8_t * pdu,
unsigned pdu_len)
{ /* number of bytes of data */
{
(void) dest;
(void) npdu_data;
(void) pdu;
(void) pdu_len;
return 0;
}
/* dummy function stubs */
void datalink_get_broadcast_address(BACNET_ADDRESS * dest)
{
(void)dest;
}
/* dummy function stubs */
+1 -1
View File
@@ -4,7 +4,7 @@ BASEDIR = .
#CFLAGS = -Wall -I.
# -g for debugging with gdb
#CFLAGS = -Wall -I. -g
CFLAGS = -Wall -I. -Itest -Idemo/object -DTEST -DTEST_COV -g
CFLAGS = -Wall -I. -Itest -Idemo/object -DTEST -DTEST_COV -DBACDL_TEST=1 -DBIG_ENDIAN=0 -g
SRCS = bacdcode.c \
bacstr.c \
+17
View File
@@ -70,6 +70,23 @@
#define datalink_get_broadcast_address bip_get_broadcast_address
#define datalink_get_my_address bip_get_my_address
#elif defined(BACDL_TEST)
#include "npdu.h"
extern int datalink_send_pdu(
BACNET_ADDRESS * dest,
BACNET_NPDU_DATA * npdu_data,
uint8_t * pdu,
unsigned pdu_len);
extern uint16_t datalink_receive(
BACNET_ADDRESS * src,
uint8_t * pdu,
uint16_t max_pdu,
unsigned timeout);
extern void datalink_cleanup(void);
extern void datalink_get_broadcast_address(BACNET_ADDRESS * dest);
extern void bip_get_my_address(BACNET_ADDRESS * my_address);
#endif
#endif
+15 -12
View File
@@ -217,23 +217,26 @@ void testIAm(Test * pTest)
}
#ifdef TEST_IAM
/* Dummy stubs to eliminate depencies */
/* dummy function stubs */
int datalink_send_pdu(
BACNET_ADDRESS * dest,
BACNET_NPDU_DATA * npdu_data,
uint8_t * pdu,
unsigned pdu_len)
{
(void) dest;
(void) npdu_data;
(void) pdu;
(void) pdu_len;
return 0;
}
void datalink_get_broadcast_address(BACNET_ADDRESS * dest)
{ /* destination address */
(void) dest;
}
int datalink_send_pdu(BACNET_ADDRESS * dest, /* destination address */
BACNET_NPDU_DATA * npdu_data, /* network information */
uint8_t * pdu, /* any data to be sent - may be null */
unsigned pdu_len)
{ /* number of bytes of data */
(void) dest;
(void) pdu;
return pdu_len;
}
uint16_t Device_Vendor_Identifier(void)
{
return 0;
+1 -1
View File
@@ -2,7 +2,7 @@
CC = gcc
BASEDIR = .
# -g for debugging with gdb
DEFINES = -DBACFILE=1 -DTEST -DTEST_IAM
DEFINES = -DBACFILE=1 -DTEST -DTEST_IAM -DBACDL_TEST -DBIG_ENDIAN=0
INCLUDES = -I. -Idemo/object -Itest
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
+21
View File
@@ -297,6 +297,27 @@ bool tsm_invoke_id_failed(uint8_t invokeID)
/* flag to send an I-Am */
bool I_Am_Request = true;
/* dummy function stubs */
int datalink_send_pdu(
BACNET_ADDRESS * dest,
BACNET_NPDU_DATA * npdu_data,
uint8_t * pdu,
unsigned pdu_len)
{
(void) dest;
(void) npdu_data;
(void) pdu;
(void) pdu_len;
return 0;
}
/* dummy function stubs */
void datalink_get_broadcast_address(BACNET_ADDRESS * dest)
{
(void)dest;
}
void testTSM(Test * pTest)
{
/* FIXME: add some unit testing... */
+2 -2
View File
@@ -1,7 +1,7 @@
#Makefile to build test case
CC = gcc
# -g for debugging with gdb
DEFINES = -DTSM_ENABLED=1 -DTEST -DTEST_TSM
DEFINES = -DTSM_ENABLED=1 -DTEST -DTEST_TSM -DBIG_ENDIAN=0 -DBACDL_TEST=1
INCLUDES = -I. -Idemo/object -Idemo/handler -Itest -Iports/linux
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
@@ -21,11 +21,11 @@ SRCS = address.c \
demo/object/bv.c \
demo/object/lsp.c \
demo/object/mso.c \
demo/object/lc.c \
iam.c \
dcc.c \
npdu.c \
apdu.c \
datalink.c \
tsm.c \
test/ctest.c