Merge pull request #276 from adbridge/master

Renamed utest files to add a prefix of 'utest_' to prevent namespace

Author: sg-

frameworks/utest/TESTS/unit_tests/basic_test/main.cpp

@@ -2,7 +2,7 @@
 #include "greentea-client/test_env.h"
 #include "utest/utest.h"
 #include "unity/unity.h"
-#include "stack_trace.h"
+#include "utest/utest_stack_trace.h"
 
 using namespace utest::v1;
 

frameworks/utest/TESTS/unit_tests/case_control_async/main.cpp

@@ -18,7 +18,7 @@
 #include "greentea-client/test_env.h"
 #include "utest/utest.h"
 #include "unity/unity.h"
-#include "utest/stack_trace.h"
+#include "utest/utest_stack_trace.h"
 
 using namespace utest::v1;
 

frameworks/utest/TESTS/unit_tests/minimal_async_scheduler/main.cpp

@@ -22,7 +22,7 @@
 #include "greentea-client/test_env.h"
 #include "utest/utest.h"
 #include "unity/unity.h"
-#include "utest/stack_trace.h"
+#include "utest/utest_stack_trace.h"
 
 #include "ticker_api.h"
 #include "us_ticker_api.h"

frameworks/utest/source/unity_handler.cpp

@@ -16,8 +16,8 @@
  ****************************************************************************
  */
 
-#include "utest/harness.h"
-#include "utest/stack_trace.h"
+#include "utest/utest_harness.h"
+#include "utest/utest_stack_trace.h"
 #include "utest/unity_handler.h"
 #include "utest/utest_serial.h"
 

frameworks/utest/source/case.cpp renamed to frameworks/utest/source/utest_case.cpp

@@ -16,7 +16,7 @@
  ****************************************************************************
  */
 
- #include "utest/case.h"
+ #include "utest/utest_case.h"
  #include "utest/utest_serial.h"
 
 using namespace utest::v1;

frameworks/utest/source/default_handlers.cpp renamed to frameworks/utest/source/utest_default_handlers.cpp

@@ -16,9 +16,9 @@
  ****************************************************************************
  */
 
-#include "utest/default_handlers.h"
-#include "utest/case.h"
-#include "utest/stack_trace.h"
+#include "utest/utest_default_handlers.h"
+#include "utest/utest_case.h"
+#include "utest/utest_stack_trace.h"
 #include "utest/utest_serial.h"
 
 using namespace utest::v1;

frameworks/utest/source/greentea_handlers.cpp renamed to frameworks/utest/source/utest_greentea_handlers.cpp

@@ -16,10 +16,10 @@
  ****************************************************************************
  */
 
-#include "utest/default_handlers.h"
-#include "utest/case.h"
+#include "utest/utest_default_handlers.h"
+#include "utest/utest_case.h"
 #include "greentea-client/test_env.h"
-#include "utest/stack_trace.h"
+#include "utest/utest_stack_trace.h"
 #include "utest/utest_serial.h"
 
 using namespace utest::v1;

frameworks/utest/source/harness.cpp renamed to frameworks/utest/source/utest_harness.cpp

@@ -16,8 +16,8 @@
  ****************************************************************************
  */
 
-#include "utest/harness.h"
-#include "utest/stack_trace.h"
+#include "utest/utest_harness.h"
+#include "utest/utest_stack_trace.h"
 #include "utest/utest_serial.h"
 
 #include <stdlib.h>

frameworks/utest/source/shim.cpp renamed to frameworks/utest/source/utest_shim.cpp

@@ -16,8 +16,8 @@
  ****************************************************************************
  */
 
-#include "utest/shim.h"
-#include "utest/stack_trace.h"
+#include "utest/utest_shim.h"
+#include "utest/utest_stack_trace.h"
 
 #if UTEST_SHIM_SCHEDULER_USE_MINAR
 #include "minar/minar.h"

frameworks/utest/source/stack_trace.cpp renamed to frameworks/utest/source/utest_stack_trace.cpp

@@ -16,11 +16,11 @@
  */
 #ifdef UTEST_STACK_TRACE
 
-#include "test_env.h"
+#include "greentea-client/test_env.h"
 #include "mbed.h"
-#include "utest.h"
-#include "unity.h"
-#include "utest/stack_trace.h"
+#include "utest/utest.h"
+#include "unity/unity.h"
+#include "utest/utest_stack_trace.h"
 #include "utest/utest_serial.h"
 
 using namespace utest::v1;

frameworks/utest/source/types.cpp renamed to frameworks/utest/source/utest_types.cpp

@@ -16,7 +16,7 @@
  ****************************************************************************
  */
 
- #include "utest/types.h"
+ #include "utest/utest_types.h"
 
 const char* utest::v1::stringify(utest::v1::failure_reason_t reason)
 {

frameworks/utest/utest/utest.h

@@ -19,10 +19,10 @@
 #ifndef UTEST_H
 #define UTEST_H
 
-#include "types.h"
-#include "case.h"
-#include "default_handlers.h"
-#include "harness.h"
+#include "utest/utest_types.h"
+#include "utest/utest_case.h"
+#include "utest/utest_default_handlers.h"
+#include "utest/utest_harness.h"
 #include "utest/utest_serial.h"
 
 #endif // UTEST_H

frameworks/utest/utest/case.h renamed to frameworks/utest/utest/utest_case.h

@@ -22,8 +22,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include "types.h"
-#include "default_handlers.h"
+#include "utest/utest_types.h"
+#include "utest/utest_default_handlers.h"
 
 
 namespace utest {

frameworks/utest/utest/default_handlers.h renamed to frameworks/utest/utest/utest_default_handlers.h

@@ -22,7 +22,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include "types.h"
+#include "utest/utest_types.h"
 
 
 namespace utest {

frameworks/utest/utest/harness.h renamed to frameworks/utest/utest/utest_harness.h

@@ -23,11 +23,11 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include "types.h"
-#include "case.h"
-#include "default_handlers.h"
-#include "specification.h"
-#include "scheduler.h"
+#include "utest/utest_types.h"
+#include "utest/utest_case.h"
+#include "utest/utest_default_handlers.h"
+#include "utest/utest_specification.h"
+#include "utest/utest_scheduler.h"
 
 
 namespace utest {

frameworks/utest/utest/scheduler.h renamed to frameworks/utest/utest/utest_scheduler.h

@@ -22,7 +22,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include "scheduler.h"
+#include "utest/utest_scheduler.h"
 
 #ifdef YOTTA_CFG
 #   include "compiler-polyfill/attributes.h"

frameworks/utest/utest/shim.h renamed to frameworks/utest/utest/utest_shim.h

@@ -22,9 +22,9 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include "types.h"
-#include "case.h"
-#include "default_handlers.h"
+#include "utest/utest_types.h"
+#include "utest/utest_case.h"
+#include "utest/utest_default_handlers.h"
 
 
 namespace utest {

frameworks/utest/utest/specification.h renamed to frameworks/utest/utest/utest_specification.h

@@ -22,7 +22,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include "shim.h"
+#include "utest/utest_shim.h"
 
 namespace utest {
 namespace v1 {