From e5239e3e73fc09f076de92800646c2409d5329a0 Mon Sep 17 00:00:00 2001 From: skarg Date: Thu, 10 Aug 2006 19:58:59 +0000 Subject: [PATCH] Moved apdu decode into unit test where it was being used since it is being decoded in apdu.c in normal usage. --- bacnet-stack/abort.c | 10 +++++----- bacnet-stack/abort.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bacnet-stack/abort.c b/bacnet-stack/abort.c index db9d1340..61425b26 100644 --- a/bacnet-stack/abort.c +++ b/bacnet-stack/abort.c @@ -68,6 +68,11 @@ int abort_decode_service_request(uint8_t * apdu, return len; } +#ifdef TEST +#include +#include +#include "ctest.h" + /* decode the whole APDU - mainly used for unit testing */ int abort_decode_apdu(uint8_t * apdu, unsigned apdu_len, uint8_t * invoke_id, uint8_t * abort_reason) @@ -89,11 +94,6 @@ int abort_decode_apdu(uint8_t * apdu, return len; } -#ifdef TEST -#include -#include -#include "ctest.h" - void testAbort(Test * pTest) { uint8_t apdu[480] = { 0 }; diff --git a/bacnet-stack/abort.h b/bacnet-stack/abort.h index 376dc271..cc339afb 100644 --- a/bacnet-stack/abort.h +++ b/bacnet-stack/abort.h @@ -47,11 +47,11 @@ extern "C" { int abort_decode_service_request(uint8_t * apdu, unsigned apdu_len, uint8_t * invoke_id, uint8_t * abort_reason); +#ifdef TEST +#include "ctest.h" int abort_decode_apdu(uint8_t * apdu, unsigned apdu_len, uint8_t * invoke_id, uint8_t * abort_reason); -#ifdef TEST -#include "ctest.h" void testAbort(Test * pTest); #endif