Add additional namespaces to command tests

Added additional namespaces to avoid
name collisions in single unit build mode.

Related to: APPLINK-29754

55 files changed, 123 insertions, 3 deletions

diff --git a/src/components/application_manager/test/commands/command_impl_test.cc b/src/components/application_manager/test/commands/command_impl_test.cc
index bb56e984e5..fd660af210 100644
--- a/src/components/application_manager/test/commands/command_impl_test.cc
+++ b/src/components/application_manager/test/commands/command_impl_test.cc
@@ -49,6 +49,7 @@
 namespace test {
 namespace components {
 namespace commands_test {
+namespace command_impl {
 
 using ::testing::Return;
 using ::testing::AtLeast;
@@ -274,6 +275,7 @@ TEST_F(CommandImplTest, ReplaceHMIByMobileAppId_Map_SUCCESS) {
                 std::bind2nd(std::ptr_fun(&ExpectEqualKeyAppId), msg));
 }
 
+}  // namespace command_impl
 }  // namespace commands_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/application_manager/test/commands/command_request_impl_test.cc b/src/components/application_manager/test/commands/command_request_impl_test.cc
index 973438cb55..28bdef4a22 100644
--- a/src/components/application_manager/test/commands/command_request_impl_test.cc
+++ b/src/components/application_manager/test/commands/command_request_impl_test.cc
@@ -54,6 +54,7 @@
 namespace test {
 namespace components {
 namespace commands_test {
+namespace command_request_impl {
 
 namespace am = application_manager;
 namespace strings = am::strings;
@@ -514,6 +515,7 @@ TEST_F(CommandRequestImplTest,
       (*result)[strings::msg_params][strings::info].asString().empty());
 }
 
+}  // namespace command_request_impl
 }  // namespace commands_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/application_manager/test/commands/command_response_impl_test.cc b/src/components/application_manager/test/commands/command_response_impl_test.cc
index c7a5edae63..f95b9a49b2 100644
--- a/src/components/application_manager/test/commands/command_response_impl_test.cc
+++ b/src/components/application_manager/test/commands/command_response_impl_test.cc
@@ -45,6 +45,7 @@
 namespace test {
 namespace components {
 namespace commands_test {
+namespace command_response_impl {
 
 namespace strings = ::application_manager::strings;
 namespace hmi_response = ::application_manager::hmi_response;
@@ -179,6 +180,7 @@ TEST_F(CommandResponseImplTest,
             (*msg)[strings::msg_params][strings::result_code].asInt());
 }
 
+}  // namespace command_response_impl
 }  // namespace commands_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/application_manager/test/commands/hmi/navi_audio_start_stream_request_test.cc b/src/components/application_manager/test/commands/hmi/navi_audio_start_stream_request_test.cc
index 1256914225..e590412204 100644
--- a/src/components/application_manager/test/commands/hmi/navi_audio_start_stream_request_test.cc
+++ b/src/components/application_manager/test/commands/hmi/navi_audio_start_stream_request_test.cc
@@ -47,6 +47,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace hmi_commands_test {
+namespace navi_audio_start_stream_request {
 
 using ::testing::_;
 using ::testing::ReturnRef;
@@ -115,6 +116,7 @@ TEST_F(AudioStartStreamRequestTest, Run_HmiInterfaceAvailable_SentRequest) {
   command_->Run();
 }
 
+}  // namespace navi_audio_start_stream_request
 }  // namespace hmi_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/hmi/navi_is_ready_request_test.cc b/src/components/application_manager/test/commands/hmi/navi_is_ready_request_test.cc
index 4ebb04041e..b08bf6e515 100644
--- a/src/components/application_manager/test/commands/hmi/navi_is_ready_request_test.cc
+++ b/src/components/application_manager/test/commands/hmi/navi_is_ready_request_test.cc
@@ -47,6 +47,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace hmi_commands_test {
+namespace navi_is_ready_request {
 
 using ::testing::_;
 using ::testing::ReturnRef;
@@ -133,6 +134,7 @@ TEST_F(NaviIsReadyRequestTest,
   command_->on_event(event);
 }
 
+}  // namespace navi_is_ready_request
 }  // namespace hmi_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/hmi/navi_start_stream_request_test.cc b/src/components/application_manager/test/commands/hmi/navi_start_stream_request_test.cc
index e5fce1a099..8a157c9a0f 100644
--- a/src/components/application_manager/test/commands/hmi/navi_start_stream_request_test.cc
+++ b/src/components/application_manager/test/commands/hmi/navi_start_stream_request_test.cc
@@ -47,6 +47,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace hmi_commands_test {
+namespace navi_start_stream_request {
 
 using ::testing::_;
 using ::testing::ReturnRef;
@@ -115,6 +116,7 @@ TEST_F(NaviStartStreamRequestTest, Run_HmiInterfaceAvailable_SentRequest) {
   command_->Run();
 }
 
+}  // namespace navi_start_stream_request
 }  // namespace hmi_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/hmi/navi_stop_stream_requests_test.cc b/src/components/application_manager/test/commands/hmi/navi_stop_stream_requests_test.cc
index f812ead115..91b781c1ff 100644
--- a/src/components/application_manager/test/commands/hmi/navi_stop_stream_requests_test.cc
+++ b/src/components/application_manager/test/commands/hmi/navi_stop_stream_requests_test.cc
@@ -46,6 +46,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace hmi_commands_test {
+namespace navi_stop_stream_requests {
 
 using ::testing::_;
 using ::testing::ReturnRef;
@@ -97,6 +98,7 @@ TYPED_TEST(NaviStopStreamRequestsTest, Run_HmiInterfaceAvailable_SentRequest) {
   TestFixture::command_->Run();
 }
 
+}  // namespace navi_stop_stream_requests
 }  // namespace hmi_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/hmi/ui_is_ready_request_test.cc b/src/components/application_manager/test/commands/hmi/ui_is_ready_request_test.cc
index 0a1ad28c79..2759a8a19e 100644
--- a/src/components/application_manager/test/commands/hmi/ui_is_ready_request_test.cc
+++ b/src/components/application_manager/test/commands/hmi/ui_is_ready_request_test.cc
@@ -49,6 +49,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace hmi_commands_test {
+namespace ui_is_ready_request {
 
 namespace am = ::application_manager;
 
@@ -203,7 +204,8 @@ TEST_F(UIIsReadyRequestTest, OnTimeout_SUCCESS) {
   command_->onTimeOut();
 }
 
-}  // namespace mobile_commands_test
+}  // namespace ui_is_ready_request
+}  // namespace hmi_commands_test
 }  // namespace commands_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/application_manager/test/commands/hmi/vi_is_ready_request_test.cc b/src/components/application_manager/test/commands/hmi/vi_is_ready_request_test.cc
index aa4b450a98..48293f9a12 100644
--- a/src/components/application_manager/test/commands/hmi/vi_is_ready_request_test.cc
+++ b/src/components/application_manager/test/commands/hmi/vi_is_ready_request_test.cc
@@ -49,6 +49,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace hmi_commands_test {
+namespace vi_is_ready_request {
 
 using ::testing::_;
 using ::testing::ReturnRef;
@@ -169,7 +170,8 @@ TEST_F(VIIsReadyRequestTest, Run_HMIDoestRespond_SendMessageToHMIByTimeout) {
   command_->onTimeOut();
 }
 
-}  // namespace mobile_commands_test
+}  // namespace vi_is_ready_request
+}  // namespace hmi_commands_test
 }  // namespace commands_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/application_manager/test/commands/hmi/vr_is_ready_request_test.cc b/src/components/application_manager/test/commands/hmi/vr_is_ready_request_test.cc
index e5989d0b64..64e5c25546 100644
--- a/src/components/application_manager/test/commands/hmi/vr_is_ready_request_test.cc
+++ b/src/components/application_manager/test/commands/hmi/vr_is_ready_request_test.cc
@@ -48,6 +48,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace hmi_commands_test {
+namespace vr_is_ready_request {
 
 using ::testing::_;
 using ::testing::ReturnRef;
@@ -187,7 +188,8 @@ TEST_F(VRIsReadyRequestTest, Run_HMIDoestRespond_SendMessageToHMIByTimeout) {
   command_->onTimeOut();
 }
 
-}  // namespace mobile_commands_test
+}  // namespace vr_is_ready_request
+}  // namespace hmi_commands_test
 }  // namespace commands_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/application_manager/test/commands/mobile/add_command_request_test.cc b/src/components/application_manager/test/commands/mobile/add_command_request_test.cc
index b337acd52f..78a6aa2f4d 100644
--- a/src/components/application_manager/test/commands/mobile/add_command_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/add_command_request_test.cc
@@ -53,6 +53,7 @@
 namespace test {
 namespace components {
 namespace commands_test {
+namespace mobile_commands_test {
 namespace add_command_request {
 
 namespace am = application_manager;
@@ -338,6 +339,7 @@ TEST_F(AddCommandRequestTest, OnEvent_UI_HmiSendSuccess_UNSUPPORTED_RESOURCE) {
 }
 
 }  // namespace add_command_test
+}  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
 }  // namespace tests
diff --git a/src/components/application_manager/test/commands/mobile/add_sub_menu_request_test.cc b/src/components/application_manager/test/commands/mobile/add_sub_menu_request_test.cc
index 7eae10d10b..95bcede5fa 100644
--- a/src/components/application_manager/test/commands/mobile/add_sub_menu_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/add_sub_menu_request_test.cc
@@ -48,6 +48,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace add_sub_menu_request {
 
 namespace am = ::application_manager;
 using am::commands::AddSubMenuRequest;
@@ -132,6 +133,7 @@ TEST_F(AddSubMenuRequestTest, OnEvent_UI_UNSUPPORTED_RESOURCE) {
   Mock::VerifyAndClearExpectations(&mock_message_helper_);
 }
 
+}  // namespace add_sub_menu_request
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/alert_maneuver_request_test.cc b/src/components/application_manager/test/commands/mobile/alert_maneuver_request_test.cc
index 157f3db750..a835239a90 100644
--- a/src/components/application_manager/test/commands/mobile/alert_maneuver_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/alert_maneuver_request_test.cc
@@ -54,6 +54,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace alert_maneuver_request {
 
 using ::testing::_;
 using ::testing::Return;
@@ -271,6 +272,7 @@ TEST_F(AlertManeuverRequestTest, OnEvent_UNSUPPORTED_RESOURCE_Case4) {
                     false);
 }
 
+}  // namespace alert_maneuver_request
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/alert_request_test.cc b/src/components/application_manager/test/commands/mobile/alert_request_test.cc
index 2c80f6e5e2..e8ebcd0f60 100644
--- a/src/components/application_manager/test/commands/mobile/alert_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/alert_request_test.cc
@@ -47,6 +47,7 @@
 namespace test {
 namespace components {
 namespace commands_test {
+namespace mobile_commands_test {
 namespace alert_request {
 
 namespace am = application_manager;
@@ -206,6 +207,7 @@ TEST_F(AlertRequestTest, OnEvent_UI_HmiSendSuccess_UNSUPPORTED_RESOURCE) {
 }
 
 }  // namespace alert_request
+}  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
 }  // namespace tests
diff --git a/src/components/application_manager/test/commands/mobile/change_registration_test.cc b/src/components/application_manager/test/commands/mobile/change_registration_test.cc
index a2a137d0f4..d4a25ee112 100644
--- a/src/components/application_manager/test/commands/mobile/change_registration_test.cc
+++ b/src/components/application_manager/test/commands/mobile/change_registration_test.cc
@@ -55,6 +55,7 @@
 namespace test {
 namespace components {
 namespace commands_test {
+namespace mobile_commands_test {
 namespace change_registration_request {
 
 namespace am = application_manager;
@@ -534,6 +535,7 @@ TEST_F(ChangeRegistrationRequestTest,
 }
 
 }  // namespace change_registration_request
+}  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
 }  // namespace tests
diff --git a/src/components/application_manager/test/commands/mobile/create_interaction_choice_set_test.cc b/src/components/application_manager/test/commands/mobile/create_interaction_choice_set_test.cc
index 138723b0c3..b5449264a4 100644
--- a/src/components/application_manager/test/commands/mobile/create_interaction_choice_set_test.cc
+++ b/src/components/application_manager/test/commands/mobile/create_interaction_choice_set_test.cc
@@ -53,6 +53,7 @@
 namespace test {
 namespace components {
 namespace commands_test {
+namespace mobile_commands_test {
 namespace create_interaction_choice_set_request {
 
 namespace am = application_manager;
@@ -206,6 +207,7 @@ TEST_F(CreateInteractionChoiceSetRequestTest, OnEvent_VR_UNSUPPORTED_RESOURCE) {
 }
 
 }  // namespace create_interaction_choice_set_request
+}  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
 }  // namespace tests
diff --git a/src/components/application_manager/test/commands/mobile/delete_sub_menu_test.cc b/src/components/application_manager/test/commands/mobile/delete_sub_menu_test.cc
index 36c4614343..d594a35fe6 100644
--- a/src/components/application_manager/test/commands/mobile/delete_sub_menu_test.cc
+++ b/src/components/application_manager/test/commands/mobile/delete_sub_menu_test.cc
@@ -47,6 +47,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace delete_sub_menu_request {
 
 using ::testing::_;
 using ::testing::Mock;
@@ -139,6 +140,7 @@ TEST_F(DeleteSubMenuRequestTest, OnEvent_UI_UNSUPPORTED_RESOURCE) {
   Mock::VerifyAndClearExpectations(&mock_message_helper_);
 }
 
+}  // namespace delete_sub_menu_request
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/diagnostic_message_request_test.cc b/src/components/application_manager/test/commands/mobile/diagnostic_message_request_test.cc
index ff8098b228..4f401bcefc 100644
--- a/src/components/application_manager/test/commands/mobile/diagnostic_message_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/diagnostic_message_request_test.cc
@@ -51,6 +51,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace diagnostic_message_request {
 
 using ::testing::_;
 using ::testing::Return;
@@ -176,6 +177,7 @@ TEST_F(DiagnosticMessageRequestTest, OnEvent_SUCCESS) {
   command->on_event(event);
 }
 
+}  // namespace diagnostic_message_request
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/dial_number_request_test.cc b/src/components/application_manager/test/commands/mobile/dial_number_request_test.cc
index 6f51b4f421..2f7415c98e 100644
--- a/src/components/application_manager/test/commands/mobile/dial_number_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/dial_number_request_test.cc
@@ -51,6 +51,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace dial_number_request {
 
 using ::testing::_;
 using ::testing::Return;
@@ -179,6 +180,7 @@ TEST_F(DialNumberRequestTest, OnEvent_SUCCESS) {
   command->on_event(event);
 }
 
+}  // namespace dial_number_request
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/end_audio_pass_thru_request_test.cc b/src/components/application_manager/test/commands/mobile/end_audio_pass_thru_request_test.cc
index 79a09c004e..ceb5e3b916 100644
--- a/src/components/application_manager/test/commands/mobile/end_audio_pass_thru_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/end_audio_pass_thru_request_test.cc
@@ -49,6 +49,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace end_audio_pass_thru_request {
 
 namespace am = ::application_manager;
 using ::testing::_;
@@ -126,6 +127,7 @@ TEST_F(EndAudioPassThruRequestTest, OnEvent_UI_UNSUPPORTED_RESOUCRE) {
   Mock::VerifyAndClearExpectations(&mock_message_helper_);
 }
 
+}  // namespace end_audio_pass_thru_request
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/get_dtcs_request_test.cc b/src/components/application_manager/test/commands/mobile/get_dtcs_request_test.cc
index 4552b1f033..808a7ad10f 100644
--- a/src/components/application_manager/test/commands/mobile/get_dtcs_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/get_dtcs_request_test.cc
@@ -51,6 +51,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace get_dtcs_request {
 
 using ::testing::_;
 using ::testing::Return;
@@ -126,6 +127,7 @@ TEST_F(GetDTCsRequestTest, OnEvent_SUCCESS) {
   command->on_event(event);
 }
 
+}  // namespace get_dtcs_request
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/get_vehicle_data_request_test.cc b/src/components/application_manager/test/commands/mobile/get_vehicle_data_request_test.cc
index 93fbaa54ca..1f851dd8a7 100644
--- a/src/components/application_manager/test/commands/mobile/get_vehicle_data_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/get_vehicle_data_request_test.cc
@@ -52,6 +52,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace get_vehicle_data_request {
 
 using ::testing::_;
 using ::testing::Return;
@@ -246,6 +247,7 @@ TEST_F(GetVehicleDataRequestTest, OnEvent_DataNotAvailable_SUCCESS) {
 
 #endif  // HMI_DBUS_API
 
+}  // namespace get_vehicle_data_request
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/list_files_request_test.cc b/src/components/application_manager/test/commands/mobile/list_files_request_test.cc
index 9b33bc0ade..85377054ef 100644
--- a/src/components/application_manager/test/commands/mobile/list_files_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/list_files_request_test.cc
@@ -49,6 +49,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace list_files_request {
 
 using ::testing::_;
 using ::testing::Return;
@@ -122,6 +123,7 @@ TEST_F(ListFilesRequestTest, Run_SUCCESS) {
                     .asInt()));
 }
 
+}  // namespace list_files_request
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/on_button_notification_commands_test.cc b/src/components/application_manager/test/commands/mobile/on_button_notification_commands_test.cc
index 79bdd8125c..8efb3498cc 100644
--- a/src/components/application_manager/test/commands/mobile/on_button_notification_commands_test.cc
+++ b/src/components/application_manager/test/commands/mobile/on_button_notification_commands_test.cc
@@ -51,6 +51,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace on_button_notification {
 
 namespace am = ::application_manager;
 namespace commands = am::commands;
@@ -340,6 +341,7 @@ TYPED_TEST(OnButtonNotificationCommandsTest, Run_SUCCESS) {
   command->Run();
 }
 
+}  // namespace on_button_notification
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/on_command_notification_test.cc b/src/components/application_manager/test/commands/mobile/on_command_notification_test.cc
index b4eb684bb8..def324bfb6 100644
--- a/src/components/application_manager/test/commands/mobile/on_command_notification_test.cc
+++ b/src/components/application_manager/test/commands/mobile/on_command_notification_test.cc
@@ -45,6 +45,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace on_command_notification {
 
 namespace am = ::application_manager;
 
@@ -129,6 +130,7 @@ TEST_F(OnCommandNotificationTest, Run_SUCCESS) {
   command->Run();
 }
 
+}  // namespace on_command_notification
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/on_hash_change_notification_test.cc b/src/components/application_manager/test/commands/mobile/on_hash_change_notification_test.cc
index bc6f507e14..9ef978d756 100644
--- a/src/components/application_manager/test/commands/mobile/on_hash_change_notification_test.cc
+++ b/src/components/application_manager/test/commands/mobile/on_hash_change_notification_test.cc
@@ -43,6 +43,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace on_hash_change_notification {
 
 namespace strings = application_manager::strings;
 
@@ -120,6 +121,7 @@ TEST_F(OnHashChangeNotificationTest, Run_InvalidApp_NoNotification) {
             (*msg)[strings::params][strings::message_type].asInt());
 }
 
+}  // namespace on_hash_change_notification
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/on_hmi_status_notification_from_mobile_test.cc b/src/components/application_manager/test/commands/mobile/on_hmi_status_notification_from_mobile_test.cc
index bb92c19214..2cfed4a26a 100644
--- a/src/components/application_manager/test/commands/mobile/on_hmi_status_notification_from_mobile_test.cc
+++ b/src/components/application_manager/test/commands/mobile/on_hmi_status_notification_from_mobile_test.cc
@@ -42,6 +42,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace on_hmi_status_notification_from_mobile {
 
 namespace {
 const uint32_t kConnectionKey = 1u;
@@ -272,6 +273,7 @@ TEST_F(OnHMIStatusNotificationFromMobileTest,
             (*msg)[strings::params][strings::message_type].asInt());
 }
 
+}  // namespace on_hmi_status_notification_from_mobile
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/on_hmi_status_notification_test.cc b/src/components/application_manager/test/commands/mobile/on_hmi_status_notification_test.cc
index 016bb2bb1d..8f2ce3d3dc 100644
--- a/src/components/application_manager/test/commands/mobile/on_hmi_status_notification_test.cc
+++ b/src/components/application_manager/test/commands/mobile/on_hmi_status_notification_test.cc
@@ -40,6 +40,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace on_hmi_status_notification {
 
 namespace {
 const uint32_t kConnectionKey = 1u;
@@ -207,6 +208,7 @@ TEST_F(OnHMIStatusNotificationTest, Run_FullAndTrueProperties_SUCCESS) {
   VerifySendNotificationData(msg);
 }
 
+}  // namespace on_hmi_status_notification
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/on_keyboard_input_notification_test.cc b/src/components/application_manager/test/commands/mobile/on_keyboard_input_notification_test.cc
index 2eeadce078..d8240dfb62 100644
--- a/src/components/application_manager/test/commands/mobile/on_keyboard_input_notification_test.cc
+++ b/src/components/application_manager/test/commands/mobile/on_keyboard_input_notification_test.cc
@@ -42,6 +42,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace on_keyboard_input_notification {
 
 namespace strings = application_manager::strings;
 
@@ -165,6 +166,7 @@ TEST_F(OnKeyBoardInputNotificationTest, Run_InvalidApp_NoNotification) {
   command->Run();
 }
 
+}  // namespace on_keyboard_input_notification
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/on_system_request_notification_test.cc b/src/components/application_manager/test/commands/mobile/on_system_request_notification_test.cc
index 2b5efd29cb..7aab4b1b37 100644
--- a/src/components/application_manager/test/commands/mobile/on_system_request_notification_test.cc
+++ b/src/components/application_manager/test/commands/mobile/on_system_request_notification_test.cc
@@ -45,6 +45,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace on_system_request_notification {
 
 namespace strings = application_manager::strings;
 
@@ -209,6 +210,7 @@ TEST_F(OnSystemRequestNotificationTest, Run_RequestNotAllowed_NoNotification) {
   command->Run();
 }
 
+}  // namespace on_system_request_notification
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/on_tbt_client_state_notification_test.cc b/src/components/application_manager/test/commands/mobile/on_tbt_client_state_notification_test.cc
index c32c334c0f..59cddc325f 100644
--- a/src/components/application_manager/test/commands/mobile/on_tbt_client_state_notification_test.cc
+++ b/src/components/application_manager/test/commands/mobile/on_tbt_client_state_notification_test.cc
@@ -46,6 +46,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace on_tbt_client_state_notification {
 
 namespace am = ::application_manager;
 
@@ -132,6 +133,7 @@ TEST_F(OnTBTClientStateNotificationTest,
   command_->Run();
 }
 
+}  // namespace on_tbt_client_state_notification
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/on_touch_event_notification_test.cc b/src/components/application_manager/test/commands/mobile/on_touch_event_notification_test.cc
index 2156aa4c97..466facec1f 100644
--- a/src/components/application_manager/test/commands/mobile/on_touch_event_notification_test.cc
+++ b/src/components/application_manager/test/commands/mobile/on_touch_event_notification_test.cc
@@ -46,6 +46,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace on_touch_event_notification {
 
 namespace am = ::application_manager;
 
@@ -129,6 +130,7 @@ TEST_F(OnTouchEventNotificationTest, Run_NotEmptyListOfAppsWithNavi_SUCCESS) {
   command_->Run();
 }
 
+}  // namespace on_touch_event_notification
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/on_vehicle_data_notification_test.cc b/src/components/application_manager/test/commands/mobile/on_vehicle_data_notification_test.cc
index c71c40d8c2..d00e62bcfb 100644
--- a/src/components/application_manager/test/commands/mobile/on_vehicle_data_notification_test.cc
+++ b/src/components/application_manager/test/commands/mobile/on_vehicle_data_notification_test.cc
@@ -50,6 +50,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace on_vehicle_data_notification {
 
 namespace am = ::application_manager;
 
@@ -140,6 +141,7 @@ TEST_F(OnVehicleDataNotificationTest,
   command_->Run();
 }
 
+}  // namespace on_vehicle_data_notification
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/on_way_point_change_notification_test.cc b/src/components/application_manager/test/commands/mobile/on_way_point_change_notification_test.cc
index aaa6c8f171..b0dd3c142c 100644
--- a/src/components/application_manager/test/commands/mobile/on_way_point_change_notification_test.cc
+++ b/src/components/application_manager/test/commands/mobile/on_way_point_change_notification_test.cc
@@ -46,6 +46,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace on_way_point_change_notification {
 
 namespace am = ::application_manager;
 
@@ -108,6 +109,7 @@ TEST_F(OnWayPointChangeNotificationTest,
   command_->Run();
 }
 
+}  // namespace on_way_point_change_notification
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/perform_audio_pass_thru_test.cc b/src/components/application_manager/test/commands/mobile/perform_audio_pass_thru_test.cc
index b6a76d51cc..61dcc35d5a 100644
--- a/src/components/application_manager/test/commands/mobile/perform_audio_pass_thru_test.cc
+++ b/src/components/application_manager/test/commands/mobile/perform_audio_pass_thru_test.cc
@@ -47,6 +47,7 @@
 namespace test {
 namespace components {
 namespace commands_test {
+namespace mobile_commands_test {
 namespace perform_audio_pass_thru_request {
 
 namespace am = application_manager;
@@ -205,6 +206,7 @@ TEST_F(PerformAudioPassThruRequestTest,
 }
 
 }  // namespace perform_audio_pass_thru_request
+}  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
 }  // namespace tests
diff --git a/src/components/application_manager/test/commands/mobile/perform_interaction_test.cc b/src/components/application_manager/test/commands/mobile/perform_interaction_test.cc
index d261dee8ec..22ce735c61 100644
--- a/src/components/application_manager/test/commands/mobile/perform_interaction_test.cc
+++ b/src/components/application_manager/test/commands/mobile/perform_interaction_test.cc
@@ -53,6 +53,7 @@
 namespace test {
 namespace components {
 namespace commands_test {
+namespace mobile_commands_test {
 namespace perform_interaction_request {
 
 namespace am = application_manager;
@@ -271,6 +272,7 @@ TEST_F(PerformInteractionRequestTest,
 }
 
 }  // namespace perform_interaction_request
+}  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
 }  // namespace tests
diff --git a/src/components/application_manager/test/commands/mobile/read_did_request_test.cc b/src/components/application_manager/test/commands/mobile/read_did_request_test.cc
index 9028a470a0..89b65323ca 100644
--- a/src/components/application_manager/test/commands/mobile/read_did_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/read_did_request_test.cc
@@ -51,6 +51,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace read_did_request {
 
 using ::testing::_;
 using ::testing::DoAll;
@@ -153,6 +154,7 @@ TEST_F(ReadDIDRequestTest, Run_SUCCESS) {
                     .asInt()));
 }
 
+}  // namespace read_did_request
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/register_app_interface_request_test.cc b/src/components/application_manager/test/commands/mobile/register_app_interface_request_test.cc
index 5679d49b63..c420b6a218 100644
--- a/src/components/application_manager/test/commands/mobile/register_app_interface_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/register_app_interface_request_test.cc
@@ -59,6 +59,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace register_app_interface_request {
 
 using ::testing::_;
 using ::testing::Return;
@@ -330,6 +331,7 @@ TEST_F(RegisterAppInterfaceRequestTest,
   command_->Run();
 }
 
+}  // namespace register_app_interface_request
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/scrollable_message_test.cc b/src/components/application_manager/test/commands/mobile/scrollable_message_test.cc
index 02744a66ea..6caf804d2c 100644
--- a/src/components/application_manager/test/commands/mobile/scrollable_message_test.cc
+++ b/src/components/application_manager/test/commands/mobile/scrollable_message_test.cc
@@ -48,6 +48,8 @@
 namespace test {
 namespace components {
 namespace commands_test {
+namespace mobile_commands_test {
+namespace scrollable_message_request {
 
 namespace am = application_manager;
 using am::commands::ScrollableMessageRequest;
@@ -162,6 +164,8 @@ TEST_F(ScrollableMessageRequestTest, OnEvent_UI_UNSUPPORTED_RESOURCE) {
   Mock::VerifyAndClearExpectations(&mock_message_helper_);
 }
 
+}  // namespace scrollable_message_request
+}  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
 }  // namespace tests
diff --git a/src/components/application_manager/test/commands/mobile/set_app_icon_test.cc b/src/components/application_manager/test/commands/mobile/set_app_icon_test.cc
index 9e5e62fc1c..b51b7c83ea 100644
--- a/src/components/application_manager/test/commands/mobile/set_app_icon_test.cc
+++ b/src/components/application_manager/test/commands/mobile/set_app_icon_test.cc
@@ -47,6 +47,8 @@
 namespace test {
 namespace components {
 namespace commands_test {
+namespace mobile_commands_test {
+namespace set_app_icon_request {
 
 namespace am = application_manager;
 using am::commands::SetAppIconRequest;
@@ -159,6 +161,8 @@ TEST_F(SetAppIconRequestTest, OnEvent_UI_UNSUPPORTED_RESOURCE) {
   Mock::VerifyAndClearExpectations(&mock_message_helper_);
 }
 
+}  // namespace set_app_icon_request
+}  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
 }  // namespace tests
diff --git a/src/components/application_manager/test/commands/mobile/set_display_layout_test.cc b/src/components/application_manager/test/commands/mobile/set_display_layout_test.cc
index 839d9a452e..1052352272 100644
--- a/src/components/application_manager/test/commands/mobile/set_display_layout_test.cc
+++ b/src/components/application_manager/test/commands/mobile/set_display_layout_test.cc
@@ -48,6 +48,7 @@
 namespace test {
 namespace components {
 namespace commands_test {
+namespace mobile_commands_test {
 namespace set_display_layout_request {
 
 namespace am = application_manager;
@@ -173,6 +174,7 @@ TEST_F(SetDisplayLayoutRequestTest,
 }
 
 }  // namespace set_display_layout_request
+}  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
 }  // namespace tests
diff --git a/src/components/application_manager/test/commands/mobile/set_global_properties_test.cc b/src/components/application_manager/test/commands/mobile/set_global_properties_test.cc
index 487be74667..f599601f53 100644
--- a/src/components/application_manager/test/commands/mobile/set_global_properties_test.cc
+++ b/src/components/application_manager/test/commands/mobile/set_global_properties_test.cc
@@ -47,6 +47,7 @@
 namespace test {
 namespace components {
 namespace commands_test {
+namespace mobile_commands_test {
 namespace set_global_properties_request {
 
 namespace am = application_manager;
@@ -275,6 +276,7 @@ TEST_F(SetGlobalPropertiesRequestTest,
 }
 
 }  // namespace set_global_properties_request
+}  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
 }  // namespace tests
diff --git a/src/components/application_manager/test/commands/mobile/show_test.cc b/src/components/application_manager/test/commands/mobile/show_test.cc
index 89c600362b..68304ddfd0 100644
--- a/src/components/application_manager/test/commands/mobile/show_test.cc
+++ b/src/components/application_manager/test/commands/mobile/show_test.cc
@@ -47,6 +47,8 @@
 namespace test {
 namespace components {
 namespace commands_test {
+namespace mobile_commands_test {
+namespace show_request {
 
 namespace am = application_manager;
 using am::commands::ShowRequest;
@@ -153,6 +155,8 @@ TEST_F(ShowRequestTest, OnEvent_UI_UNSUPPORTED_RESOURCE) {
   Mock::VerifyAndClearExpectations(&mock_message_helper_);
 }
 
+}  // namespace show_request
+}  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
 }  // namespace tests
diff --git a/src/components/application_manager/test/commands/mobile/simple_notification_commands_test.cc b/src/components/application_manager/test/commands/mobile/simple_notification_commands_test.cc
index b8b2409c15..680569f41a 100644
--- a/src/components/application_manager/test/commands/mobile/simple_notification_commands_test.cc
+++ b/src/components/application_manager/test/commands/mobile/simple_notification_commands_test.cc
@@ -49,6 +49,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace simple_notification_commands_test {
 
 namespace am = ::application_manager;
 namespace commands = am::commands;
@@ -89,6 +90,7 @@ TYPED_TEST(MobileNotificationCommandsTest, Run_SendMessageToMobile_SUCCESS) {
   command->Run();
 }
 
+}  // namespace simple_notification_commands_test
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/simple_response_commands_test.cc b/src/components/application_manager/test/commands/mobile/simple_response_commands_test.cc
index 9534da9561..831c5cd91c 100644
--- a/src/components/application_manager/test/commands/mobile/simple_response_commands_test.cc
+++ b/src/components/application_manager/test/commands/mobile/simple_response_commands_test.cc
@@ -58,6 +58,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace simple_response_commands_test {
 
 namespace commands = ::application_manager::commands;
 
@@ -99,6 +100,7 @@ TYPED_TEST(MobileResponseCommandsTest, Run_SendResponseToMobile_SUCCESS) {
   command->Run();
 }
 
+}  // namespace simple_response_commands_test
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/slider_test.cc b/src/components/application_manager/test/commands/mobile/slider_test.cc
index 7600d30304..990d47334a 100644
--- a/src/components/application_manager/test/commands/mobile/slider_test.cc
+++ b/src/components/application_manager/test/commands/mobile/slider_test.cc
@@ -47,6 +47,8 @@
 namespace test {
 namespace components {
 namespace commands_test {
+namespace mobile_commands_test {
+namespace slider_request {
 
 namespace am = application_manager;
 using am::commands::SliderRequest;
@@ -151,6 +153,8 @@ TEST_F(SliderRequestTest, OnEvent_UI_UNSUPPORTED_RESOURCE) {
   Mock::VerifyAndClearExpectations(&mock_message_helper_);
 }
 
+}  // namespace slider_request
+}  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
 }  // namespace tests
diff --git a/src/components/application_manager/test/commands/mobile/speak_request_test.cc b/src/components/application_manager/test/commands/mobile/speak_request_test.cc
index 65f1ef36db..5d23120943 100644
--- a/src/components/application_manager/test/commands/mobile/speak_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/speak_request_test.cc
@@ -53,6 +53,8 @@
 namespace test {
 namespace components {
 namespace commands_test {
+namespace mobile_commands_test {
+namespace speak_request {
 
 namespace am = application_manager;
 namespace hmi_response = ::application_manager::hmi_response;
@@ -184,6 +186,8 @@ TEST_F(SpeakRequestTest,
                     true);
 }
 
+}  // namespace speak_request
+}  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace component
 }  // namespace test
diff --git a/src/components/application_manager/test/commands/mobile/subscribe_button_request_test.cc b/src/components/application_manager/test/commands/mobile/subscribe_button_request_test.cc
index ea82670913..8d31b67a53 100644
--- a/src/components/application_manager/test/commands/mobile/subscribe_button_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/subscribe_button_request_test.cc
@@ -50,6 +50,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace subscribe_button_request {
 
 using ::testing::_;
 using ::testing::Return;
@@ -196,6 +197,7 @@ TEST_F(SubscribeButtonRequestTest, Run_SUCCESS) {
                                     [am::strings::result_code].asInt()));
 }
 
+}  // namespace subscribe_button_request
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/subscribe_way_points_request_test.cc b/src/components/application_manager/test/commands/mobile/subscribe_way_points_request_test.cc
index ff149504fa..aa55f54b6a 100644
--- a/src/components/application_manager/test/commands/mobile/subscribe_way_points_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/subscribe_way_points_request_test.cc
@@ -47,6 +47,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace subscribe_way_points_request {
 
 using ::testing::_;
 using ::testing::Return;
@@ -112,6 +113,7 @@ TEST_F(SubscribeWayPointsRequestTest, OnEvent_SUCCESS) {
   command->on_event(event);
 }
 
+}  // namespace subscribe_way_points_request
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/unregister_app_interface_request_test.cc b/src/components/application_manager/test/commands/mobile/unregister_app_interface_request_test.cc
index b2b1901d4e..7cc5e59470 100644
--- a/src/components/application_manager/test/commands/mobile/unregister_app_interface_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/unregister_app_interface_request_test.cc
@@ -44,6 +44,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace unregister_app_interface_request {
 
 namespace am = ::application_manager;
 namespace mobile_result = mobile_apis::Result;
@@ -110,6 +111,7 @@ TEST_F(UnregisterAppInterfaceRequestTest, Run_SUCCESS) {
   command->Run();
 }
 
+}  // namespace unregister_app_interface_request
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/unsubscribe_button_request_test.cc b/src/components/application_manager/test/commands/mobile/unsubscribe_button_request_test.cc
index 6518d8131a..a71f8a43c8 100644
--- a/src/components/application_manager/test/commands/mobile/unsubscribe_button_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/unsubscribe_button_request_test.cc
@@ -12,6 +12,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace unsubscribe_button_request {
 
 namespace am = ::application_manager;
 namespace mobile_result = mobile_apis::Result;
@@ -97,6 +98,7 @@ TEST_F(UnsubscribeButtonRequestTest, Run_SUCCESS) {
   command->Run();
 }
 
+}  // namespace unsubscribe_button_request
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/unsubscribe_vehicle_request_test.cc b/src/components/application_manager/test/commands/mobile/unsubscribe_vehicle_request_test.cc
index 964f1944c5..eae368347e 100644
--- a/src/components/application_manager/test/commands/mobile/unsubscribe_vehicle_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/unsubscribe_vehicle_request_test.cc
@@ -44,6 +44,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace unsubscribe_vehicle_data_request {
 
 namespace am = ::application_manager;
 namespace mobile_result = mobile_apis::Result;
@@ -285,6 +286,7 @@ TEST_F(UnsubscribeVehicleRequestTest, OnEvent_DataUnsubscribed_SUCCESS) {
   command->on_event(test_event);
 }
 
+}  // namespace unsubscribe_vehicle_data_request
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/unsubscribe_vehicle_response_test.cc b/src/components/application_manager/test/commands/mobile/unsubscribe_vehicle_response_test.cc
index 9c87b350b8..532948e5db 100644
--- a/src/components/application_manager/test/commands/mobile/unsubscribe_vehicle_response_test.cc
+++ b/src/components/application_manager/test/commands/mobile/unsubscribe_vehicle_response_test.cc
@@ -42,6 +42,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace unsubscribe_vehicle_data_response {
 
 namespace commands = ::application_manager::commands;
 
@@ -103,6 +104,7 @@ TEST_F(UnsubscribeVehicleResponseTest,
   command->Run();
 }
 
+}  // namespace unsubscribe_vehicle_data_response
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/unsubscribe_way_points_request_test.cc~ff89c63... Cover UnsubscribeWayPoints and UpdateTurnList by Unit Tests. b/src/components/application_manager/test/commands/mobile/unsubscribe_way_points_request_test.cc
index e4a0d0fb6d..32d7179afd 100644
--- a/src/components/application_manager/test/commands/mobile/unsubscribe_way_points_request_test.cc~ff89c63... Cover UnsubscribeWayPoints and UpdateTurnList by Unit Tests.
+++ b/src/components/application_manager/test/commands/mobile/unsubscribe_way_points_request_test.cc
@@ -50,6 +50,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace unsubscribe_way_points_request {
 
 namespace am = ::application_manager;
 namespace mobile_result = mobile_apis::Result;
@@ -163,6 +164,7 @@ TEST_F(UnSubscribeWayPointsRequestTest,
   command_->on_event(event);
 }
 
+}  // namespace unsubscribe_way_points_request
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/test/commands/mobile/update_turn_list_request_test.cc b/src/components/application_manager/test/commands/mobile/update_turn_list_request_test.cc
index 7c8cb76041..5127324f28 100644
--- a/src/components/application_manager/test/commands/mobile/update_turn_list_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/update_turn_list_request_test.cc
@@ -53,6 +53,7 @@ namespace test {
 namespace components {
 namespace commands_test {
 namespace mobile_commands_test {
+namespace update_turn_list_request {
 
 namespace am = ::application_manager;
 namespace mobile_result = mobile_apis::Result;
@@ -308,6 +309,7 @@ TEST_F(UpdateTurnListRequestTest,
   command_->on_event(event);
 }
 
+}  // namespace update_turn_list_request
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components