Correct project structure in Utils tests

	Files moved to correct directories
	CMakeLists corrected
	Headers corrected

10 files changed, 23 insertions, 25 deletions

diff --git a/src/components/utils/test/CMakeLists.txt b/src/components/utils/test/CMakeLists.txt
index cc4f0a13c2..6ec12a17e6 100644
--- a/src/components/utils/test/CMakeLists.txt
+++ b/src/components/utils/test/CMakeLists.txt
@@ -32,12 +32,11 @@ if(BUILD_TESTS)
 
 include_directories (
   ${JSONCPP_INCLUDE_DIRECTORY}
-  ${CMAKE_SOURCE_DIR}/src/3rd_party-static/gmock-1.7.0/include
-  ${CMAKE_SOURCE_DIR}/src/3rd_party-static/gmock-1.7.0/gtest/include
-  ${COMPONENTS_DIR}/utils/include/utils
-  ${COMPONENTS_DIR}/include/utils
+  ${GMOCK_INCLUDE_DIRECTORY}
+  ${COMPONENTS_DIR}/utils/include
   ${COMPONENTS_DIR}/rpc_base/include
   ${COMPONENTS_DIR}/utils/test/include
+  ${COMPONENTS_DIR}/policy/include
 )
 
 set(testSources
@@ -73,8 +72,6 @@ set(testLibraries
   ConfigProfile
 )
 
-include_directories(${COMPONENTS_DIR}/policy/include)
-
 if (CMAKE_SYSTEM_NAME STREQUAL "QNX")
   # --- Tests for QDB Wrapper
   list (APPEND testSources
diff --git a/src/components/utils/test/async_runner_test.cc b/src/components/utils/test/async_runner_test.cc
index 9b71d8732f..9badbadf1c 100644
--- a/src/components/utils/test/async_runner_test.cc
+++ b/src/components/utils/test/async_runner_test.cc
@@ -30,14 +30,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdlib.h>
 #include <ctime>
-#include "lock.h"
-#include "threads/async_runner.h"
-#include "utils/conditional_variable.h"
+#include <stdlib.h>
 
 #include "gtest/gtest.h"
 
+#include "utils/lock.h"
+#include "utils/conditional_variable.h"
+#include "utils/threads/async_runner.h"
+
 namespace test {
 namespace components {
 namespace utils {
diff --git a/src/components/utils/test/conditional_variable_test.cc b/src/components/utils/test/conditional_variable_test.cc
index fe93e17617..8c3bd7db8c 100644
--- a/src/components/utils/test/conditional_variable_test.cc
+++ b/src/components/utils/test/conditional_variable_test.cc
@@ -30,13 +30,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <pthread.h>
 #include <iostream>
-
-#include "lock.h"
-#include "macro.h"
+#include <pthread.h>
 
 #include "gtest/gtest.h"
+
+#include "utils/lock.h"
+#include "utils/macro.h"
 #include "utils/conditional_variable.h"
 
 namespace test {
diff --git a/src/components/utils/test/custom_string_test.cc b/src/components/utils/test/custom_string_test.cc
index 8c42e9a513..3610bfb36b 100644
--- a/src/components/utils/test/custom_string_test.cc
+++ b/src/components/utils/test/custom_string_test.cc
@@ -33,7 +33,7 @@
 #include <iostream>
 #include <string>
 #include "gtest/gtest.h"
-#include "custom_string.h"
+#include "utils/custom_string.h"
 
 namespace custom_str = utils::custom_string;
 
diff --git a/src/components/utils/test/generated_code_with_sqlite_test.cc b/src/components/utils/test/generated_code_with_sqlite_test.cc
index cb319fa0ac..0feb040f49 100644
--- a/src/components/utils/test/generated_code_with_sqlite_test.cc
+++ b/src/components/utils/test/generated_code_with_sqlite_test.cc
@@ -31,7 +31,7 @@
 
 #include <sqlite3.h>
 #include "gtest/gtest.h"
-#include "generated_code_with_sqlite_test.h"
+#include "utils/generated_code_with_sqlite_test.h"
 
 namespace rpc {
 
diff --git a/src/components/utils/test/include/generated_code_with_sqlite_test.h b/src/components/utils/test/include/utils/generated_code_with_sqlite_test.h
index dcf85aafe1..8455639c07 100644
--- a/src/components/utils/test/include/generated_code_with_sqlite_test.h
+++ b/src/components/utils/test/include/utils/generated_code_with_sqlite_test.h
@@ -35,8 +35,8 @@
 #include <string>
 #include "policy/policy_table/types.h"
 #include "rpc_base/rpc_base.h"
-#include "sqlite_wrapper/sql_query.h"
-#include "sqlite_wrapper/sql_database.h"
+#include "utils/sqlite_wrapper/sql_query.h"
+#include "utils/sqlite_wrapper/sql_database.h"
 
 namespace policy_table = rpc::policy_table_interface_base;
 namespace dbms = utils::dbms;
diff --git a/src/components/utils/test/include/test_handler.h b/src/components/utils/test/include/utils/test_handler.h
index 34127b7bdd..34127b7bdd 100644
--- a/src/components/utils/test/include/test_handler.h
+++ b/src/components/utils/test/include/utils/test_handler.h
diff --git a/src/components/utils/test/message_loop_thread_test.cc b/src/components/utils/test/message_loop_thread_test.cc
index 7778755c68..c2a8c6851d 100644
--- a/src/components/utils/test/message_loop_thread_test.cc
+++ b/src/components/utils/test/message_loop_thread_test.cc
@@ -31,7 +31,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "test_handler.h"
+#include "utils/test_handler.h"
 
 namespace test {
 namespace components {
diff --git a/src/components/utils/test/sqlite_wrapper/sql_database_test.cc b/src/components/utils/test/sqlite_wrapper/sql_database_test.cc
index 927f9dd88f..bd278a863f 100644
--- a/src/components/utils/test/sqlite_wrapper/sql_database_test.cc
+++ b/src/components/utils/test/sqlite_wrapper/sql_database_test.cc
@@ -30,8 +30,8 @@
 */
 
 #include "gtest/gtest.h"
-#include "sqlite_wrapper/sql_error.h"
-#include "sqlite_wrapper/sql_database.h"
+#include "utils/sqlite_wrapper/sql_error.h"
+#include "utils/sqlite_wrapper/sql_database.h"
 
 using ::utils::dbms::SQLError;
 using ::utils::dbms::SQLDatabase;
diff --git a/src/components/utils/test/sqlite_wrapper/sql_query_test.cc b/src/components/utils/test/sqlite_wrapper/sql_query_test.cc
index 0cf378bab5..958fed93fa 100644
--- a/src/components/utils/test/sqlite_wrapper/sql_query_test.cc
+++ b/src/components/utils/test/sqlite_wrapper/sql_query_test.cc
@@ -29,14 +29,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlite3.h>
 #include <string>
+#include <sqlite3.h>
 
 #include "gtest/gtest.h"
 
-#include "sqlite_wrapper/sql_error.h"
-#include "sqlite_wrapper/sql_database.h"
-#include "sqlite_wrapper/sql_query.h"
+#include "utils/sqlite_wrapper/sql_error.h"
+#include "utils/sqlite_wrapper/sql_database.h"
+#include "utils/sqlite_wrapper/sql_query.h"
 
 using ::utils::dbms::SQLError;
 using ::utils::dbms::SQLDatabase;