summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshwin Karemore <akaremor@ford.com>2018-06-29 16:32:30 +0200
committerAKalinich-Luxoft <AKalinich@luxoft.com>2018-07-26 18:56:37 +0300
commit58c57fed825fb73a01bceb17c2a2b48473fff6f2 (patch)
tree302ea0981baf15148a74a4d19130de97cdb05172
parentfa700ca1122a7c5261170c35310e4d61f9deda27 (diff)
downloadsdl_core-58c57fed825fb73a01bceb17c2a2b48473fff6f2.tar.gz
fix for show RPC UT
-rw-r--r--src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/show_test.cc27
1 files changed, 19 insertions, 8 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/show_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/show_test.cc
index f32aaa16c8..f582072398 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/show_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/show_test.cc
@@ -351,7 +351,7 @@ TEST_F(ShowRequestTest, Run_Graphic_SUCCESS) {
command->Run();
}
-TEST_F(ShowRequestTest, Run_Graphic_Canceled) {
+TEST_F(ShowRequestTest, Run_Graphic_Not_Verified) {
MessageSharedPtr msg = CreateMsgParams();
SmartObject msg_params(smart_objects::SmartType_Map);
@@ -364,11 +364,17 @@ TEST_F(ShowRequestTest, Run_Graphic_Canceled) {
EXPECT_CALL(app_mngr_, application(kConnectionKey))
.WillOnce(Return(mock_app_));
+ EXPECT_CALL(mock_message_helper_, VerifyImage(graphic, _, _))
+ .Times(0);
EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _));
- EXPECT_CALL(*mock_app_, app_id()).Times(0);
- EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_)).Times(0);
- EXPECT_CALL(*mock_app_, set_show_command(msg_params)).Times(0);
+ EXPECT_CALL(*mock_app_, app_id()).WillOnce(Return(kAppId));
+ msg_params[am::strings::app_id] = kAppId;
+ msg_params[am::hmi_request::show_strings] =
+ smart_objects::SmartObject(smart_objects::SmartType_Array);
+
+ EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_));
+ EXPECT_CALL(*mock_app_, set_show_command(msg_params));
command->Run();
}
@@ -418,7 +424,7 @@ TEST_F(ShowRequestTest, Run_SecondaryGraphic_SUCCESS) {
command->Run();
}
-TEST_F(ShowRequestTest, Run_SecondaryGraphic_Canceled) {
+TEST_F(ShowRequestTest, Run_SecondaryGraphic_Not_Verified) {
MessageSharedPtr msg = CreateMsgParams();
SmartObject msg_params(smart_objects::SmartType_Map);
@@ -431,11 +437,16 @@ TEST_F(ShowRequestTest, Run_SecondaryGraphic_Canceled) {
EXPECT_CALL(app_mngr_, application(kConnectionKey))
.WillOnce(Return(mock_app_));
+ EXPECT_CALL(mock_message_helper_, VerifyImage(graphic, _, _))
+ .Times(0);
EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _));
- EXPECT_CALL(*mock_app_, app_id()).Times(0);
+ EXPECT_CALL(*mock_app_, app_id()).WillOnce(Return(kAppId));
- EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_)).Times(0);
- EXPECT_CALL(*mock_app_, set_show_command(msg_params)).Times(0);
+ msg_params[am::strings::app_id] = kAppId;
+ msg_params[am::hmi_request::show_strings] =
+ smart_objects::SmartObject(smart_objects::SmartType_Array);
+ EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_));
+ EXPECT_CALL(*mock_app_, set_show_command(msg_params));
command->Run();
}