Refactor namespace `mbed::test` to `utest`.

Niklas Hauser 2015-11-23 13:19:54 +00:00 committed by Martin Kojtal
parent a83e54c915
commit 97bbff7ab2
5 changed files with 19 additions and 19 deletions

View File

@ -18,7 +18,7 @@
#include "mbed-test-async/case.h"
using namespace mbed::test::v0;
using namespace utest::v0;
// normal handler
Case::Case(const char *description,

View File

@ -19,15 +19,15 @@
#include "mbed-test-async/default_handlers.h"
#include "mbed-test-async/case.h"
using namespace mbed::test::v0;
using namespace utest::v0;
status_t mbed::test::v0::verbose_test_setup_handler(const size_t number_of_cases)
status_t utest::v0::verbose_test_setup_handler(const size_t number_of_cases)
{
printf(">>> Running %u test cases...\n", number_of_cases);
return STATUS_CONTINUE;
}
void mbed::test::v0::verbose_test_teardown_handler(const size_t passed, const size_t failed, const failure_t failure)
void utest::v0::verbose_test_teardown_handler(const size_t passed, const size_t failed, const failure_t failure)
{
printf("\n>>> Test cases: %u passed, %u failed", passed, failed);
if (failure == FAILURE_NONE) {
@ -38,13 +38,13 @@ void mbed::test::v0::verbose_test_teardown_handler(const size_t passed, const si
if (failed) printf(">>> TESTS FAILED!\n");
}
status_t mbed::test::v0::verbose_case_setup_handler(const Case *const source, const size_t index_of_case)
status_t utest::v0::verbose_case_setup_handler(const Case *const source, const size_t index_of_case)
{
printf("\n>>> Running case #%u: '%s'...\n", index_of_case + 1, source->get_description());
return STATUS_CONTINUE;
}
status_t mbed::test::v0::verbose_case_teardown_handler(const Case *const source, const size_t passed, const size_t failed, const failure_t failure)
status_t utest::v0::verbose_case_teardown_handler(const Case *const source, const size_t passed, const size_t failed, const failure_t failure)
{
printf(">>> '%s': %u passed, %u failed", source->get_description(), passed, failed);
if (failure == FAILURE_NONE) {
@ -55,7 +55,7 @@ status_t mbed::test::v0::verbose_case_teardown_handler(const Case *const source,
return STATUS_CONTINUE;
}
status_t mbed::test::v0::verbose_case_failure_handler(const Case *const /*source*/, const failure_t reason)
status_t utest::v0::verbose_case_failure_handler(const Case *const /*source*/, const failure_t reason)
{
if (reason != FAILURE_ASSERTION) {
printf(">>> failed with reason '%s'\n", stringify(reason));
@ -65,7 +65,7 @@ status_t mbed::test::v0::verbose_case_failure_handler(const Case *const /*source
status_t mbed::test::v0::greentea_test_setup_handler(const size_t /*number_of_cases*/)
status_t utest::v0::greentea_test_setup_handler(const size_t /*number_of_cases*/)
{
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");
@ -73,7 +73,7 @@ status_t mbed::test::v0::greentea_test_setup_handler(const size_t /*number_of_ca
return STATUS_ABORT;
}
void mbed::test::v0::greentea_test_teardown_handler(const size_t passed, const size_t failed, const failure_t failure)
void utest::v0::greentea_test_teardown_handler(const size_t passed, const size_t failed, const failure_t failure)
{
verbose_test_teardown_handler(passed, failed, failure);
if (failed || failure != FAILURE_NONE) {
@ -84,7 +84,7 @@ void mbed::test::v0::greentea_test_teardown_handler(const size_t passed, const s
printf("{{end}}\n");
}
status_t mbed::test::v0::greentea_case_failure_handler(const Case *const source, const failure_t reason)
status_t utest::v0::greentea_case_failure_handler(const Case *const source, const failure_t reason)
{
verbose_case_failure_handler(source, reason);
return STATUS_ABORT;

View File

@ -20,7 +20,7 @@
#include "minar/minar.h"
#include "core-util/CriticalSectionLock.h"
using namespace mbed::test::v0;
using namespace utest::v0;
namespace
@ -53,7 +53,7 @@ static void die() {
void Harness::run(const Specification specification)
{
util::CriticalSectionLock lock;
mbed::util::CriticalSectionLock lock;
test_cases = specification.cases;
test_length = specification.length;
@ -80,7 +80,7 @@ void Harness::run(const Specification specification)
void Harness::raise_failure(failure_t reason)
{
util::CriticalSectionLock lock;
mbed::util::CriticalSectionLock lock;
case_failed++;
status_t fail_status = STATUS_ABORT;
@ -131,7 +131,7 @@ void Harness::schedule_next_case()
void Harness::handle_timeout()
{
util::CriticalSectionLock lock;
mbed::util::CriticalSectionLock lock;
if (case_timeout_handle != NULL)
{
@ -143,7 +143,7 @@ void Harness::handle_timeout()
void Harness::validate_callback()
{
util::CriticalSectionLock lock;
mbed::util::CriticalSectionLock lock;
if (case_timeout_handle != NULL)
{
@ -155,7 +155,7 @@ void Harness::validate_callback()
bool Harness::is_busy()
{
util::CriticalSectionLock lock;
mbed::util::CriticalSectionLock lock;
if (!test_cases) return false;
if (!case_current) return false;
@ -164,7 +164,7 @@ bool Harness::is_busy()
void Harness::run_next_case()
{
util::CriticalSectionLock lock;
mbed::util::CriticalSectionLock lock;
if(case_current < (test_cases + test_length))
{

View File

@ -18,7 +18,7 @@
#include "mbed-test-async/types.h"
const char* mbed::test::v0::stringify(mbed::test::v0::failure_t failure)
const char* utest::v0::stringify(utest::v0::failure_t failure)
{
switch(failure)
{

View File

@ -21,5 +21,5 @@
extern "C"
void mbed_test_unity_assert_failure()
{
mbed::test::v0::Harness::raise_failure(mbed::test::v0::FAILURE_ASSERTION);
utest::v0::Harness::raise_failure(utest::v0::FAILURE_ASSERTION);
}