Add accumulating window capabilities

Accumulating window capabilities is needed so SDL can send mobile a
full list of window capabilities in response to GetSystemCapabilities.
At the same time, a new function display_capabilities(window_id) is
introduced, so SDL can send window capabilities of only affected window
to mobile.

2 files changed, 6 insertions, 1 deletions

diff --git a/src/components/application_manager/test/include/application_manager/mock_application.h b/src/components/application_manager/test/include/application_manager/mock_application.h
index d90edbe2a1..e0f00f7b3a 100644
--- a/src/components/application_manager/test/include/application_manager/mock_application.h
+++ b/src/components/application_manager/test/include/application_manager/mock_application.h
@@ -249,6 +249,9 @@ class MockApplication : public ::application_manager::Application {
   MOCK_CONST_METHOD0(night_color_scheme, smart_objects::SmartObject());
   MOCK_CONST_METHOD0(display_layout, std::string());
   MOCK_CONST_METHOD0(display_capabilities, smart_objects::SmartObjectSPtr());
+  MOCK_CONST_METHOD1(display_capabilities,
+                     smart_objects::SmartObjectSPtr(
+                         const application_manager::WindowID window_id));
 
   MOCK_METHOD2(set_window_layout,
                void(const application_manager::WindowID window_id,
@@ -418,6 +421,8 @@ class MockApplication : public ::application_manager::Application {
                application_manager::DisplayCapabilitiesBuilder&());
   MOCK_METHOD1(GetSoftButtonWindowID,
                application_manager::WindowID(const uint32_t button_id));
+  MOCK_METHOD1(remove_window_capability,
+               void(const application_manager::WindowID window_id));
 };
 
 }  // namespace application_manager_test
diff --git a/src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h b/src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h
index 854a72be20..6ca987c1b2 100644
--- a/src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h
+++ b/src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h
@@ -104,7 +104,7 @@ class MockHMICapabilities : public ::application_manager::HMICapabilities {
                void(const smart_objects::SmartObject& display_capabilities));
 
   MOCK_CONST_METHOD0(system_display_capabilities,
-                     const smart_objects::SmartObject*());
+                     const smart_objects::SmartObjectSPtr());
   MOCK_METHOD1(set_system_display_capabilities,
                void(const smart_objects::SmartObject& display_capabilities));