From 04501f0054d5e7335cfa697ba75dd2ae907c4f45 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Wed, 9 Jan 2013 21:14:39 +0000 Subject: * Whitespace changes. * Made ast_test_init() match its prototype. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378790 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/test.h | 21 +++++++++------------ main/test.c | 14 ++++++-------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/include/asterisk/test.h b/include/asterisk/test.h index 0d8fa426f..e8584aab5 100644 --- a/include/asterisk/test.h +++ b/include/asterisk/test.h @@ -35,7 +35,7 @@ #include "asterisk/strings.h" #endif -/*! +/*! \page AstUnitTestAPI Asterisk Unit Test API @@ -57,7 +57,7 @@ \code AST_TEST_DEFINE(sample_test_cb) \\The name of the callback function - { \\The the function's body + { \\The the function's body switch (cmd) { case TEST_INIT: info->name = "sample_test"; @@ -86,7 +86,7 @@ Details of the test execution, especially failure details, should be provided by using the ast_test_status_update() function. -\subsection RegisterTest Register a Test +\subsection RegisterTest Register a Test Register the test using the AST_TEST_REGISTER macro. @@ -148,9 +148,8 @@ * \returns 0 on success * \returns any other value on failure */ -int __ast_test_suite_event_notify(const char *file, const char *func, int line, - const char *state, const char *fmt, ...) - __attribute__((format(printf, 5, 6))); +int __ast_test_suite_event_notify(const char *file, const char *func, int line, const char *state, const char *fmt, ...) + __attribute__((format(printf, 5, 6))); /*! * \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 any other value on failure */ -int __ast_test_suite_assert_notify(const char *file, const char *func, int line, - const char *exp); +int __ast_test_suite_assert_notify(const char *file, const char *func, int line, const char *exp); /*! * \ref __ast_test_suite_event_notify() @@ -234,7 +232,7 @@ struct ast_test_info { * \retval AST_TEST_FAIL for failure */ 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 @@ -275,9 +273,8 @@ void ast_test_debug(struct ast_test *test, const char *fmt, ...) __attribute__(( * \retval 0 success * \retval -1 failure */ -int __ast_test_status_update(const char *file, const char *func, int line, - struct ast_test *test, const char *fmt, ...) - __attribute__((format(printf, 5, 6))); +int __ast_test_status_update(const char *file, const char *func, int line, struct ast_test *test, const char *fmt, ...) + __attribute__((format(printf, 5, 6))); /*! * \ref __ast_test_status_update() diff --git a/main/test.c b/main/test.c index b5c3d7d5d..60676cb84 100644 --- a/main/test.c +++ b/main/test.c @@ -121,8 +121,7 @@ void ast_test_debug(struct ast_test *test, const char *fmt, ...) ast_free(buf); } -int __ast_test_status_update(const char *file, const char *func, int line, - struct ast_test *test, const char *fmt, ...) +int __ast_test_status_update(const char *file, const char *func, int line, struct ast_test *test, const char *fmt, ...) { struct ast_str *buf = NULL; 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"), }; -int __ast_test_suite_event_notify(const char *file, const char *func, int line, - const char *state, const char *fmt, ...) +int __ast_test_suite_event_notify(const char *file, const char *func, int line, const char *state, const char *fmt, ...) { struct ast_str *buf = NULL; 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" "AppFile: %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)); ast_free(buf); @@ -938,8 +937,7 @@ int __ast_test_suite_event_notify(const char *file, const char *func, int line, return 0; } -int __ast_test_suite_assert_notify(const char *file, const char *func, int line, - const char *exp) +int __ast_test_suite_assert_notify(const char *file, const char *func, int line, const char *exp) { manager_event(EVENT_FLAG_TEST, "TestEvent", "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 */ -int ast_test_init() +int ast_test_init(void) { #ifdef TEST_FRAMEWORK /* Register cli commands */ -- cgit v1.2.3