From 2e71820fa958be28d7528162c118e9457dbe5084 Mon Sep 17 00:00:00 2001
From: Niklas Hauser <niklas.hauser@arm.com>
Date: Fri, 18 Mar 2016 17:34:34 +0000
Subject: [PATCH] Cleanup confusing default handler namings.

---
 .../source/default_handlers.cpp"              | 11 ---------
 .../source/greentea_handlers.cpp"             | 24 +++++++++----------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git "a/frameworks\\utest/source/default_handlers.cpp" "b/frameworks\\utest/source/default_handlers.cpp"
index ec40101939..44c0ffae42 100644
--- "a/frameworks\\utest/source/default_handlers.cpp"
+++ "b/frameworks\\utest/source/default_handlers.cpp"
@@ -21,7 +21,6 @@
 
 using namespace utest::v1;
 
-static void selftest_failure_handler(const failure_t failure);
 static void test_failure_handler(const failure_t failure);
 
 const handlers_t utest::v1::verbose_continue_handlers = {
@@ -35,16 +34,6 @@ const handlers_t utest::v1::verbose_continue_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) {
     if (failure.location == LOCATION_TEST_SETUP || failure.location == LOCATION_TEST_TEARDOWN) {
         verbose_test_failure_handler(failure);
diff --git "a/frameworks\\utest/source/greentea_handlers.cpp" "b/frameworks\\utest/source/greentea_handlers.cpp"
index 747642f62b..e4760287e0 100644
--- "a/frameworks\\utest/source/greentea_handlers.cpp"
+++ "b/frameworks\\utest/source/greentea_handlers.cpp"
@@ -22,33 +22,33 @@
 
 using namespace utest::v1;
 
-static status_t greentea_unknown_test_setup_handler(const size_t);
-static void greentea_selftest_failure_handler(const failure_t);
-static void greentea_test_failure_handler(const failure_t);
+static status_t unknown_test_setup_handler(const size_t);
+static void selftest_failure_handler(const failure_t);
+static void test_failure_handler(const failure_t);
 
 
 const handlers_t utest::v1::greentea_abort_handlers = {
-    greentea_unknown_test_setup_handler,
+    unknown_test_setup_handler,
     greentea_test_teardown_handler,
-    greentea_test_failure_handler,
+    test_failure_handler,
     greentea_case_setup_handler,
     greentea_case_teardown_handler,
     greentea_case_failure_abort_handler
 };
 
 const handlers_t utest::v1::greentea_continue_handlers = {
-    greentea_unknown_test_setup_handler,
+    unknown_test_setup_handler,
     greentea_test_teardown_handler,
-    greentea_test_failure_handler,
+    test_failure_handler,
     greentea_case_setup_handler,
     greentea_case_teardown_handler,
     greentea_case_failure_continue_handler
 };
 
 const handlers_t utest::v1::selftest_handlers = {
-    greentea_unknown_test_setup_handler,
+    unknown_test_setup_handler,
     greentea_test_teardown_handler,
-    greentea_selftest_failure_handler,
+    selftest_failure_handler,
     greentea_case_setup_handler,
     greentea_case_teardown_handler,
     greentea_case_failure_continue_handler
@@ -56,14 +56,14 @@ const handlers_t utest::v1::selftest_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(">>> you forgot to override the `test_setup_handler` in your specification.\n");
 
     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) {
         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) {
         verbose_test_failure_handler(failure);
         GREENTEA_TESTSUITE_RESULT(false);