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

Use return value of test setup handler to choose start case.

Niklas Hauser 2016-02-11 22:50:10 +00:00 committed by Martin Kojtal
parent 50917538eb
commit 6b692dd5fa
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
frameworks\utest/source/harness.cpp
View File

@ -60,12 +60,8 @@ bool Harness::run(const Specification& specification)
return run(specification, 0); return run(specification, 0);
} }
bool Harness::run(const Specification& specification, std::size_t start_case) bool Harness::run(const Specification& specification, std::size_t)
{ {
// ignore any invalid start index
if (start_case >= specification.length)
return false;
// check if a specification is currently running // check if a specification is currently running
if (is_busy()) if (is_busy())
return false; return false;
@ -84,17 +80,28 @@ bool Harness::run(const Specification& specification, std::size_t start_case)
case_passed = 0; case_passed = 0;
case_failed = 0; case_failed = 0;
case_failed_before = 0; case_failed_before = 0;
case_current = &test_cases[start_case];
location = LOCATION_TEST_SETUP;
if (handlers.test_setup && (handlers.test_setup(test_length) != STATUS_CONTINUE)) { location = LOCATION_TEST_SETUP;
if (handlers.test_failure) handlers.test_failure(failure_t(REASON_TEST_SETUP, location)); int setup_status = 0;
if (handlers.test_teardown) handlers.test_teardown(0, 0, failure_t(REASON_TEST_SETUP, location)); failure_t failure(REASON_NONE, location);
if (handlers.test_setup) {
setup_status = handlers.test_setup(test_length);
if (setup_status == STATUS_CONTINUE) setup_status = 0;
else if (setup_status < STATUS_CONTINUE) failure.reason = REASON_TEST_SETUP;
else if (setup_status > signed(test_length)) failure.reason = REASON_CASE_INDEX;
}
if (failure.reason != REASON_NONE) {
if (handlers.test_failure) handlers.test_failure(failure);
if (handlers.test_teardown) handlers.test_teardown(0, 0, failure);
test_cases = NULL; test_cases = NULL;
exit(1); exit(1);
return true; return true;
} }
case_current = &test_cases[setup_status];
minar::Scheduler::postCallback(run_next_case); minar::Scheduler::postCallback(run_next_case);
return true; return true;
} }