ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleanup confusing default handler namings.

Niklas Hauser 2016-03-18 17:34:34 +00:00 committed by Martin Kojtal
parent 6b692dd5fa
commit 2e71820fa9
2 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frameworks\utest/source/default_handlers.cpp
View File

@ -21,7 +21,6 @@
using namespace utest::v1; using namespace utest::v1;
static void selftest_failure_handler(const failure_t failure);
static void test_failure_handler(const failure_t failure); static void test_failure_handler(const failure_t failure);
const handlers_t utest::v1::verbose_continue_handlers = { const handlers_t utest::v1::verbose_continue_handlers = {
@ -35,16 +34,6 @@ const handlers_t utest::v1::verbose_continue_handlers = {
// --- SPECIAL HANDLERS --- // --- SPECIAL HANDLERS ---
static void selftest_failure_handler(const failure_t failure) {
if (failure.location == LOCATION_TEST_SETUP || failure.location == LOCATION_TEST_TEARDOWN || failure.reason == REASON_ASSERTION) {
verbose_test_failure_handler(failure);
}
if (failure.reason == REASON_ASSERTION) {
printf("{{failure}}\n{{end}}\n");
while(1) ;
}
}
static void test_failure_handler(const failure_t failure) { static void test_failure_handler(const failure_t failure) {
if (failure.location == LOCATION_TEST_SETUP || failure.location == LOCATION_TEST_TEARDOWN) { if (failure.location == LOCATION_TEST_SETUP || failure.location == LOCATION_TEST_TEARDOWN) {
verbose_test_failure_handler(failure); verbose_test_failure_handler(failure);

24
frameworks\utest/source/greentea_handlers.cpp
View File

@ -22,33 +22,33 @@
using namespace utest::v1; using namespace utest::v1;
static status_t greentea_unknown_test_setup_handler(const size_t); static status_t unknown_test_setup_handler(const size_t);
static void greentea_selftest_failure_handler(const failure_t); static void selftest_failure_handler(const failure_t);
static void greentea_test_failure_handler(const failure_t); static void test_failure_handler(const failure_t);
const handlers_t utest::v1::greentea_abort_handlers = { const handlers_t utest::v1::greentea_abort_handlers = {
greentea_unknown_test_setup_handler, unknown_test_setup_handler,
greentea_test_teardown_handler, greentea_test_teardown_handler,
greentea_test_failure_handler, test_failure_handler,
greentea_case_setup_handler, greentea_case_setup_handler,
greentea_case_teardown_handler, greentea_case_teardown_handler,
greentea_case_failure_abort_handler greentea_case_failure_abort_handler
}; };
const handlers_t utest::v1::greentea_continue_handlers = { const handlers_t utest::v1::greentea_continue_handlers = {
greentea_unknown_test_setup_handler, unknown_test_setup_handler,
greentea_test_teardown_handler, greentea_test_teardown_handler,
greentea_test_failure_handler, test_failure_handler,
greentea_case_setup_handler, greentea_case_setup_handler,
greentea_case_teardown_handler, greentea_case_teardown_handler,
greentea_case_failure_continue_handler greentea_case_failure_continue_handler
}; };
const handlers_t utest::v1::selftest_handlers = { const handlers_t utest::v1::selftest_handlers = {
greentea_unknown_test_setup_handler, unknown_test_setup_handler,
greentea_test_teardown_handler, greentea_test_teardown_handler,
greentea_selftest_failure_handler, selftest_failure_handler,
greentea_case_setup_handler, greentea_case_setup_handler,
greentea_case_teardown_handler, greentea_case_teardown_handler,
greentea_case_failure_continue_handler greentea_case_failure_continue_handler
@ -56,14 +56,14 @@ const handlers_t utest::v1::selftest_handlers = {
// --- SPECIAL HANDLERS --- // --- SPECIAL HANDLERS ---
static status_t greentea_unknown_test_setup_handler(const size_t) { static status_t unknown_test_setup_handler(const size_t) {
printf(">>> I do not know how to tell greentea that the test started, since\n"); printf(">>> I do not know how to tell greentea that the test started, since\n");
printf(">>> you forgot to override the `test_setup_handler` in your specification.\n"); printf(">>> you forgot to override the `test_setup_handler` in your specification.\n");
return STATUS_ABORT; return STATUS_ABORT;
} }
static void greentea_selftest_failure_handler(const failure_t failure) { static void selftest_failure_handler(const failure_t failure) {
if (failure.location == LOCATION_TEST_SETUP || failure.location == LOCATION_TEST_TEARDOWN || failure.reason == REASON_ASSERTION) { if (failure.location == LOCATION_TEST_SETUP || failure.location == LOCATION_TEST_TEARDOWN || failure.reason == REASON_ASSERTION) {
verbose_test_failure_handler(failure); verbose_test_failure_handler(failure);
} }
@ -73,7 +73,7 @@ static void greentea_selftest_failure_handler(const failure_t failure) {
} }
} }
static void greentea_test_failure_handler(const failure_t failure) { static void test_failure_handler(const failure_t failure) {
if (failure.location == LOCATION_TEST_SETUP || failure.location == LOCATION_TEST_TEARDOWN) { if (failure.location == LOCATION_TEST_SETUP || failure.location == LOCATION_TEST_TEARDOWN) {
verbose_test_failure_handler(failure); verbose_test_failure_handler(failure);
GREENTEA_TESTSUITE_RESULT(false); GREENTEA_TESTSUITE_RESULT(false);