1 files changed, 20 insertions, 21 deletions
diff --git a/src/components/utils/test/CMakeLists.txt b/src/components/utils/test/CMakeLists.txt
index d194f7628a..6ec12a17e6 100644
--- a/src/components/utils/test/CMakeLists.txt
+++ b/src/components/utils/test/CMakeLists.txt
@@ -32,23 +32,21 @@ 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
   messagemeter_test.cc
   file_system_test.cc
-  #date_time_test.cc
+  date_time_test.cc
   system_test.cc
-  signals_linux_test.cc
   thread_validator_test.cc
   conditional_variable_test.cc
-  #message_queue_test.cc
+  message_queue_test.cc
   resource_usage_test.cc
   bitstream_test.cc
   prioritized_queue_test.cc
@@ -57,27 +55,28 @@ set(testSources
   singleton_test.cc
   #posix_thread_test.cc
   stl_utils_test.cc
-  #timer_thread_test.cc
   rwlock_posix_test.cc
   async_runner_test.cc
-  #shared_ptr_test.cc
-  #scope_guard_test.cc
-  #atomic_object_test.cc
+  shared_ptr_test.cc
+  scope_guard_test.cc
+  atomic_object_test.cc
+  message_loop_thread_test.cc
+  custom_string_test.cc
+  timer_test.cc
 )
 
 set(testLibraries
   gmock
   Utils
   Policy
+  ConfigProfile
 )
 
-include_directories(${COMPONENTS_DIR}/policy/src/policy/policy_table/table_struct_ext)
-
 if (CMAKE_SYSTEM_NAME STREQUAL "QNX")
   # --- Tests for QDB Wrapper
   list (APPEND testSources
-  #  ./qdb_wrapper/sql_database_test.cc
-  #  ./qdb_wrapper/sql_query_test.cc
+    ./qdb_wrapper/sql_database_test.cc
+    ./qdb_wrapper/sql_query_test.cc
   )
   file(COPY qdbserver.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
   file(COPY test-qdb.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
@@ -86,12 +85,9 @@ else ()
   # --- Tests for SQLite Wrapper
   find_package(Sqlite3 REQUIRED)
   list (APPEND testSources
-   # ./sqlite_wrapper/sql_database_test.cc
-   # ./sqlite_wrapper/sql_query_test.cc
-   # generated_code_with_sqlite_test.cc
-
-    # TODO{ALeshin} APPLINK-11132 AssertTrue in SetUpTestCase() return false
-    #policy_manager_impl_stress_test.cc
+    ./sqlite_wrapper/sql_database_test.cc
+    ./sqlite_wrapper/sql_query_test.cc
+    generated_code_with_sqlite_test.cc
   )
   list (APPEND testLibraries sqlite3)
 endif()
@@ -107,7 +103,10 @@ endif()
 
 file(COPY testscript.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 file(COPY log4cxx.properties DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY smartDeviceLink.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
 create_test("utils_test" "${testSources}" "${testLibraries}")
 
+add_subdirectory(test_generator)
+
 endif()