Update test namespaces in Utils test

Related tasks APPLINK-30588 APPLINK-30974

29 files changed, 87 insertions, 81 deletions

diff --git a/src/components/utils/test/async_runner_test.cc b/src/components/utils/test/async_runner_test.cc
index 9badbadf1c..3dd6383588 100644
--- a/src/components/utils/test/async_runner_test.cc
+++ b/src/components/utils/test/async_runner_test.cc
@@ -41,7 +41,7 @@
 
 namespace test {
 namespace components {
-namespace utils {
+namespace utils_test {
 
 using namespace sync_primitives;
 using namespace threads;
@@ -135,6 +135,6 @@ TEST_F(AsyncRunnerTest,
   EXPECT_EQ(kDelegatesNum_ / 2, check_value);
 }
 
-}  // namespace utils
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/utils/test/atomic_object_test.cc b/src/components/utils/test/atomic_object_test.cc
index 2072b955e8..44975fd004 100644
--- a/src/components/utils/test/atomic_object_test.cc
+++ b/src/components/utils/test/atomic_object_test.cc
@@ -34,7 +34,8 @@
 #include "gtest/gtest.h"
 
 namespace test {
-namespace utils {
+namespace components {
+namespace utils_test {
 
 TEST(AtomicObjectTest, Construct) {
   sync_primitives::atomic_int var(5);
@@ -51,5 +52,6 @@ TEST(AtomicObjectTest, Construct) {
   EXPECT_FALSE(flag == true);
 }
 
-}  // utils
-}  // test
+}  // namespace utils_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/utils/test/back_trace_test.cc b/src/components/utils/test/back_trace_test.cc
index 071c4d3342..dcb2a79baa 100644
--- a/src/components/utils/test/back_trace_test.cc
+++ b/src/components/utils/test/back_trace_test.cc
@@ -35,7 +35,7 @@
 
 namespace test {
 namespace components {
-namespace utils {
+namespace utils_test {
 
 using namespace ::utils;
 
@@ -47,6 +47,6 @@ TEST(BackTraceTest, CallStackShouldNotBeEmpty) {
   ASSERT_FALSE(symbols.empty());
 }
 
-}  // namespace utils
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/utils/test/bitstream_test.cc b/src/components/utils/test/bitstream_test.cc
index df27aaa835..caec4b3970 100644
--- a/src/components/utils/test/bitstream_test.cc
+++ b/src/components/utils/test/bitstream_test.cc
@@ -37,7 +37,7 @@
 
 namespace test {
 namespace components {
-namespace utils {
+namespace utils_test {
 
 using ::utils::BitStream;
 
@@ -220,6 +220,6 @@ TEST(BitstreamTest, ExtractBitstream_WithDataMarkedBad_ExpectIsBad) {
   EXPECT_TRUE(bs.IsBad());
 }
 
-}  // namespace utils
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/utils/test/conditional_variable_test.cc b/src/components/utils/test/conditional_variable_test.cc
index 8c3bd7db8c..86c9dfa2e0 100644
--- a/src/components/utils/test/conditional_variable_test.cc
+++ b/src/components/utils/test/conditional_variable_test.cc
@@ -41,7 +41,7 @@
 
 namespace test {
 namespace components {
-namespace utils {
+namespace utils_test {
 
 class ConditionalVariableTest : public ::testing::Test {
  public:
@@ -127,6 +127,6 @@ TEST_F(
   EXPECT_EQ(sync_primitives::ConditionalVariable::kTimeout, wait_st);
 }
 
-}  // namespace utils
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/utils/test/custom_string_test.cc b/src/components/utils/test/custom_string_test.cc
index 3610bfb36b..bca332be5a 100644
--- a/src/components/utils/test/custom_string_test.cc
+++ b/src/components/utils/test/custom_string_test.cc
@@ -39,7 +39,7 @@ namespace custom_str = utils::custom_string;
 
 namespace test {
 namespace components {
-namespace utils {
+namespace utils_test {
 
 std::string CreateMultibyteString(uint8_t* array, size_t array_size) {
   return std::string(array, array + array_size);
@@ -314,6 +314,6 @@ TEST_F(
   EXPECT_TRUE(obj.CompareIgnoreCase(mbstring.c_str()));
 }
 
-}  // namespace utils
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/utils/test/data_accessor_test.cc b/src/components/utils/test/data_accessor_test.cc
index b15310ff3f..c7c728b676 100644
--- a/src/components/utils/test/data_accessor_test.cc
+++ b/src/components/utils/test/data_accessor_test.cc
@@ -36,7 +36,7 @@
 
 namespace test {
 namespace components {
-namespace utils {
+namespace utils_test {
 
 TEST(DataAccessorTest, CreateDataAccessor) {
   // arrange
@@ -129,6 +129,6 @@ TEST(DataAccessorTest,
   testSet_lock_.Release();
 }
 
-}  // namespace utils
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/utils/test/date_time_test.cc b/src/components/utils/test/date_time_test.cc
index fc34b7a998..a209ab4d43 100644
--- a/src/components/utils/test/date_time_test.cc
+++ b/src/components/utils/test/date_time_test.cc
@@ -35,7 +35,7 @@
 
 namespace test {
 namespace components {
-namespace utils {
+namespace utils_test {
 
 using namespace date_time;
 TEST(DateTimeTest, GetCurrentTime) {
@@ -398,6 +398,6 @@ TEST(DateTimeTest, Operator_minus_TimevalStruct_negative) {
   ASSERT_NE(-8000000, date_time::DateTime::getSecs(time2 - time1));
 }
 
-}  // namespace utils
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/utils/test/file_system_test.cc b/src/components/utils/test/file_system_test.cc
index 1d90721680..95469766f8 100644
--- a/src/components/utils/test/file_system_test.cc
+++ b/src/components/utils/test/file_system_test.cc
@@ -40,7 +40,7 @@
 
 namespace test {
 namespace components {
-namespace utils {
+namespace utils_test {
 
 typedef std::vector<std::string> StringArray;
 
@@ -1271,6 +1271,6 @@ TEST(FileSystemTest, GetAbsolutePath_TrickiPath_CorrectAbsolutePath) {
   }
 }
 
-}  // namespace utils
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
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 0feb040f49..d37b46f801 100644
--- a/src/components/utils/test/generated_code_with_sqlite_test.cc
+++ b/src/components/utils/test/generated_code_with_sqlite_test.cc
@@ -33,7 +33,9 @@
 #include "gtest/gtest.h"
 #include "utils/generated_code_with_sqlite_test.h"
 
-namespace rpc {
+namespace test {
+namespace components {
+namespace rpc_test {
 
 class GeneratedCodeTest : public ::testing::Test {
  public:
@@ -95,7 +97,7 @@ TEST_F(GeneratedCodeTest,
   policy_table::ServiceEndpoints ep;
 
   // assert
-  EXPECT_TRUE(policy_table::FindSection(&db, ep));
+  EXPECT_TRUE(FindSection(&db, ep));
   EXPECT_EQ(1u, ep.size());
 
   // act
@@ -117,7 +119,7 @@ TEST_F(GeneratedCodeTest,
   policy_table::ServiceEndpoints ep;
 
   // assert
-  EXPECT_TRUE(policy_table::RemoveSection(&db, ep));
+  EXPECT_TRUE(RemoveSection(&db, ep));
   dbms::SQLQuery sqlquery(&db);
 
   // act
@@ -151,7 +153,7 @@ TEST_F(GeneratedCodeTest,
   ep["0x07"] = urllist;
 
   // assert
-  EXPECT_TRUE(policy_table::UpdateSection(&db, ep));
+  EXPECT_TRUE(UpdateSection(&db, ep));
 
   dbms::SQLQuery sqlquery(&db);
   std::string num_of_records_check = "select count (*) from endpoints";
@@ -188,7 +190,7 @@ TEST_F(GeneratedCodeTest,
   ap[application_id].priority = policy_table::P_NORMAL;
 
   // assert
-  EXPECT_TRUE(policy_table::UpdateSection(&db, ap));
+  EXPECT_TRUE(UpdateSection(&db, ap));
 
   // act
   dbms::SQLQuery sqlquery(&db);
@@ -214,4 +216,6 @@ TEST_F(GeneratedCodeTest,
   EXPECT_TRUE(sqlquery.Reset());
 }
 
-}  // namespace rpc
+}  // namespace rpc_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/utils/test/include/utils/generated_code_with_sqlite_test.h b/src/components/utils/test/include/utils/generated_code_with_sqlite_test.h
index 4a679a7c05..4cca338f3d 100644
--- a/src/components/utils/test/include/utils/generated_code_with_sqlite_test.h
+++ b/src/components/utils/test/include/utils/generated_code_with_sqlite_test.h
@@ -38,12 +38,13 @@
 #include "utils/sqlite_wrapper/sql_query.h"
 #include "utils/sqlite_wrapper/sql_database.h"
 
+namespace test {
+namespace components {
+namespace rpc_test {
+
 namespace policy_table = rpc::policy_table_interface_base;
 namespace dbms = utils::dbms;
 
-namespace rpc {
-namespace policy_table_interface_base {
-
 bool FindSection(dbms::SQLDatabase* db, policy_table::ServiceEndpoints& ep) {
   /*
    * Following table structure is assumed:
@@ -401,7 +402,9 @@ bool UpdateSection(dbms::SQLDatabase* db,
   return true;
 }
 
-}  // namespace policy_table_interface_base
-}  // namespace rpc
+}  // namespace rpc_test
+}  // namespace components
+}  // namespace test
+
 
 #endif  // SRC_COMPONENTS_UTILS_TEST_INCLUDE_UTILS_GENERATED_CODE_WITH_SQLITE_TEST_H_
diff --git a/src/components/utils/test/lock_posix_test.cc b/src/components/utils/test/lock_posix_test.cc
index 9b0d9533bc..a78659ab31 100644
--- a/src/components/utils/test/lock_posix_test.cc
+++ b/src/components/utils/test/lock_posix_test.cc
@@ -35,7 +35,7 @@
 
 namespace test {
 namespace components {
-namespace utils {
+namespace utils_test {
 
 using sync_primitives::Lock;
 
@@ -118,6 +118,6 @@ TEST(LockPosixTest, TryLockRecursiveMutex_ExpectMutexLockedTwice) {
   test_mutex.Release();
 }
 
-}  // namespace utils
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/utils/test/log_message_loop_thread_test.cc b/src/components/utils/test/log_message_loop_thread_test.cc
index 14515961bb..032c7ecae1 100644
--- a/src/components/utils/test/log_message_loop_thread_test.cc
+++ b/src/components/utils/test/log_message_loop_thread_test.cc
@@ -37,7 +37,7 @@
 
 namespace test {
 namespace components {
-namespace utils {
+namespace utils_test {
 
 using namespace ::logger;
 using ::testing::_;
@@ -73,6 +73,6 @@ TEST(LogMessageLoopThread, HandleNeverCalled) {
   logger::logger_status = LoggerThreadNotCreated;
 }
 
-}  // namespace utils
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/utils/test/message_queue_test.cc b/src/components/utils/test/message_queue_test.cc
index d80016c6a8..ddc1aa1d81 100644
--- a/src/components/utils/test/message_queue_test.cc
+++ b/src/components/utils/test/message_queue_test.cc
@@ -36,7 +36,7 @@
 
 namespace test {
 namespace components {
-namespace utils {
+namespace utils_test {
 
 using ::utils::MessageQueue;
 
@@ -171,6 +171,6 @@ TEST_F(MessageQueueTest,
   ASSERT_TRUE(check_value);
 }
 
-}  // namespace utils
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/utils/test/messagemeter_test.cc b/src/components/utils/test/messagemeter_test.cc
index 69db658542..efaaa41252 100644
--- a/src/components/utils/test/messagemeter_test.cc
+++ b/src/components/utils/test/messagemeter_test.cc
@@ -42,7 +42,7 @@
 
 namespace test {
 namespace components {
-namespace utils {
+namespace utils_test {
 
 // Pair of values <second, msecond>
 typedef std::pair<int, int> TimePair;
@@ -261,6 +261,6 @@ INSTANTIATE_TEST_CASE_P(MessageMeterTestCase,
                         MessageMeterTest,
                         ::testing::ValuesIn(testing_time_pairs));
 
-}  // namespace utils
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/utils/test/posix_thread_test.cc b/src/components/utils/test/posix_thread_test.cc
index f98794d08a..b287141d2b 100644
--- a/src/components/utils/test/posix_thread_test.cc
+++ b/src/components/utils/test/posix_thread_test.cc
@@ -36,7 +36,7 @@
 
 namespace test {
 namespace components {
-namespace utils {
+namespace utils_test {
 
 using namespace sync_primitives;
 using namespace threads;
@@ -324,6 +324,6 @@ TEST(PosixThreadTest,
   EXPECT_EQ(NULL, thread->delegate());
 }
 
-}  // namespace utils
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/utils/test/prioritized_queue_test.cc b/src/components/utils/test/prioritized_queue_test.cc
index ef105f6c4e..082ff56713 100644
--- a/src/components/utils/test/prioritized_queue_test.cc
+++ b/src/components/utils/test/prioritized_queue_test.cc
@@ -35,7 +35,7 @@
 
 namespace test {
 namespace components {
-namespace utils {
+namespace utils_test {
 
 using ::utils::PrioritizedQueue;
 
@@ -207,6 +207,6 @@ TEST_F(PrioritizedQueueTest,
   EXPECT_EQ(message3, test_queue.front());
 }
 
-}  // namespace utils
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/utils/test/qdb_wrapper/sql_database_test.cc b/src/components/utils/test/qdb_wrapper/sql_database_test.cc
index 881141f18c..4e1a822b57 100644
--- a/src/components/utils/test/qdb_wrapper/sql_database_test.cc
+++ b/src/components/utils/test/qdb_wrapper/sql_database_test.cc
@@ -41,8 +41,8 @@ using ::utils::dbms::SQLDatabase;
 
 namespace test {
 namespace components {
-namespace utils {
-namespace dbms {
+namespace utils_test {
+namespace dbms_test {
 
 ::testing::AssertionResult IsError(SQLError error) {
   if (error.number() != ::utils::dbms::OK) {
@@ -133,7 +133,7 @@ TEST(SQLDatabaseTest, BadTransaction) {
   EXPECT_TRUE(IsError(db.LastError()));
 }
 
-}  // namespace dbms
-}  // namespace utils
+}  // namespace dbms_test
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/utils/test/qdb_wrapper/sql_query_test.cc b/src/components/utils/test/qdb_wrapper/sql_query_test.cc
index 6c866ffb9d..e575e4f575 100644
--- a/src/components/utils/test/qdb_wrapper/sql_query_test.cc
+++ b/src/components/utils/test/qdb_wrapper/sql_query_test.cc
@@ -44,8 +44,8 @@ using ::utils::dbms::SQLQuery;
 
 namespace test {
 namespace components {
-namespace utils {
-namespace dbms {
+namespace utils_test {
+namespace dbms_test {
 
 class SQLQueryTest : public ::testing::Test {
  protected:
@@ -305,7 +305,7 @@ TEST_F(SQLQueryTest, DoublePrepare) {
   EXPECT_FALSE(IsError(query.LastError()));
 }
 
-}  // namespace dbms
-}  // namespace utils
+}  // namespace dbms_test
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/utils/test/rwlock_posix_test.cc b/src/components/utils/test/rwlock_posix_test.cc
index 6cb140f4c5..6679219aa8 100644
--- a/src/components/utils/test/rwlock_posix_test.cc
+++ b/src/components/utils/test/rwlock_posix_test.cc
@@ -35,7 +35,7 @@
 
 namespace test {
 namespace components {
-namespace utils {
+namespace utils_test {
 
 using sync_primitives::RWLock;
 
@@ -142,6 +142,6 @@ TEST_F(RWlockTest, AcquireForWriting_ExpectNoMoreAccessForWriting) {
   EXPECT_TRUE(test_rwlock.Release());
 }
 
-}  // namespace utils
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/utils/test/scope_guard_test.cc b/src/components/utils/test/scope_guard_test.cc
index ac05c2828c..85abbd90de 100644
--- a/src/components/utils/test/scope_guard_test.cc
+++ b/src/components/utils/test/scope_guard_test.cc
@@ -36,7 +36,7 @@
 
 namespace test {
 namespace components {
-namespace utils {
+namespace utils_test {
 
 using ::utils::ScopeGuard;
 using ::utils::MakeGuard;
@@ -116,6 +116,6 @@ TEST(ScopeGuardTest, DismissCallObjectFunctionWithParam) {
   }
 }
 
-}  // namespace utils
-}  // components
+}  // namespace utils_test
+}  // namespace components
 }  // namesapce test
diff --git a/src/components/utils/test/shared_ptr_test.cc b/src/components/utils/test/shared_ptr_test.cc
index 85682073aa..a30f2f66eb 100644
--- a/src/components/utils/test/shared_ptr_test.cc
+++ b/src/components/utils/test/shared_ptr_test.cc
@@ -38,8 +38,7 @@
 
 namespace test {
 namespace components {
-namespace utils {
-namespace SharedPtrTest {
+namespace utils_test {
 
 class CMockObject {
  public:
@@ -58,12 +57,6 @@ class CExtendedMockObject : public CMockObject {
   CExtendedMockObject(int id);
 };
 
-}  // namespace CMockObject
-}  // namespace SmartObjects
-}  // namespace components
-}  // namespace test
-
-using namespace test::components::utils::SharedPtrTest;
 using ::testing::NiceMock;
 
 CMockObject::CMockObject(int id) : mId_(id) {}
@@ -543,3 +536,7 @@ TEST(SharedPtrTest, StressTest) {
          objectCreated,
          pointersCopied);
 }
+
+}  // namespace utils_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/utils/test/singleton_test.cc b/src/components/utils/test/singleton_test.cc
index 3bad45a7d7..ae05b6cbab 100644
--- a/src/components/utils/test/singleton_test.cc
+++ b/src/components/utils/test/singleton_test.cc
@@ -36,7 +36,7 @@
 
 namespace test {
 namespace components {
-namespace utils {
+namespace utils_test {
 
 using ::utils::Singleton;
 
@@ -184,6 +184,6 @@ TEST(SingletonTest, DeleteSingletonInDifferentThread) {
   ASSERT_FALSE(SingletonTest::exists());
 }
 
-}  // namespace utils
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
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 bd278a863f..9732fbe078 100644
--- a/src/components/utils/test/sqlite_wrapper/sql_database_test.cc
+++ b/src/components/utils/test/sqlite_wrapper/sql_database_test.cc
@@ -38,8 +38,8 @@ using ::utils::dbms::SQLDatabase;
 
 namespace test {
 namespace components {
-namespace utils {
-namespace dbms {
+namespace utils_test {
+namespace dbms_test {
 
 ::testing::AssertionResult IsError(SQLError error) {
   if (error.number() != ::utils::dbms::OK) {
@@ -217,7 +217,7 @@ TEST(SQLDatabaseTest, IsReadWrite_FirstOpenDBIsRWSecondIsNot) {
   remove("test-database.sqlite");
 }
 
-}  // namespace dbms
-}  // namespace utils
+}  // namespace dbms_test
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
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 958fed93fa..b481e45fd3 100644
--- a/src/components/utils/test/sqlite_wrapper/sql_query_test.cc
+++ b/src/components/utils/test/sqlite_wrapper/sql_query_test.cc
@@ -44,8 +44,8 @@ using ::utils::dbms::SQLQuery;
 
 namespace test {
 namespace components {
-namespace utils {
-namespace dbms {
+namespace utils_test {
+namespace dbms_test {
 
 class SQLQueryTest : public ::testing::Test {
  protected:
@@ -374,7 +374,7 @@ TEST_F(SQLQueryTest, DoublePrepare_TwicePrepareQuery_ActWithoutErrors) {
   EXPECT_FALSE(IsError(query.LastError()));
 }
 
-}  // namespace dbms
-}  // namespace utils
+}  // namespace dbms_test
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/utils/test/stl_utils_test.cc b/src/components/utils/test/stl_utils_test.cc
index 1fbde052f1..5250a7a514 100644
--- a/src/components/utils/test/stl_utils_test.cc
+++ b/src/components/utils/test/stl_utils_test.cc
@@ -37,7 +37,7 @@
 
 namespace test {
 namespace components {
-namespace utils {
+namespace utils_test {
 
 using ::utils::StlCollectionDeleter;
 using ::utils::StlMapDeleter;
@@ -94,6 +94,6 @@ TEST(StlDeleter, DestructVectorWithSeveralElements) {
   EXPECT_EQ(NULL, test_vector[1]);
 }
 
-}  // namespace utils
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/utils/test/system_test.cc b/src/components/utils/test/system_test.cc
index aced77f849..b479823aa5 100644
--- a/src/components/utils/test/system_test.cc
+++ b/src/components/utils/test/system_test.cc
@@ -35,7 +35,7 @@
 
 namespace test {
 namespace components {
-namespace utils {
+namespace utils_test {
 
 using namespace ::utils;
 
@@ -125,6 +125,6 @@ TEST(SystemTest, ASynchronousInvokeEmptyCommand_InvokeSuccessfull) {
   ASSERT_TRUE(object.Execute());
 }
 
-}  // namespace utils
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/utils/test/test_generator/generated_msg_version_test.cc b/src/components/utils/test/test_generator/generated_msg_version_test.cc
index e5a295ee96..5cd7c9e8ea 100644
--- a/src/components/utils/test/test_generator/generated_msg_version_test.cc
+++ b/src/components/utils/test/test_generator/generated_msg_version_test.cc
@@ -41,7 +41,7 @@ using namespace std;
 
 namespace test {
 namespace components {
-namespace utils {
+namespace utils_test {
 
 void get_version_from_file(int& first_version, int& second_version) {
   // Supposed that major and minor version include one number
@@ -72,6 +72,6 @@ TEST(GeneratorTool, GetCorrectVersion) {
   EXPECT_EQ(second_version, application_manager::minor_version);
 }
 
-}  // namespace utils
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/utils/test/thread_validator_test.cc b/src/components/utils/test/thread_validator_test.cc
index b6e21d7157..a2df1eea5f 100644
--- a/src/components/utils/test/thread_validator_test.cc
+++ b/src/components/utils/test/thread_validator_test.cc
@@ -38,7 +38,7 @@
 
 namespace test {
 namespace components {
-namespace utils {
+namespace utils_test {
 
 using namespace ::threads;
 
@@ -47,6 +47,6 @@ TEST(ThreadValidatorTest, CompareID_CurrentThreadAndPthread_AreEqual) {
   ASSERT_EQ(object.creation_thread_id(), pthread_self());
 }
 
-}  // namespace utils
+}  // namespace utils_test
 }  // namespace components
 }  // namespace test