Update test namespaces in ApplicationManager component

Related tasks APPLINK-30588 APPLINK-30974

8 files changed, 29 insertions, 19 deletions

diff --git a/src/components/application_manager/test/event_engine_test.cc b/src/components/application_manager/test/event_engine_test.cc
index 1b7afc79c8..440763d4c3 100644
--- a/src/components/application_manager/test/event_engine_test.cc
+++ b/src/components/application_manager/test/event_engine_test.cc
@@ -177,6 +177,6 @@ TEST_F(EventEngineTest, Event_set_smart_object_ExpectObjectSet) {
   EXPECT_EQ(smart_object_with_type_notification, event_->smart_object());
 }
 
-}  // namespace event_engine
+}  // namespace event_engine_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/application_manager/test/message_helper/message_helper_test.cc b/src/components/application_manager/test/message_helper/message_helper_test.cc
index 77e791dc82..678636a6d7 100644
--- a/src/components/application_manager/test/message_helper/message_helper_test.cc
+++ b/src/components/application_manager/test/message_helper/message_helper_test.cc
@@ -46,8 +46,9 @@
 #include "application_manager/state_controller.h"
 #include "application_manager/resumption/resume_ctrl.h"
 
-namespace application_manager {
 namespace test {
+namespace components {
+namespace application_manager_test {
 
 namespace HmiLanguage = hmi_apis::Common_Language;
 namespace HmiResults = hmi_apis::Common_Result;
@@ -902,5 +903,6 @@ TEST_F(MessageHelperTest, SubscribeApplicationToSoftButton_CallFromApp) {
       message_params, appSharedPtr, function_id);
 }
 
+}  // namespace application_manager_test
+}  // namespace components
 }  // namespace test
-}  // namespace application_manager
diff --git a/src/components/application_manager/test/mobile_message_handler_test.cc b/src/components/application_manager/test/mobile_message_handler_test.cc
index 34a817d096..f92050d8c7 100644
--- a/src/components/application_manager/test/mobile_message_handler_test.cc
+++ b/src/components/application_manager/test/mobile_message_handler_test.cc
@@ -43,8 +43,9 @@
 #include "protocol/raw_message.h"
 #include "utils/make_shared.h"
 
-namespace application_manager {
 namespace test {
+namespace components {
+namespace application_manager_test {
 
 using protocol_handler::RawMessage;
 using protocol_handler::RawMessagePtr;
@@ -54,6 +55,8 @@ using protocol_handler::PROTOCOL_HEADER_V2_SIZE;
 using application_manager::MobileMessageHandler;
 using application_manager::ProtocolVersion;
 using ::testing::_;
+using ::application_manager::Message;
+using ::application_manager::MobileMessage;
 
 using testing::Return;
 
@@ -137,7 +140,7 @@ class MobileMessageHandlerTest : public testing::Test {
     EXPECT_EQ(full_data_size, message->data_size());
     EXPECT_EQ(payload_size, message->payload_size());
     EXPECT_TRUE(message->has_binary_data());
-    EXPECT_EQ(MessageType::kNotification, message->type());
+    EXPECT_EQ(application_manager::MessageType::kNotification, message->type());
   }
 
   void TestHandlingIncomingMessageWithoutBinaryDataProtocol(
@@ -157,7 +160,7 @@ class MobileMessageHandlerTest : public testing::Test {
     EXPECT_EQ(full_data_size, message->data_size());
     EXPECT_EQ(payload_size, message->payload_size());
     EXPECT_FALSE(message->has_binary_data());
-    EXPECT_EQ(MessageType::kNotification, message->type());
+    EXPECT_EQ(application_manager::MessageType::kNotification, message->type());
   }
 
   MobileMessage CreateMessageForSending(uint32_t protocol_version,
@@ -165,7 +168,7 @@ class MobileMessageHandlerTest : public testing::Test {
                                         uint32_t correlation_id,
                                         uint32_t connection_key,
                                         const std::string& json_msg,
-                                        BinaryData* data = NULL) {
+                                        application_manager::BinaryData* data = NULL) {
     MobileMessage message = utils::MakeShared<Message>(
         MessagePriority::FromServiceType(ServiceType::kRpc));
     message->set_function_id(function_id);
@@ -173,7 +176,7 @@ class MobileMessageHandlerTest : public testing::Test {
     message->set_connection_key(connection_key);
     message->set_protocol_version(
         static_cast<ProtocolVersion>(protocol_version));
-    message->set_message_type(MessageType::kNotification);
+    message->set_message_type(application_manager::MessageType::kNotification);
     if (data) {
       message->set_binary_data(data);
     }
@@ -214,7 +217,7 @@ class MobileMessageHandlerTest : public testing::Test {
   void TestHandlingOutgoingMessageProtocolWithBinaryData(
       const uint32_t protocol_version) {
     // Arrange
-    BinaryData* bin_dat = new BinaryData;
+    application_manager::BinaryData* bin_dat = new application_manager::BinaryData;
     bin_dat->push_back('\a');
 
     const uint32_t function_id = 247u;
@@ -251,7 +254,7 @@ TEST(mobile_message_test, basic_test) {
   MobileMessage message =
       utils::MakeShared<Message>(protocol_handler::MessagePriority::kDefault);
   EXPECT_FALSE(message->has_binary_data());
-  BinaryData* binary_data = new BinaryData;
+  application_manager::BinaryData* binary_data = new application_manager::BinaryData;
   binary_data->push_back('X');
   message->set_binary_data(binary_data);
   EXPECT_TRUE(message->has_binary_data());
@@ -350,5 +353,6 @@ TEST_F(
   TestHandlingOutgoingMessageProtocolWithBinaryData(protocol_version);
 }
 
+}  // namespace application_manager_test
+}  // namespace components
 }  // namespace test
-}  // namespace application_manager
diff --git a/src/components/application_manager/test/mobile_message_handler_v1_test.cc b/src/components/application_manager/test/mobile_message_handler_v1_test.cc
index 8301bf6f18..f69c7c90fc 100644
--- a/src/components/application_manager/test/mobile_message_handler_v1_test.cc
+++ b/src/components/application_manager/test/mobile_message_handler_v1_test.cc
@@ -45,9 +45,11 @@
 using protocol_handler::RawMessage;
 using protocol_handler::RawMessagePtr;
 using protocol_handler::PROTOCOL_HEADER_V1_SIZE;
+using application_manager::MobileMessageHandler;
 
-namespace application_manager {
 namespace test {
+namespace components {
+namespace application_manager_test {
 
 const int32_t connection_key_p1 = 1;
 const int32_t protocol_version_1 = 1;
@@ -105,8 +107,8 @@ TEST(MobileMessageHandlerTestV1Test,
      HandleOutgoingMessageProtocol_SendMessage_ExpectEqual) {
   uint32_t connection_key = 1;
 
-  MobileMessage message =
-      utils::MakeShared<Message>(protocol_handler::MessagePriority::kDefault);
+  application_manager::MobileMessage message =
+      utils::MakeShared<application_manager::Message>(protocol_handler::MessagePriority::kDefault);
 
   message->set_protocol_version(application_manager::ProtocolVersion::kV1);
   message->set_json_message(data_json);
@@ -122,5 +124,6 @@ TEST(MobileMessageHandlerTestV1Test,
             ptr->protocol_version());
 }
 
+}  // namespace application_manager_test
+}  // namespace components
 }  // namespace test
-}  // namespace application_manager
diff --git a/src/components/application_manager/test/policy_event_observer_test.cc b/src/components/application_manager/test/policy_event_observer_test.cc
index d62efab460..0625e89ddb 100644
--- a/src/components/application_manager/test/policy_event_observer_test.cc
+++ b/src/components/application_manager/test/policy_event_observer_test.cc
@@ -134,6 +134,6 @@ TEST_F(PolicyEventObserverTest,
   CheckResultsOnEvent(0u, 1u);
 }
 
-}  // namespace policy_event_observer
+}  // namespace policy_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/application_manager/test/policy_handler_test.cc b/src/components/application_manager/test/policy_handler_test.cc
index 44b4791f85..0a39d99361 100644
--- a/src/components/application_manager/test/policy_handler_test.cc
+++ b/src/components/application_manager/test/policy_handler_test.cc
@@ -81,6 +81,7 @@ using ::testing::SetArgReferee;
 using ::testing::SetArgPointee;
 using ::testing::DoAll;
 using ::testing::SetArgReferee;
+using application_manager::MockMessageHelper;
 
 class PolicyHandlerTest : public ::testing::Test {
  public:
diff --git a/src/components/application_manager/test/request_controller/request_controller_test.cc b/src/components/application_manager/test/request_controller/request_controller_test.cc
index 6d08e5bf56..d820921981 100644
--- a/src/components/application_manager/test/request_controller/request_controller_test.cc
+++ b/src/components/application_manager/test/request_controller/request_controller_test.cc
@@ -181,6 +181,6 @@ TEST_F(RequestControllerTestClass, ZeroValuePendingRequestsAmount) {
   }
 }
 
-}  // namespace request_controller
+}  // namespace request_controller_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/application_manager/test/zero_request_amount_test.cc b/src/components/application_manager/test/zero_request_amount_test.cc
index 0f52639575..cce0b2abf2 100644
--- a/src/components/application_manager/test/zero_request_amount_test.cc
+++ b/src/components/application_manager/test/zero_request_amount_test.cc
@@ -46,7 +46,7 @@
 
 namespace test {
 namespace components {
-namespace application {
+namespace application_manager_test {
 using namespace ::profile;
 
 using namespace application_manager::request_controller;
@@ -164,6 +164,6 @@ TEST(RequestControlTest, ZeroValueAppTimeScaleMaxRequests) {
   request_ctrl_.addMobileRequest(unreg, mobile_apis::HMILevel::HMI_FULL);
 }
 
-}  // namespace application
+}  // namespace application_manager_test
 }  // namespace components
 }  // namespace test