diff options
| author | Yana Chernysheva <ychernysheva@luxoft.com> | 2020-06-16 17:53:50 +0300 |
|---|---|---|
| committer | Yana Chernysheva <ychernysheva@luxoft.com> | 2020-06-19 17:45:15 +0300 |
| commit | 668ac995133a1faad009fb07a32c9f3a62648653 (patch) | |
| tree | c80ed7a58f1955f94a2a96c850527c500e14e4d9 /src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_user_friendly_message_request_test.cc | |
| parent | 137d3288abb75af3233e0a7271f5351132ddac3d (diff) | |
| download | sdl_core-668ac995133a1faad009fb07a32c9f3a62648653.tar.gz | |
Add template functions and delete or mark unused methods as deprecated
Diffstat (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_user_friendly_message_request_test.cc')
| -rw-r--r-- | src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_user_friendly_message_request_test.cc | 10 |
1 files changed, 2 insertions, 8 deletions
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(); |