Remove unnecessary set_xxx_supported() calls

These calls are not needed unless load_capabilities_from_file()
is called multiple times. Unit test cases are also updated so
that the function is called only once.

Reflecting review comment.

2 files changed, 44 insertions, 15 deletions

diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc
index 6378bbca28..28049f8e35 100644
--- a/src/components/application_manager/src/hmi_capabilities_impl.cc
+++ b/src/components/application_manager/src/hmi_capabilities_impl.cc
@@ -1068,7 +1068,6 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
       }
       if (check_existing_json_member(ui, "systemCapabilities")) {
         Json::Value system_capabilities = ui.get("systemCapabilities", "");
-        set_navigation_supported(false);
         if (check_existing_json_member(system_capabilities,
                                        "navigationCapability")) {
           Json::Value navigation_capability =
@@ -1081,7 +1080,6 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
             set_navigation_supported(true);
           }
         }
-        set_phone_call_supported(false);
         if (check_existing_json_member(system_capabilities,
                                        "phoneCapability")) {
           Json::Value phone_capability =
@@ -1094,7 +1092,6 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
             set_phone_call_supported(true);
           }
         }
-        set_video_streaming_supported(false);
         if (check_existing_json_member(system_capabilities,
                                        "videoStreamingCapability")) {
           Json::Value vs_capability =
diff --git a/src/components/application_manager/test/hmi_capabilities_test.cc b/src/components/application_manager/test/hmi_capabilities_test.cc
index 08032fa070..2eb6956353 100644
--- a/src/components/application_manager/test/hmi_capabilities_test.cc
+++ b/src/components/application_manager/test/hmi_capabilities_test.cc
@@ -478,47 +478,79 @@ TEST_F(HMICapabilitiesTest, LoadCapabilitiesFromFile) {
 
 TEST_F(HMICapabilitiesTest,
        LoadCapabilitiesFromFileAndVerifyUnsupportedSystemCapabilities) {
+  MockApplicationManager mock_app_mngr;
+  event_engine_test::MockEventDispatcher mock_dispatcher;
+  MockApplicationManagerSettings mock_application_manager_settings;
+
   const std::string hmi_capabilities_file = "hmi_capabilities_sc1.json";
-  EXPECT_CALL(mock_application_manager_settings_, hmi_capabilities_file_name())
+
+  EXPECT_CALL(mock_app_mngr, event_dispatcher())
+      .WillOnce(ReturnRef(mock_dispatcher));
+  EXPECT_CALL(mock_app_mngr, get_settings())
+      .WillRepeatedly(ReturnRef(mock_application_manager_settings));
+  EXPECT_CALL(mock_application_manager_settings, hmi_capabilities_file_name())
       .WillOnce(ReturnRef(hmi_capabilities_file));
+  EXPECT_CALL(mock_dispatcher, add_observer(_, _, _)).Times(1);
+  EXPECT_CALL(mock_dispatcher, remove_observer(_)).Times(1);
+  EXPECT_CALL(mock_application_manager_settings, launch_hmi())
+      .WillOnce(Return(false));
 
   if (file_system::FileExists("./app_info_data")) {
     EXPECT_TRUE(::file_system::DeleteFile("./app_info_data"));
   }
-  EXPECT_TRUE(hmi_capabilities_test->LoadCapabilitiesFromFile());
+
+  utils::SharedPtr<HMICapabilitiesForTesting> hmi_capabilities =
+      utils::MakeShared<HMICapabilitiesForTesting>(mock_app_mngr);
+  hmi_capabilities->Init(&last_state_);
 
   // Check system capabilities; only phone capability is available
-  EXPECT_FALSE(hmi_capabilities_test->navigation_supported());
-  EXPECT_TRUE(hmi_capabilities_test->phone_call_supported());
-  EXPECT_FALSE(hmi_capabilities_test->video_streaming_supported());
+  EXPECT_FALSE(hmi_capabilities->navigation_supported());
+  EXPECT_TRUE(hmi_capabilities->phone_call_supported());
+  EXPECT_FALSE(hmi_capabilities->video_streaming_supported());
 
   // verify phone capability
   const smart_objects::SmartObject phone_capability_so =
-      *(hmi_capabilities_test->phone_capability());
+      *(hmi_capabilities->phone_capability());
   EXPECT_TRUE(phone_capability_so.keyExists("dialNumberEnabled"));
   EXPECT_TRUE(phone_capability_so["dialNumberEnabled"].asBool());
 }
 
 TEST_F(HMICapabilitiesTest,
        LoadCapabilitiesFromFileAndVerifyEmptySystemCapabilities) {
+  MockApplicationManager mock_app_mngr;
+  event_engine_test::MockEventDispatcher mock_dispatcher;
+  MockApplicationManagerSettings mock_application_manager_settings;
+
   const std::string hmi_capabilities_file = "hmi_capabilities_sc2.json";
-  EXPECT_CALL(mock_application_manager_settings_, hmi_capabilities_file_name())
+
+  EXPECT_CALL(mock_app_mngr, event_dispatcher())
+      .WillOnce(ReturnRef(mock_dispatcher));
+  EXPECT_CALL(mock_app_mngr, get_settings())
+      .WillRepeatedly(ReturnRef(mock_application_manager_settings));
+  EXPECT_CALL(mock_application_manager_settings, hmi_capabilities_file_name())
       .WillOnce(ReturnRef(hmi_capabilities_file));
+  EXPECT_CALL(mock_dispatcher, add_observer(_, _, _)).Times(1);
+  EXPECT_CALL(mock_dispatcher, remove_observer(_)).Times(1);
+  EXPECT_CALL(mock_application_manager_settings, launch_hmi())
+      .WillOnce(Return(false));
 
   if (file_system::FileExists("./app_info_data")) {
     EXPECT_TRUE(::file_system::DeleteFile("./app_info_data"));
   }
-  EXPECT_TRUE(hmi_capabilities_test->LoadCapabilitiesFromFile());
+
+  utils::SharedPtr<HMICapabilitiesForTesting> hmi_capabilities =
+      utils::MakeShared<HMICapabilitiesForTesting>(mock_app_mngr);
+  hmi_capabilities->Init(&last_state_);
 
   // Check system capabilities; only navigation capability is valid, the other
   // two are empty
-  EXPECT_TRUE(hmi_capabilities_test->navigation_supported());
-  EXPECT_FALSE(hmi_capabilities_test->phone_call_supported());
-  EXPECT_FALSE(hmi_capabilities_test->video_streaming_supported());
+  EXPECT_TRUE(hmi_capabilities->navigation_supported());
+  EXPECT_FALSE(hmi_capabilities->phone_call_supported());
+  EXPECT_FALSE(hmi_capabilities->video_streaming_supported());
 
   // verify navigation capabilities
   smart_objects::SmartObject navigation_capability_so =
-      *(hmi_capabilities_test->navigation_capability());
+      *(hmi_capabilities->navigation_capability());
   EXPECT_TRUE(navigation_capability_so.keyExists("sendLocationEnabled"));
   EXPECT_TRUE(navigation_capability_so.keyExists("getWayPointsEnabled"));
   EXPECT_TRUE(navigation_capability_so["sendLocationEnabled"].asBool());