kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Whitespace changes.

Browse Source 
* Made ast_test_init() match its prototype.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378790 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-01-09 21:14:39 +00:00
parent 671499c8b2
commit 04501f0054
2 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/asterisk/test.h
View File

@@ -148,9 +148,8 @@
* \returns 0 on success * \returns 0 on success
* \returns any other value on failure * \returns any other value on failure
*/ */
int __ast_test_suite_event_notify(const char *file, const char *func, int line, int __ast_test_suite_event_notify(const char *file, const char *func, int line, const char *state, const char *fmt, ...)
const char *state, const char *fmt, ...) __attribute__((format(printf, 5, 6)));
__attribute__((format(printf, 5, 6)));
/*! /*!
* \brief Notifies the test suite of a failed assert on an expression * \brief Notifies the test suite of a failed assert on an expression
@@ -165,8 +164,7 @@ int __ast_test_suite_event_notify(const char *file, const char *func, int line,
* \returns 0 on success * \returns 0 on success
* \returns any other value on failure * \returns any other value on failure
*/ */
int __ast_test_suite_assert_notify(const char *file, const char *func, int line, int __ast_test_suite_assert_notify(const char *file, const char *func, int line, const char *exp);
const char *exp);
/*! /*!
* \ref __ast_test_suite_event_notify() * \ref __ast_test_suite_event_notify()
@@ -234,7 +232,7 @@ struct ast_test_info {
* \retval AST_TEST_FAIL for failure * \retval AST_TEST_FAIL for failure
*/ */
typedef enum ast_test_result_state (ast_test_cb_t)(struct ast_test_info *info, typedef enum ast_test_result_state (ast_test_cb_t)(struct ast_test_info *info,
enum ast_test_command cmd, struct ast_test *test); enum ast_test_command cmd, struct ast_test *test);
/*! /*!
* \brief unregisters a test with the test framework * \brief unregisters a test with the test framework
@@ -275,9 +273,8 @@ void ast_test_debug(struct ast_test *test, const char *fmt, ...) __attribute__((
* \retval 0 success * \retval 0 success
* \retval -1 failure * \retval -1 failure
*/ */
int __ast_test_status_update(const char *file, const char *func, int line, int __ast_test_status_update(const char *file, const char *func, int line, struct ast_test *test, const char *fmt, ...)
struct ast_test *test, const char *fmt, ...) __attribute__((format(printf, 5, 6)));
__attribute__((format(printf, 5, 6)));
/*! /*!
* \ref __ast_test_status_update() * \ref __ast_test_status_update()

14
main/test.c
View File

@@ -121,8 +121,7 @@ void ast_test_debug(struct ast_test *test, const char *fmt, ...)
ast_free(buf); ast_free(buf);
} }
int __ast_test_status_update(const char *file, const char *func, int line, int __ast_test_status_update(const char *file, const char *func, int line, struct ast_test *test, const char *fmt, ...)
struct ast_test *test, const char *fmt, ...)
{ {
struct ast_str *buf = NULL; struct ast_str *buf = NULL;
va_list ap; va_list ap;
@@ -911,8 +910,7 @@ static struct ast_cli_entry test_cli[] = {
AST_CLI_DEFINE(test_cli_generate_results, "generate test results to file"), AST_CLI_DEFINE(test_cli_generate_results, "generate test results to file"),
}; };
int __ast_test_suite_event_notify(const char *file, const char *func, int line, int __ast_test_suite_event_notify(const char *file, const char *func, int line, const char *state, const char *fmt, ...)
const char *state, const char *fmt, ...)
{ {
struct ast_str *buf = NULL; struct ast_str *buf = NULL;
va_list ap; va_list ap;
@@ -930,7 +928,8 @@ int __ast_test_suite_event_notify(const char *file, const char *func, int line,
"State: %s\r\n" "State: %s\r\n"
"AppFile: %s\r\n" "AppFile: %s\r\n"
"AppFunction: %s\r\n" "AppFunction: %s\r\n"
"AppLine: %d\r\n%s\r\n", "AppLine: %d\r\n"
"%s\r\n",
state, file, func, line, ast_str_buffer(buf)); state, file, func, line, ast_str_buffer(buf));
ast_free(buf); ast_free(buf);
@@ -938,8 +937,7 @@ int __ast_test_suite_event_notify(const char *file, const char *func, int line,
return 0; return 0;
} }
int __ast_test_suite_assert_notify(const char *file, const char *func, int line, int __ast_test_suite_assert_notify(const char *file, const char *func, int line, const char *exp)
const char *exp)
{ {
manager_event(EVENT_FLAG_TEST, "TestEvent", manager_event(EVENT_FLAG_TEST, "TestEvent",
"Type: Assert\r\n" "Type: Assert\r\n"
@@ -954,7 +952,7 @@ int __ast_test_suite_assert_notify(const char *file, const char *func, int line,
#endif /* TEST_FRAMEWORK */ #endif /* TEST_FRAMEWORK */
int ast_test_init() int ast_test_init(void)
{ {
#ifdef TEST_FRAMEWORK #ifdef TEST_FRAMEWORK
/* Register cli commands */ /* Register cli commands */