diff options
| -rw-r--r-- | main/features.c | 2 | ||||
| -rw-r--r-- | res/parking/parking_tests.c | 30 | ||||
| -rw-r--r-- | res/parking/res_parking.h | 5 | ||||
| -rw-r--r-- | res/res_parking.c | 2 |
4 files changed, 12 insertions, 27 deletions
diff --git a/main/features.c b/main/features.c index d4ecf657e..70c5423ae 100644 --- a/main/features.c +++ b/main/features.c @@ -232,8 +232,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") </manager> ***/ -/* TODO Scrape all of the parking stuff out of features.c */ - typedef enum { FEATURE_INTERPRET_DETECT, /* Used by ast_feature_detect */ FEATURE_INTERPRET_DO, /* Used by feature_interpret */ diff --git a/res/parking/parking_tests.c b/res/parking/parking_tests.c index 1b1cfc1dd..57edd37ce 100644 --- a/res/parking/parking_tests.c +++ b/res/parking/parking_tests.c @@ -804,42 +804,32 @@ cleanup: #endif /* TEST_FRAMEWORK */ -int unload_parking_tests(void) +void unload_parking_tests(void) { /* NOOP without test framework */ #if defined(TEST_FRAMEWORK) - - int res = 0; - - res |= AST_TEST_UNREGISTER(create_lot); - res |= AST_TEST_UNREGISTER(park_call); - res |= AST_TEST_UNREGISTER(retrieve_call); - res |= AST_TEST_UNREGISTER(park_extensions); - res |= AST_TEST_UNREGISTER(extension_conflicts); - res |= AST_TEST_UNREGISTER(dynamic_parking_variables); - - return res; + AST_TEST_UNREGISTER(create_lot); + AST_TEST_UNREGISTER(park_call); + AST_TEST_UNREGISTER(retrieve_call); + AST_TEST_UNREGISTER(park_extensions); + AST_TEST_UNREGISTER(extension_conflicts); + AST_TEST_UNREGISTER(dynamic_parking_variables); #endif - - return 0; } int load_parking_tests(void) { -/* NOOP without test framework */ -#if defined(TEST_FRAMEWORK) - int res = 0; +/* NOOP without test framework */ +#if defined(TEST_FRAMEWORK) res |= AST_TEST_REGISTER(create_lot); res |= AST_TEST_REGISTER(park_call); res |= AST_TEST_REGISTER(retrieve_call); res |= AST_TEST_REGISTER(park_extensions); res |= AST_TEST_REGISTER(extension_conflicts); res |= AST_TEST_REGISTER(dynamic_parking_variables); - - return res; #endif - return 0; + return res; } diff --git a/res/parking/res_parking.h b/res/parking/res_parking.h index b376a99e1..5dc99b796 100644 --- a/res/parking/res_parking.h +++ b/res/parking/res_parking.h @@ -568,7 +568,6 @@ int load_parking_tests(void); * \since 12.0.0 * \brief Unregister parking unit tests * - * \retval 0 on success - * \retval nonzero on failure + * \return Nothing */ -int unload_parking_tests(void); +void unload_parking_tests(void); diff --git a/res/res_parking.c b/res/res_parking.c index 668ed63a4..c7156fbe0 100644 --- a/res/res_parking.c +++ b/res/res_parking.c @@ -196,8 +196,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define PARKED_CALL_APPLICATION "ParkedCall" #define PARK_AND_ANNOUNCE_APPLICATION "ParkAndAnnounce" -/* TODO Add unit tests for parking */ - static int parking_lot_sort_fn(const void *obj_left, const void *obj_right, int flags) { const struct parking_lot *left = obj_left; |