diff options
Diffstat (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands')
4 files changed, 9 insertions, 33 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_system_info_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_system_info_response_test.cc index 30d125ff46..8cdce4fa74 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_system_info_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_system_info_response_test.cc @@ -69,8 +69,7 @@ namespace { const uint32_t kConnectionKey = 2u; const std::string ccpu_version("4.1.3.B_EB355B"); const std::string wers_country_code("WAEGB"); -const uint32_t lang_code = 0u; -const std::string kLanguage = ""; +const std::string lang_code("EN-US"); } // namespace class GetSystemInfoResponseTest @@ -99,15 +98,8 @@ TEST_F(GetSystemInfoResponseTest, GetSystemInfo_SUCCESS) { ResponseFromHMIPtr command(CreateCommand<GetSystemInfoResponse>(command_msg)); - std::string language; - EXPECT_CALL(mock_message_helper_, - CommonLanguageToString( - static_cast<hmi_apis::Common_Language::eType>(lang_code))) - .WillOnce(Return(language)); - EXPECT_EQ(kLanguage, language); - EXPECT_CALL(mock_policy_handler_, - OnGetSystemInfo(ccpu_version, wers_country_code, kLanguage)); + OnGetSystemInfo(ccpu_version, wers_country_code, lang_code)); command->Run(); } @@ -121,11 +113,6 @@ TEST_F(GetSystemInfoResponseTest, GetSystemInfo_UNSUCCESS) { ResponseFromHMIPtr command(CreateCommand<GetSystemInfoResponse>(command_msg)); - EXPECT_CALL(mock_message_helper_, - CommonLanguageToString( - static_cast<hmi_apis::Common_Language::eType>(lang_code))) - .Times(0); - EXPECT_CALL(mock_hmi_capabilities_, UpdateCachedCapabilities()); EXPECT_CALL(mock_policy_handler_, SetPreloadedPtFlag(false)); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications_test.cc index 20ca4d3dff..3efdee405a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications_test.cc @@ -256,8 +256,6 @@ class HMICommandsNotificationsTest ON_CALL(app_mngr_, application_by_hmi_app(_)).WillByDefault(Return(app_)); ON_CALL(*app_ptr_, app_id()).WillByDefault(Return(kAppId_)); ON_CALL(app_mngr_, application(kConnectionKey)).WillByDefault(Return(app_)); - ON_CALL(mock_message_helper_, MobileLanguageToString(kMobileLanguage)) - .WillByDefault(Return(kDefaultLanguage)); ON_CALL(app_mngr_, connection_handler()) .WillByDefault(ReturnRef(mock_connection_handler_)); } @@ -786,7 +784,6 @@ TEST_F(HMICommandsNotificationsTest, std::shared_ptr<Command> command = CreateCommand<OnSystemInfoChangedNotification>(message); - EXPECT_CALL(mock_message_helper_, CommonLanguageToString(_)); EXPECT_CALL(mock_policy_handler_, OnSystemInfoChanged(_)); command->Run(); } @@ -1842,7 +1839,7 @@ TEST_F(HMICommandsNotificationsTest, OnDriverDistractionNotificationEmptyData) { ON_CALL(mock_policy_handler_, LockScreenDismissalEnabledState()) .WillByDefault(Return(OptionalBool(true))); - std::string required_language = "en-us"; + std::string required_language = "EN-US"; ON_CALL(mock_policy_handler_, LockScreenDismissalWarningMessage(required_language)) .WillByDefault(Return( @@ -1872,7 +1869,7 @@ TEST_F(HMICommandsNotificationsTest, typedef boost::optional<bool> OptionalBool; ON_CALL(mock_policy_handler_, LockScreenDismissalEnabledState()) .WillByDefault(Return(OptionalBool(true))); - std::string required_language = "en-us"; + std::string required_language = "EN-US"; ON_CALL(mock_policy_handler_, LockScreenDismissalWarningMessage(required_language)) .WillByDefault(Return( @@ -1900,7 +1897,9 @@ TEST_F(HMICommandsNotificationsTest, OnDriverDistractionNotificationValidApp) { typedef boost::optional<bool> OptionalBool; ON_CALL(mock_policy_handler_, LockScreenDismissalEnabledState()) .WillByDefault(Return(OptionalBool(true))); - std::string required_language = "en-us"; + std::string required_language = "EN-US"; + ON_CALL(*app_ptr_, ui_language()).WillByDefault(ReturnRef(kMobileLanguage)); + ON_CALL(mock_policy_handler_, LockScreenDismissalWarningMessage(required_language)) .WillByDefault(Return( diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_driver_distraction_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_driver_distraction_notification_test.cc index fe6ba7c4e3..642b4e651d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_driver_distraction_notification_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_driver_distraction_notification_test.cc @@ -95,8 +95,6 @@ class HMIOnDriverDistractionNotificationTest .WillByDefault(ReturnRef(kMobileLanguage)); ON_CALL(app_mngr_, application(kConnectionKey)) .WillByDefault(Return(mock_app_)); - ON_CALL(mock_message_helper_, MobileLanguageToString(kMobileLanguage)) - .WillByDefault(Return(kDefaultLanguage)); } MockAppPtr mock_app_; @@ -327,8 +325,6 @@ TEST_F(HMIOnDriverDistractionNotificationTest, mobile_apis::Language::FR_FR; std::string required_language = "FR-FR"; ON_CALL(*mock_app_, ui_language()).WillByDefault(ReturnRef(mobile_language)); - ON_CALL(mock_message_helper_, MobileLanguageToString(mobile_language)) - .WillByDefault(Return(required_language)); policy::CheckPermissionResult result; result.hmi_level_permitted = policy::kRpcAllowed; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_user_friendly_message_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_user_friendly_message_request_test.cc index 0e87acef1f..d457b2a697 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_user_friendly_message_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_user_friendly_message_request_test.cc @@ -62,8 +62,8 @@ using testing::ReturnRef; namespace { const uint32_t kCorrelationID = 1u; const uint32_t kAppID = 2u; -const std::string kLanguageDe = "de-de"; -const std::string kLanguageEn = "en-gb"; +const std::string kLanguageDe = "DE-DE"; +const std::string kLanguageEn = "EN-GB"; const std::string kMessageCodes = "messageCodes"; const hmi_apis::Common_Language::eType kLanguage = hmi_apis::Common_Language::EN_GB; @@ -102,8 +102,6 @@ TEST_F(SDLGetUserFriendlyMessageRequestTest, Run_LanguageSet_SUCCESS) { std::shared_ptr<SDLGetUserFriendlyMessageRequest> command( CreateCommand<SDLGetUserFriendlyMessageRequest>(msg)); - EXPECT_CALL(mock_message_helper_, CommonLanguageToString(kLanguage)) - .WillOnce(Return(kLanguageEn)); std::vector<std::string> msg_codes; msg_codes.push_back(kLanguageDe); msg_codes.push_back(kLanguageEn); @@ -129,8 +127,6 @@ TEST_F(SDLGetUserFriendlyMessageRequestTest, Run_LanguageNotSet_SUCCESS) { EXPECT_CALL(mock_hmi_capabilities_, active_ui_language()) .WillOnce(Return(kLanguage)); - EXPECT_CALL(mock_message_helper_, CommonLanguageToString(kLanguage)) - .WillOnce(Return(kLanguageEn)); std::vector<std::string> msg_codes; msg_codes.push_back(kLanguageDe); msg_codes.push_back(kLanguageEn); @@ -149,7 +145,6 @@ TEST_F(SDLGetUserFriendlyMessageRequestTest, Run_NoMsgCodes_Canceled) { std::shared_ptr<SDLGetUserFriendlyMessageRequest> command( CreateCommand<SDLGetUserFriendlyMessageRequest>(msg)); - EXPECT_CALL(mock_message_helper_, CommonLanguageToString(_)).Times(0); EXPECT_CALL(mock_policy_handler_, OnGetUserFriendlyMessage(_, _, _)).Times(0); command->Init(); @@ -181,7 +176,6 @@ TEST_F( std::shared_ptr<SDLGetUserFriendlyMessageRequest> command( CreateCommand<SDLGetUserFriendlyMessageRequest>(msg)); - EXPECT_CALL(mock_message_helper_, CommonLanguageToString(_)).Times(0); EXPECT_CALL(mock_policy_handler_, OnGetUserFriendlyMessage(_, _, _)).Times(0); command->Init(); |