Fixes for unit tests

 Fixes for unit tests, suggested in pull request

 Related task APPLINK-28083

2 files changed, 19 insertions, 29 deletions

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 e19bbf00d2..567c3d32f9 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
@@ -90,6 +90,7 @@ const uint32_t kConnectionKey = 2u;
 const std::string kMenuName = "LG";
 const uint32_t kFirstParentId = 10u;
 const uint32_t kSecondParentId = 1u;
+const std::string kErroredVRCommand = "l\namer";
 const std::string kFirstVrCommand = "lamer";
 const std::string kSecondVrCommand = "hacker";
 const uint32_t kFirstCommandId = 10u;
@@ -101,7 +102,7 @@ const int32_t kPosition = 10;
 
 class AddCommandRequestTest
     : public CommandRequestTest<CommandsTestMocks::kIsNice> {
- protected:
+ public:
   AddCommandRequestTest()
       : msg_(CreateMessage())
       , default_app_name_("test_default_app_name_")
@@ -118,6 +119,7 @@ class AddCommandRequestTest
     Mock::VerifyAndClearExpectations(&mock_message_helper_);
   }
 
+ protected:
   void InitBasicMessage() {
     (*msg_)[params][connection_key] = kConnectionKey;
     (*msg_)[msg_params][app_id] = kAppId;
@@ -232,7 +234,6 @@ class AddCommandRequestTest
 
 TEST_F(AddCommandRequestTest, Run_AppNotExisted_EXPECT_AppNotRegistered) {
   CreateBasicParamsUIRequest();
-  Mock::VerifyAndClearExpectations(&app_mngr_);
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillOnce(Return(ApplicationSharedPtr()));
   EXPECT_CALL(
@@ -273,7 +274,8 @@ TEST_F(AddCommandRequestTest, Run_MenuNameHasSyntaxError_EXPECT_INVALID_DATA) {
       .WillRepeatedly(Return(
           DataAccessor<application_manager::CommandsMap>(commands_map, lock_)));
   SmartObject parent = SmartObject(SmartType_Map);
-  EXPECT_CALL(*mock_app_, FindSubMenu(_)).WillOnce(Return(&parent));
+  EXPECT_CALL(*mock_app_, FindSubMenu(kFirstParentId))
+      .WillOnce(Return(&parent));
   EXPECT_CALL(app_mngr_,
               ManageMobileCommand(
                   MobileResultCodeIs(mobile_apis::Result::INVALID_DATA), _));
@@ -286,8 +288,7 @@ TEST_F(AddCommandRequestTest,
        Run_VRCommandsHaveSyntaxError_EXPECT_INVALID_DATA) {
   CreateBasicParamsVRRequest();
   SmartObject& msg_params = (*msg_)[strings::msg_params];
-  const std::string errored_vr_command = "l\namer";
-  msg_params[vr_commands][0] = errored_vr_command;
+  msg_params[vr_commands][0] = kErroredVRCommand;
   EXPECT_CALL(*mock_app_, FindCommand(kCmdId)).WillOnce(Return(so_ptr_.get()));
   am::CommandsMap commands_map;
   EXPECT_CALL(*mock_app_, commands_map())
@@ -382,7 +383,8 @@ TEST_F(AddCommandRequestTest,
   EXPECT_CALL(*mock_app_, commands_map())
       .WillRepeatedly(Return(
           DataAccessor<application_manager::CommandsMap>(commands_map, lock_)));
-  EXPECT_CALL(*mock_app_, FindSubMenu(_)).WillOnce(Return(so_ptr_.get()));
+  EXPECT_CALL(*mock_app_, FindSubMenu(kSecondParentId))
+      .WillOnce(Return(so_ptr_.get()));
   EXPECT_CALL(app_mngr_,
               ManageMobileCommand(
                   MobileResultCodeIs(mobile_apis::Result::INVALID_ID), _));
@@ -410,7 +412,8 @@ TEST_F(AddCommandRequestTest,
       .WillRepeatedly(Return(
           DataAccessor<application_manager::CommandsMap>(commands_map, lock_)));
   so_ptr_ = utils::MakeShared<SmartObject>(SmartType_Map);
-  EXPECT_CALL(*mock_app_, FindSubMenu(_)).WillOnce(Return(so_ptr_.get()));
+  EXPECT_CALL(*mock_app_, FindSubMenu(kSecondParentId))
+      .WillOnce(Return(so_ptr_.get()));
   EXPECT_CALL(app_mngr_,
               ManageMobileCommand(
                   MobileResultCodeIs(mobile_apis::Result::DUPLICATE_NAME), _));
@@ -452,7 +455,8 @@ TEST_F(AddCommandRequestTest,
       .WillRepeatedly(Return(
           DataAccessor<application_manager::CommandsMap>(commands_map, lock_)));
   so_ptr_ = utils::MakeShared<SmartObject>(SmartType_Map);
-  EXPECT_CALL(*mock_app_, FindSubMenu(_)).WillOnce(Return(so_ptr_.get()));
+  EXPECT_CALL(*mock_app_, FindSubMenu(kSecondParentId))
+      .WillOnce(Return(so_ptr_.get()));
   {
     InSequence dummy;
     EXPECT_CALL(
@@ -590,7 +594,6 @@ TEST_F(AddCommandRequestTest, OnEvent_UnknownEvent_UNSUCCESS) {
 
 TEST_F(AddCommandRequestTest, OnEvent_AppNotExisted_UNSUCCESS) {
   CreateBasicParamsUIRequest();
-  Mock::VerifyAndClearExpectations(&app_mngr_);
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillOnce(Return(ApplicationSharedPtr()));
   Event event(hmi_apis::FunctionID::UI_AddCommand);
@@ -1040,7 +1043,6 @@ TEST_F(AddCommandRequestTest,
 TEST_F(AddCommandRequestTest,
        OnTimeOut_AppNotExisted_NoAppRemoveCommandCalled) {
   CreateBasicParamsUIRequest();
-  Mock::VerifyAndClearExpectations(&app_mngr_);
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillOnce(Return(ApplicationSharedPtr()));
   EXPECT_CALL(*mock_app_, RemoveCommand(kCmdId)).Times(0);
@@ -1075,7 +1077,8 @@ TEST_F(AddCommandRequestTest, OnTimeOut_AppRemoveCommandCalled) {
       .WillRepeatedly(Return(
           DataAccessor<application_manager::CommandsMap>(commands_map, lock_)));
   so_ptr_ = utils::MakeShared<SmartObject>(SmartType_Map);
-  EXPECT_CALL(*mock_app_, FindSubMenu(_)).WillOnce(Return(so_ptr_.get()));
+  EXPECT_CALL(*mock_app_, FindSubMenu(kSecondParentId))
+      .WillOnce(Return(so_ptr_.get()));
   {
     InSequence dummy;
     EXPECT_CALL(
diff --git a/src/components/application_manager/test/commands/mobile/send_location_request_test.cc b/src/components/application_manager/test/commands/mobile/send_location_request_test.cc
index 21f0f9abd1..7d197010c7 100644
--- a/src/components/application_manager/test/commands/mobile/send_location_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/send_location_request_test.cc
@@ -54,6 +54,7 @@ using utils::SharedPtr;
 using testing::_;
 using testing::Return;
 using testing::ReturnRef;
+using ::testing::Mock;
 
 namespace strings = application_manager::strings;
 namespace hmi_response = application_manager::hmi_response;
@@ -99,6 +100,10 @@ class SendLocationRequestTest
     command_ = CreateCommand<UnwrappedSendLocationRequest>(message_);
   }
 
+  void TearDown() OVERRIDE {
+    Mock::VerifyAndClearExpectations(&mock_message_helper_);
+  }
+
   void InitialSetup(MessageSharedPtr message_) {
     (*message_)[strings::params][strings::connection_key] = kConnectionKey;
     (*message_)[strings::params][strings::function_id] = kFunctionID;
@@ -173,8 +178,6 @@ TEST_F(SendLocationRequestTest, Run_DeliveryMode_Success) {
   msg_params[strings::delivery_mode] = SmartObject();
   (*message_)[strings::msg_params] = msg_params;
   msg_params.erase(strings::delivery_mode);
-  EXPECT_CALL(mock_message_helper_, PrintSmartObject(_))
-      .WillOnce(Return(false));
   FinishSetup();
   command_->Run();
 }
@@ -183,8 +186,6 @@ TEST_F(SendLocationRequestTest, Run_LocationNameIsAllowed_Success) {
   InitialSetup(message_);
   (*message_)[strings::msg_params][strings::location_name] = "Location_Name";
   HMICapabilitiesSetupWithArguments(Common_TextFieldName::locationName);
-  EXPECT_CALL(mock_message_helper_, PrintSmartObject(_))
-      .WillOnce(Return(false));
   FinishSetup();
   command_->Run();
 }
@@ -210,8 +211,6 @@ TEST_F(SendLocationRequestTest, Run_LocationDescriptionIsAllowed_Success) {
   (*message_)[strings::msg_params][strings::location_description] =
       kLocationDescription;
   HMICapabilitiesSetupWithArguments(Common_TextFieldName::locationDescription);
-  EXPECT_CALL(mock_message_helper_, PrintSmartObject(_))
-      .WillOnce(Return(false));
   FinishSetup();
   command_->Run();
 }
@@ -240,8 +239,6 @@ TEST_F(SendLocationRequestTest, Run_AddressLinesAreAllowed_Success) {
       SmartObject(smart_objects::SmartType_Array);
   (*message_)[strings::msg_params][strings::address_lines][0] = kAddressLine;
   HMICapabilitiesSetupWithArguments(Common_TextFieldName::addressLines);
-  EXPECT_CALL(mock_message_helper_, PrintSmartObject(_))
-      .WillOnce(Return(false));
   FinishSetup();
   command_->Run();
 }
@@ -271,8 +268,6 @@ TEST_F(SendLocationRequestTest, Run_PhoneNumberIsAllowed_Success) {
   InitialSetup(message_);
   (*message_)[strings::msg_params][strings::phone_number] = kPhoneNumber;
   HMICapabilitiesSetupWithArguments(Common_TextFieldName::phoneNumber);
-  EXPECT_CALL(mock_message_helper_, PrintSmartObject(_))
-      .WillOnce(Return(false));
   FinishSetup();
   command_->Run();
 }
@@ -302,8 +297,6 @@ TEST_F(SendLocationRequestTest, Run_AddressesContainWrongSyntax_Cancelled) {
       kCorrectAddress;
   (*message_)[strings::msg_params][strings::address]["Address 2"] =
       kAddressWithWrongSyntax;
-  EXPECT_CALL(mock_message_helper_, PrintSmartObject(_))
-      .WillOnce(Return(false));
   FinishSetupCancelled(mobile_apis::Result::INVALID_DATA);
   command_->Run();
 }
@@ -319,8 +312,6 @@ TEST_F(SendLocationRequestTest, Run_LocationImageValid_Success) {
       VerifyImage(
           (*message_)[strings::msg_params][strings::location_image], _, _))
       .WillOnce(Return(mobile_apis::Result::SUCCESS));
-  EXPECT_CALL(mock_message_helper_, PrintSmartObject(_))
-      .WillOnce(Return(false));
   FinishSetup();
   command_->Run();
 }
@@ -336,8 +327,6 @@ TEST_F(SendLocationRequestTest, Run_LocationImageInvalid_Cancelled) {
       VerifyImage(
           (*message_)[strings::msg_params][strings::location_image], _, _))
       .WillOnce(Return(mobile_apis::Result::ABORTED));
-  EXPECT_CALL(mock_message_helper_, PrintSmartObject(_))
-      .WillOnce(Return(false));
   FinishSetupCancelled(mobile_apis::Result::ABORTED);
   command_->Run();
 }
@@ -400,8 +389,6 @@ TEST_F(SendLocationRequestTest, Run_MandatoryParamsDisallowed_InvalidData) {
   EXPECT_CALL(app_mngr_,
               ManageMobileCommand(
                   MobileResultCodeIs(mobile_apis::Result::INVALID_DATA), _));
-  EXPECT_CALL(mock_message_helper_, PrintSmartObject(_))
-      .WillOnce(Return(false));
   command_->Run();
 }