diff options
author | Andrii Kalinich <AKalinich@luxoft.com> | 2020-11-30 17:27:37 -0500 |
---|---|---|
committer | Andrii Kalinich <AKalinich@luxoft.com> | 2020-11-30 17:27:37 -0500 |
commit | 6ef9cfb61065b10785ad4fc37f0b0b0463f86fb7 (patch) | |
tree | 7f3b14d9ecce480ad0348f13a2514973041b6e44 | |
parent | 78e23efc06f7bc0bbb9ce012e75a41bb39aced6d (diff) | |
download | sdl_core-6ef9cfb61065b10785ad4fc37f0b0b0463f86fb7.tar.gz |
fixup! Fix regression and style issues
-rw-r--r-- | src/components/application_manager/include/application_manager/application.h | 10 | ||||
-rw-r--r-- | src/components/application_manager/test/message_helper/message_helper_test.cc | 5 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/components/application_manager/include/application_manager/application.h b/src/components/application_manager/include/application_manager/application.h index 58327c315e..2eb4501bcc 100644 --- a/src/components/application_manager/include/application_manager/application.h +++ b/src/components/application_manager/include/application_manager/application.h @@ -170,14 +170,14 @@ typedef std::map<uint32_t, smart_objects::SmartObject*> PerformChoice; typedef std::map<uint32_t, PerformChoice> PerformChoiceSetMap; /** - * @brief Defines id of SoftButtons related to a specified WindowID + * @brief Defines id of SoftButtons for specified WindowID */ -typedef std::set<std::pair<WindowID, std::set<uint32_t> > > SoftButtonIDs; +typedef std::pair<WindowID, std::set<uint32_t> > WindowSoftButtons; /** - * @brief Defines id of SoftButtons for specified WindowID + * @brief Defines id of SoftButtons related to a specified WindowID */ -typedef std::pair<WindowID, std::set<uint32_t> > WindowSoftButtons; +typedef std::set<WindowSoftButtons> SoftButtonIDs; /** * @brief Defines set of buttons subscription @@ -966,7 +966,7 @@ class Application : public virtual InitialApplicationData, * Alert, Show, ScrollableMessage, ShowConstantTBT, AlertManeuver, * UpdateTurnList * @param cmd_id Unique command id from mobile API - * @param list of softbuttons were created by command. + * @param window_softbuttons list of softbuttons were created by command. */ virtual void SubscribeToSoftButtons( int32_t cmd_id, const WindowSoftButtons& window_softbuttons) = 0; diff --git a/src/components/application_manager/test/message_helper/message_helper_test.cc b/src/components/application_manager/test/message_helper/message_helper_test.cc index 384cde7db8..34d1e488b7 100644 --- a/src/components/application_manager/test/message_helper/message_helper_test.cc +++ b/src/components/application_manager/test/message_helper/message_helper_test.cc @@ -888,8 +888,9 @@ TEST_F(MessageHelperTest, } } -TEST_F(MessageHelperTest, - SubscribeApplicationToSoftButton_SoftbuttonsIsAnsent_DoesntCallFromApp) { +TEST_F( + MessageHelperTest, + SubscribeApplicationToSoftButton_SoftbuttonsAreAbsent_DoesntCallFromApp) { MockApplicationSharedPtr appSharedPtr = std::make_shared<MockApplication>(); smart_objects::SmartObject message_params; size_t function_id = 1; |