From a25162238bbad87a4c7f0408cf31d5811993fcca Mon Sep 17 00:00:00 2001 From: stubbfel Date: Fri, 2 Mar 2018 00:33:56 +0100 Subject: [PATCH] show now correct file path, test name and line number --- src/kunity.c | 10 +++++----- src/kunity.h | 4 ++-- src/kunity_t.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/kunity.c b/src/kunity.c index c1fc57e..86d092d 100644 --- a/src/kunity.c +++ b/src/kunity.c @@ -77,7 +77,7 @@ result_code_e create_default_test_output(/* out*/ ptr_output_functions_s* output return OK; } -result_code_e run_unity_test(/* in */ const unity_test_function_ptr test_function, /* in */ const ptr_output_functions_s output) +result_code_e run_unity_test(/* in */ const unity_test_function_ptr test_function, /* in */ const char* file_name, /* in */ const char* test_name, /* in */ int line_number, /* in */ const ptr_output_functions_s output) { result_code_e result; if (output == NULL) { @@ -89,15 +89,15 @@ result_code_e run_unity_test(/* in */ const unity_test_function_ptr test_functio return result; } - UNITY_BEGIN(); - RUN_TEST(test_function); + UnityBegin(file_name); + UnityDefaultTestRun(test_function, test_name, line_number); UNITY_END(); return result; } -result_code_e run_unity_printk_test(/* in */ const unity_test_function_ptr test_function) +result_code_e run_unity_printk_test(/* in */ const unity_test_function_ptr test_function, /* in */ const char* file_name, /* in */ const char* test_name, /* in */ int line_number) { - return run_unity_test(test_function, &prink_output); + return run_unity_test(test_function, file_name, test_name, line_number, &prink_output); } //} diff --git a/src/kunity.h b/src/kunity.h index 591ef4f..853bf73 100644 --- a/src/kunity.h +++ b/src/kunity.h @@ -21,9 +21,9 @@ extern void putchark(/* in */ char a); extern result_code_e create_default_test_output(/* out*/ ptr_output_functions_s* output_location); -extern result_code_e run_unity_test(/* in */ const unity_test_function_ptr test_function, /* in */ const ptr_output_functions_s output); +extern result_code_e run_unity_test(/* in */ const unity_test_function_ptr test_function, /* in */ const char* file_name, /* in */ const char* test_name, /* in */ int line_number, /* in */ const ptr_output_functions_s output); -extern result_code_e run_unity_printk_test(/* in */ const unity_test_function_ptr test_function); +extern result_code_e run_unity_printk_test(/* in */ const unity_test_function_ptr test_function, /* in */ const char* file_name, /* in */ const char* test_name, /* in */ int line_number); //} diff --git a/src/kunity_t.h b/src/kunity_t.h index f209163..481f3af 100644 --- a/src/kunity_t.h +++ b/src/kunity_t.h @@ -40,7 +40,7 @@ \ result_code_e KUNITY_CREATE_TEST_NAME(function_name)(const ptr_output_functions_s output) \ { \ - return run_unity_test(function_name, output); \ + return run_unity_test(function_name, __FILE__, #function_name, __LINE__, output); \ } \ EXPORT_SYMBOL(KUNITY_CREATE_TEST_NAME(function_name)); \ \