add testing support for VR optional

1 files changed, 60 insertions, 1 deletions

diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_interaction_choice_set_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_interaction_choice_set_test.cc
index 9066dc3a00..be0ed884ac 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_interaction_choice_set_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_interaction_choice_set_test.cc
@@ -233,7 +233,8 @@ TEST_F(CreateInteractionChoiceSetRequestTest, OnEvent_VR_UNSUPPORTED_RESOURCE) {
           Return(am::HmiInterfaces::HMI_INTERFACE_BasicCommunication));
 
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_)).WillOnce(Return(true));
-
+  ON_CALL(mock_message_helper_, CheckChoiceSetVRCommands(_))
+      .WillByDefault(Return(am::MessageHelper::ChoiceSetVRCommandsStatus::ALL));
   req_vr->Run();
 
   MessageSharedPtr vr_command_result;
@@ -437,6 +438,9 @@ TEST_F(CreateInteractionChoiceSetRequestTest,
   smart_objects::SmartObject* choice_set_id = NULL;
   EXPECT_CALL(*mock_app_, FindChoiceSet(kChoiceSetId))
       .WillOnce(Return(choice_set_id));
+      
+  ON_CALL(mock_message_helper_, CheckChoiceSetVRCommands(_))
+      .WillByDefault(Return(am::MessageHelper::ChoiceSetVRCommandsStatus::ALL));
 
   EXPECT_CALL(app_mngr_, GenerateGrammarID()).WillOnce(Return(kGrammarId));
   EXPECT_CALL(*mock_app_, AddChoiceSet(kChoiceSetId, _));
@@ -484,6 +488,40 @@ TEST_F(CreateInteractionChoiceSetRequestTest,
 }
 
 TEST_F(CreateInteractionChoiceSetRequestTest,
+       Run_WithoutVrCommands_SUCCESS) {
+  (*message_)[am::strings::msg_params][am::strings::choice_set][0]
+             [am::strings::menu_name] = kMenuName;
+  (*message_)[am::strings::msg_params][am::strings::choice_set][0]
+             [am::strings::image][am::strings::value] = kImage;
+  (*message_)[am::strings::msg_params][am::strings::choice_set][0]
+             [am::strings::choice_id] = kChoiceId1;
+  (*message_)[am::strings::msg_params][am::strings::choice_set][0]
+             [am::strings::secondary_image][am::strings::value] = kSecondImage;
+  (*message_)[am::strings::msg_params][am::strings::choice_set][1]
+             [am::strings::choice_id] = kChoiceId2;
+  (*message_)[am::strings::msg_params][am::strings::choice_set][1]
+             [am::strings::menu_name] = kMenuName;
+  (*message_)[am::strings::msg_params][am::strings::interaction_choice_set_id] =
+      kChoiceSetId;
+
+  EXPECT_CALL(app_mngr_, application(_)).WillOnce(Return(mock_app_));
+
+  EXPECT_CALL(mock_message_helper_, VerifyImage(_, _, _))
+      .WillRepeatedly(Return(mobile_apis::Result::SUCCESS));
+      
+  EXPECT_CALL(mock_message_helper_, CheckChoiceSetVRCommands(_))
+      .WillOnce(Return(am::MessageHelper::ChoiceSetVRCommandsStatus::NONE));
+
+  smart_objects::SmartObject* choice_set_id = NULL;
+  EXPECT_CALL(*mock_app_, FindChoiceSet(kChoiceSetId))
+      .WillOnce(Return(choice_set_id));
+
+  EXPECT_CALL(*mock_app_, AddChoiceSet(kChoiceSetId, _));
+
+  command_->Run();
+}
+
+TEST_F(CreateInteractionChoiceSetRequestTest,
        OnEvent_InvalidEventId_UNSUCCESS) {
   Event event(hmi_apis::FunctionID::INVALID_ENUM);
 
@@ -524,6 +562,9 @@ TEST_F(CreateInteractionChoiceSetRequestTest, OnEvent_ValidVrNoError_SUCCESS) {
   smart_objects::SmartObject* choice_set_id = NULL;
   EXPECT_CALL(*mock_app_, FindChoiceSet(kChoiceSetId))
       .WillOnce(Return(choice_set_id));
+      
+  ON_CALL(mock_message_helper_, CheckChoiceSetVRCommands(_))
+      .WillByDefault(Return(am::MessageHelper::ChoiceSetVRCommandsStatus::ALL));
 
   EXPECT_CALL(app_mngr_, GenerateGrammarID()).WillOnce(Return(kGrammarId));
   EXPECT_CALL(*mock_app_, AddChoiceSet(kChoiceSetId, _));
@@ -558,6 +599,9 @@ TEST_F(CreateInteractionChoiceSetRequestTest,
   smart_objects::SmartObject* choice_set_id = NULL;
   EXPECT_CALL(*mock_app_, FindChoiceSet(kChoiceSetId))
       .WillOnce(Return(choice_set_id));
+      
+  ON_CALL(mock_message_helper_, CheckChoiceSetVRCommands(_))
+      .WillByDefault(Return(am::MessageHelper::ChoiceSetVRCommandsStatus::ALL));
 
   EXPECT_CALL(app_mngr_, GenerateGrammarID()).WillOnce(Return(kGrammarId));
   EXPECT_CALL(*mock_app_, AddChoiceSet(kChoiceSetId, _));
@@ -593,6 +637,9 @@ TEST_F(CreateInteractionChoiceSetRequestTest,
   smart_objects::SmartObject* choice_set_id = NULL;
   EXPECT_CALL(*mock_app_, FindChoiceSet(kChoiceSetId))
       .WillOnce(Return(choice_set_id));
+      
+  ON_CALL(mock_message_helper_, CheckChoiceSetVRCommands(_))
+      .WillByDefault(Return(am::MessageHelper::ChoiceSetVRCommandsStatus::ALL));
 
   EXPECT_CALL(app_mngr_, GenerateGrammarID()).WillOnce(Return(kGrammarId));
   EXPECT_CALL(*mock_app_, AddChoiceSet(kChoiceSetId, _));
@@ -641,6 +688,9 @@ TEST_F(CreateInteractionChoiceSetRequestTest,
   smart_objects::SmartObject* choice_set_id = NULL;
   EXPECT_CALL(*mock_app_, FindChoiceSet(kChoiceSetId))
       .WillOnce(Return(choice_set_id));
+      
+  ON_CALL(mock_message_helper_, CheckChoiceSetVRCommands(_))
+      .WillByDefault(Return(am::MessageHelper::ChoiceSetVRCommandsStatus::ALL));
 
   EXPECT_CALL(app_mngr_, GenerateGrammarID()).WillOnce(Return(kGrammarId));
   EXPECT_CALL(*mock_app_, AddChoiceSet(kChoiceSetId, _));
@@ -683,6 +733,9 @@ TEST_F(CreateInteractionChoiceSetRequestTest, OnTimeOut_InvalidApp_UNSUCCESS) {
   smart_objects::SmartObject* choice_set_id = NULL;
   EXPECT_CALL(*mock_app_, FindChoiceSet(kChoiceSetId))
       .WillOnce(Return(choice_set_id));
+      
+  ON_CALL(mock_message_helper_, CheckChoiceSetVRCommands(_))
+      .WillByDefault(Return(am::MessageHelper::ChoiceSetVRCommandsStatus::ALL));
 
   EXPECT_CALL(app_mngr_, GenerateGrammarID()).WillOnce(Return(kGrammarId));
   EXPECT_CALL(*mock_app_, AddChoiceSet(kChoiceSetId, _));
@@ -725,6 +778,9 @@ TEST_F(CreateInteractionChoiceSetRequestTest,
 
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillOnce(Return(mock_app_));
+      
+  ON_CALL(mock_message_helper_, CheckChoiceSetVRCommands(_))
+      .WillByDefault(Return(am::MessageHelper::ChoiceSetVRCommandsStatus::ALL));
   EXPECT_CALL(app_mngr_, GenerateGrammarID()).WillOnce(Return(kGrammarId));
   ON_CALL(app_mngr_, GetNextHMICorrelationID())
       .WillByDefault(Return(kCorrelationId));
@@ -797,6 +853,9 @@ TEST_F(CreateInteractionChoiceSetRequestTest, Run_ErrorFromHmiFalse_UNSUCCESS) {
   smart_objects::SmartObject* choice_set_id = NULL;
   EXPECT_CALL(*mock_app_, FindChoiceSet(kChoiceSetId))
       .WillRepeatedly(Return(choice_set_id));
+      
+  ON_CALL(mock_message_helper_, CheckChoiceSetVRCommands(_))
+      .WillByDefault(Return(am::MessageHelper::ChoiceSetVRCommandsStatus::ALL));
 
   EXPECT_CALL(app_mngr_, GenerateGrammarID())
       .WillRepeatedly(Return(kGrammarId));