Formatting and review changes

11 files changed, 136 insertions, 69 deletions

diff --git a/src/components/application_manager/include/application_manager/commands/mobile/get_system_capability_request.h b/src/components/application_manager/include/application_manager/commands/mobile/get_system_capability_request.h
index e74af559b6..ba55a6b4cd 100644
--- a/src/components/application_manager/include/application_manager/commands/mobile/get_system_capability_request.h
+++ b/src/components/application_manager/include/application_manager/commands/mobile/get_system_capability_request.h
@@ -41,9 +41,9 @@ namespace application_manager {
 namespace commands {
 
 class GetSystemCapabilityRequest : public CommandRequestImpl {
-public: 
+ public:
   GetSystemCapabilityRequest(const MessageSharedPtr& message,
-                      ApplicationManager& application_manager);
+                             ApplicationManager& application_manager);
 
   virtual ~GetSystemCapabilityRequest();
 
@@ -51,13 +51,11 @@ public:
 
   virtual void on_event(const event_engine::Event& event);
 
-private:
+ private:
   DISALLOW_COPY_AND_ASSIGN(GetSystemCapabilityRequest);
 
+};  // GetSystemCapabilityRequest
+}  // commands
+}  // application_manager
 
-
-};//GetSystemCapabilityRequest
-}//commands
-}//application_manager
-
-#endif //SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_SYSTEM_CAPABILITY_REQUEST_H_
\ No newline at end of file
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_SYSTEM_CAPABILITY_REQUEST_H_
\ No newline at end of file
diff --git a/src/components/application_manager/include/application_manager/commands/mobile/get_system_capability_response.h b/src/components/application_manager/include/application_manager/commands/mobile/get_system_capability_response.h
index 14fe5be8b9..9fa6f9b5bb 100644
--- a/src/components/application_manager/include/application_manager/commands/mobile/get_system_capability_response.h
+++ b/src/components/application_manager/include/application_manager/commands/mobile/get_system_capability_response.h
@@ -36,27 +36,25 @@
 
 #include "application_manager/commands/command_response_impl.h"
 #include "utils/macro.h"
- 
+
 namespace application_manager {
 
 namespace commands {
 
 class GetSystemCapabilityResponse : public CommandResponseImpl {
-public: 
+ public:
   GetSystemCapabilityResponse(const MessageSharedPtr& message,
-                      ApplicationManager& application_manager);
+                              ApplicationManager& application_manager);
 
   virtual ~GetSystemCapabilityResponse();
 
   virtual void Run() OVERRIDE;
 
-private:
+ private:
   DISALLOW_COPY_AND_ASSIGN(GetSystemCapabilityResponse);
 
+};  // GetSystemCapabilityResponse
+}  // commands
+}  // application_manager
 
-
-};//GetSystemCapabilityResponse
-}//commands
-}//application_manager
-
-#endif //SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_SYSTEM_CAPABILITY_RESPONSE_H_
\ No newline at end of file
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_SYSTEM_CAPABILITY_RESPONSE_H_
\ No newline at end of file
diff --git a/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h b/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h
index 080503e314..777c45d0ac 100644
--- a/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h
+++ b/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h
@@ -407,11 +407,38 @@ class HMICapabilitiesImpl : public HMICapabilities {
    */
   bool phone_call_supported() const OVERRIDE;
 
-  void set_navigation_capability(const smart_objects::SmartObject& navigation_capability) OVERRIDE;
+  /*
+   * @brief Interface used to store information regarding
+   * the navigation "System Capability"
+   *
+   * @param navigation_capability contains information related
+   * to the navigation system capability.
+   */
+  void set_navigation_capability(
+      const smart_objects::SmartObject& navigation_capability) OVERRIDE;
 
+  /*
+   * @brief Retrieves information regarding the navigation system capability
+   *
+   * @return NAVIGATION system capability
+   */
   const smart_objects::SmartObject* navigation_capability() const OVERRIDE;
 
-  void set_phone_capability(const smart_objects::SmartObject& phone_capability) OVERRIDE;
+  /*
+   * @brief Interface used to store information regarding
+   * the phone "System Capability"
+   *
+   * @param phone_capability contains information related
+   * to the phone system capability.
+   */
+  void set_phone_capability(
+      const smart_objects::SmartObject& phone_capability) OVERRIDE;
+
+  /*
+   * @brief Retrieves information regarding the phone call system capability
+   *
+   * @return PHONE_CALL system capability
+   */
 
   const smart_objects::SmartObject* phone_capability() const OVERRIDE;
 
diff --git a/src/components/application_manager/src/commands/hmi/ui_get_capabilities_response.cc b/src/components/application_manager/src/commands/hmi/ui_get_capabilities_response.cc
index bf89b3d5a7..4b31debbdd 100644
--- a/src/components/application_manager/src/commands/hmi/ui_get_capabilities_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_get_capabilities_response.cc
@@ -80,12 +80,17 @@ void UIGetCapabilitiesResponse::Run() {
     }
   }
 
-  if(msg_params.keyExists(strings::system_capabilities)) {
-    if(msg_params[strings::system_capabilities].keyExists(strings::navigation_capability)) {
-      hmi_capabilities.set_navigation_capability(msg_params[strings::system_capabilities][strings::navigation_capability]);
+  if (msg_params.keyExists(strings::system_capabilities)) {
+    if (msg_params[strings::system_capabilities].keyExists(
+            strings::navigation_capability)) {
+      hmi_capabilities.set_navigation_capability(
+          msg_params[strings::system_capabilities]
+                    [strings::navigation_capability]);
     }
-    if(msg_params[strings::system_capabilities].keyExists(strings::phone_capability)) {
-      hmi_capabilities.set_phone_capability(msg_params[strings::system_capabilities][strings::phone_capability]);
+    if (msg_params[strings::system_capabilities].keyExists(
+            strings::phone_capability)) {
+      hmi_capabilities.set_phone_capability(
+          msg_params[strings::system_capabilities][strings::phone_capability]);
     }
   }
 }
diff --git a/src/components/application_manager/src/commands/mobile/get_system_capability_request.cc b/src/components/application_manager/src/commands/mobile/get_system_capability_request.cc
index b7d9dbb043..91fad1b664 100644
--- a/src/components/application_manager/src/commands/mobile/get_system_capability_request.cc
+++ b/src/components/application_manager/src/commands/mobile/get_system_capability_request.cc
@@ -27,9 +27,12 @@ void GetSystemCapabilityRequest::Run() {
     return;
   }
   smart_objects::SmartObject response_params(smart_objects::SmartType_Map);
-  //response_params[strings::system_capability][strings::system_capability_type] = (mobile_apis::SystemCapabilityType::PHONE_CALL);
-  mobile_apis::SystemCapabilityType::eType response_type = static_cast<mobile_apis::SystemCapabilityType::eType>((*message_)[strings::msg_params][strings::system_capability_type].asInt());
-  response_params[strings::system_capability][strings::system_capability_type] = response_type;  
+  mobile_apis::SystemCapabilityType::eType response_type =
+      static_cast<mobile_apis::SystemCapabilityType::eType>(
+          (*message_)[strings::msg_params][strings::system_capability_type]
+              .asInt());
+  response_params[strings::system_capability][strings::system_capability_type] =
+      response_type;
 
   const HMICapabilities& hmi_capabilities =
       application_manager_.hmi_capabilities();
@@ -37,8 +40,9 @@ void GetSystemCapabilityRequest::Run() {
   switch (response_type) {
     case mobile_apis::SystemCapabilityType::NAVIGATION: {
       if (hmi_capabilities.navigation_capability()) {
-        response_params[strings::system_capability][strings::navigation_capability] = 
-          *hmi_capabilities.navigation_capability();
+        response_params[strings::system_capability]
+                       [strings::navigation_capability] =
+                           *hmi_capabilities.navigation_capability();
       } else {
         SendResponse(false, mobile_apis::Result::DATA_NOT_AVAILABLE);
         return;
@@ -47,8 +51,8 @@ void GetSystemCapabilityRequest::Run() {
     }
     case mobile_apis::SystemCapabilityType::PHONE_CALL: {
       if (hmi_capabilities.phone_capability()) {
-        response_params[strings::system_capability][strings::phone_capability] = 
-          *hmi_capabilities.phone_capability();
+        response_params[strings::system_capability][strings::phone_capability] =
+            *hmi_capabilities.phone_capability();
       } else {
         SendResponse(false, mobile_apis::Result::DATA_NOT_AVAILABLE);
         return;
@@ -58,22 +62,20 @@ void GetSystemCapabilityRequest::Run() {
     case mobile_apis::SystemCapabilityType::VIDEO_STREAMING:
       SendResponse(false, mobile_apis::Result::UNSUPPORTED_RESOURCE);
       return;
-      break;
     case mobile_apis::SystemCapabilityType::AUDIO_STREAMING:
       SendResponse(false, mobile_apis::Result::UNSUPPORTED_RESOURCE);
       return;
-      break;
-    default: // Return unsupported resource
+    default:  // Return unsupported resource
       SendResponse(false, mobile_apis::Result::UNSUPPORTED_RESOURCE);
-      break;
+      return;
   }
   SendResponse(true, mobile_apis::Result::SUCCESS, NULL, &response_params);
 }
 
-void GetSystemCapabilityRequest::on_event(const event_engine::Event& event){
+void GetSystemCapabilityRequest::on_event(const event_engine::Event& event) {
   LOG4CXX_INFO(logger_, "GetSystemCapabilityRequest on_event");
 }
 
-} // namespace commands
+}  // namespace commands
 
-} // namespace application_manager
\ No newline at end of file
+}  // namespace application_manager
\ No newline at end of file
diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc
index 9b4d62ed2d..12a64165e8 100644
--- a/src/components/application_manager/src/hmi_capabilities_impl.cc
+++ b/src/components/application_manager/src/hmi_capabilities_impl.cc
@@ -614,7 +614,8 @@ void HMICapabilitiesImpl::set_navigation_capability(
   if (navigation_capability_) {
     delete navigation_capability_;
   }
-  navigation_capability_ = new smart_objects::SmartObject(navigation_capability);
+  navigation_capability_ =
+      new smart_objects::SmartObject(navigation_capability);
 }
 
 void HMICapabilitiesImpl::set_phone_capability(
@@ -736,11 +737,13 @@ bool HMICapabilitiesImpl::phone_call_supported() const {
   return is_phone_call_supported_;
 }
 
-const smart_objects::SmartObject* HMICapabilitiesImpl::navigation_capability() const {
+const smart_objects::SmartObject* HMICapabilitiesImpl::navigation_capability()
+    const {
   return navigation_capability_;
 }
 
-const smart_objects::SmartObject* HMICapabilitiesImpl::phone_capability() const {
+const smart_objects::SmartObject* HMICapabilitiesImpl::phone_capability()
+    const {
   return phone_capability_;
 }
 
@@ -988,18 +991,24 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
             soft_button_capabilities, soft_button_capabilities_so);
         set_soft_button_capabilities(soft_button_capabilities_so);
       }
-      if(check_existing_json_member(ui, "systemCapabilities")) {
+      if (check_existing_json_member(ui, "systemCapabilities")) {
         Json::Value system_capabilities = ui.get("systemCapabilities", "");
-        if (check_existing_json_member(system_capabilities, "navigationCapability")) {
-          Json::Value navigation_capability = system_capabilities.get("navigationCapability","");
+        if (check_existing_json_member(system_capabilities,
+                                       "navigationCapability")) {
+          Json::Value navigation_capability =
+              system_capabilities.get("navigationCapability", "");
           smart_objects::SmartObject navigation_capability_so;
-          Formatters::CFormatterJsonBase::jsonValueToObj(navigation_capability, navigation_capability_so);
+          Formatters::CFormatterJsonBase::jsonValueToObj(
+              navigation_capability, navigation_capability_so);
           set_navigation_capability(navigation_capability_so);
         }
-        if (check_existing_json_member(system_capabilities, "phoneCapability")) {
-          Json::Value phone_capability = system_capabilities.get("phoneCapability","");
+        if (check_existing_json_member(system_capabilities,
+                                       "phoneCapability")) {
+          Json::Value phone_capability =
+              system_capabilities.get("phoneCapability", "");
           smart_objects::SmartObject phone_capability_so;
-          Formatters::CFormatterJsonBase::jsonValueToObj(phone_capability, phone_capability_so);
+          Formatters::CFormatterJsonBase::jsonValueToObj(phone_capability,
+                                                         phone_capability_so);
           set_phone_capability(phone_capability_so);
         }
       }
diff --git a/src/components/application_manager/test/commands/hmi/ui_get_capabilities_response_test.cc b/src/components/application_manager/test/commands/hmi/ui_get_capabilities_response_test.cc
index b556da603c..0f98d102a0 100644
--- a/src/components/application_manager/test/commands/hmi/ui_get_capabilities_response_test.cc
+++ b/src/components/application_manager/test/commands/hmi/ui_get_capabilities_response_test.cc
@@ -222,10 +222,10 @@ TEST_F(UIGetCapabilitiesResponseTest, SetNavigationCapability_SUCCESS) {
       smart_objects::SmartObject(smart_objects::SmartType_Map);
 
   (*command_msg)[strings::msg_params][strings::system_capabilities]
-    [strings::navigation_capability]["sendLocationEnabled"] = true;
+                [strings::navigation_capability]["sendLocationEnabled"] = true;
 
   (*command_msg)[strings::msg_params][strings::system_capabilities]
-    [strings::navigation_capability]["getWayPointsEnabled"] = true;
+                [strings::navigation_capability]["getWayPointsEnabled"] = true;
 
   ResponseFromHMIPtr command(
       CreateCommand<UIGetCapabilitiesResponse>(command_msg));
@@ -234,13 +234,14 @@ TEST_F(UIGetCapabilitiesResponseTest, SetNavigationCapability_SUCCESS) {
       .WillOnce(ReturnRef(mock_hmi_capabilities_));
 
   smart_objects::SmartObject navigation_capability_so =
-      (*command_msg)[strings::msg_params][strings::system_capabilities][strings::navigation_capability];
+      (*command_msg)[strings::msg_params][strings::system_capabilities]
+                    [strings::navigation_capability];
 
   EXPECT_CALL(mock_hmi_capabilities_,
               set_navigation_capability(navigation_capability_so));
 
   command->Run();
-} 
+}
 
 TEST_F(UIGetCapabilitiesResponseTest, SetPhonenCapability_SUCCESS) {
   MessageSharedPtr command_msg = CreateCommandMsg();
@@ -248,7 +249,7 @@ TEST_F(UIGetCapabilitiesResponseTest, SetPhonenCapability_SUCCESS) {
       smart_objects::SmartObject(smart_objects::SmartType_Map);
 
   (*command_msg)[strings::msg_params][strings::system_capabilities]
-    [strings::phone_capability]["dialNumberEnabled"] = true;
+                [strings::phone_capability]["dialNumberEnabled"] = true;
 
   ResponseFromHMIPtr command(
       CreateCommand<UIGetCapabilitiesResponse>(command_msg));
@@ -257,13 +258,14 @@ TEST_F(UIGetCapabilitiesResponseTest, SetPhonenCapability_SUCCESS) {
       .WillOnce(ReturnRef(mock_hmi_capabilities_));
 
   smart_objects::SmartObject phone_capability_so =
-      (*command_msg)[strings::msg_params][strings::system_capabilities][strings::phone_capability];
+      (*command_msg)[strings::msg_params][strings::system_capabilities]
+                    [strings::phone_capability];
 
   EXPECT_CALL(mock_hmi_capabilities_,
               set_phone_capability(phone_capability_so));
 
   command->Run();
-} 
+}
 
 }  // namespace ui_get_capabilities_response
 }  // namespace hmi_commands_test
diff --git a/src/components/application_manager/test/hmi_capabilities_test.cc b/src/components/application_manager/test/hmi_capabilities_test.cc
index a9c5e147b2..07b5bda4b4 100644
--- a/src/components/application_manager/test/hmi_capabilities_test.cc
+++ b/src/components/application_manager/test/hmi_capabilities_test.cc
@@ -357,7 +357,7 @@ TEST_F(HMICapabilitiesTest, LoadCapabilitiesFromFile) {
   EXPECT_EQ("2013", vehicle_type_so["modelYear"].asString());
   EXPECT_EQ("SE", vehicle_type_so["trim"].asString());
 
-  //Check system capabilities
+  // Check system capabilities
   smart_objects::SmartObject navigation_capability_so =
       *(hmi_capabilities_test->navigation_capability());
 
@@ -368,11 +368,9 @@ TEST_F(HMICapabilitiesTest, LoadCapabilitiesFromFile) {
 
   const smart_objects::SmartObject phone_capability_so =
       *(hmi_capabilities_test->phone_capability());
-      
+
   EXPECT_TRUE(phone_capability_so.keyExists("dialNumberEnabled"));
   EXPECT_TRUE(phone_capability_so["dialNumberEnabled"].asBool());
-
-
 }
 
 TEST_F(HMICapabilitiesTest, VerifyImageType) {
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 020e56c292..a59235e4fc 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
@@ -154,12 +154,14 @@ class MockHMICapabilities : public ::application_manager::HMICapabilities {
   MOCK_CONST_METHOD0(phone_call_supported, bool());
   MOCK_METHOD1(set_phone_call_supported, void(const bool supported));
 
-  MOCK_CONST_METHOD0(navigation_capability, const smart_objects::SmartObject*());
-  MOCK_METHOD1(set_navigation_capability, void(const smart_objects::SmartObject& navigation_capability));
+  MOCK_CONST_METHOD0(navigation_capability,
+                     const smart_objects::SmartObject*());
+  MOCK_METHOD1(set_navigation_capability,
+               void(const smart_objects::SmartObject& navigation_capability));
 
   MOCK_CONST_METHOD0(phone_capability, const smart_objects::SmartObject*());
-  MOCK_METHOD1(set_phone_capability, void(const smart_objects::SmartObject& phone_capability));
-
+  MOCK_METHOD1(set_phone_capability,
+               void(const smart_objects::SmartObject& phone_capability));
 
   MOCK_METHOD1(Init, void(resumption::LastState* last_state));
 
diff --git a/src/components/include/application_manager/hmi_capabilities.h b/src/components/include/application_manager/hmi_capabilities.h
index 451c2ca806..f7107ebeed 100644
--- a/src/components/include/application_manager/hmi_capabilities.h
+++ b/src/components/include/application_manager/hmi_capabilities.h
@@ -409,12 +409,38 @@ class HMICapabilities {
    */
   virtual bool phone_call_supported() const = 0;
 
-  virtual void set_navigation_capability(const smart_objects::SmartObject& navigation_capability) = 0;
+  /*
+   * @brief Interface used to store information regarding
+   * the navigation "System Capability"
+   *
+   * @param navigation_capability contains information related
+   * to the navigation system capability.
+   */
+  virtual void set_navigation_capability(
+      const smart_objects::SmartObject& navigation_capability) = 0;
 
+  /*
+   * @brief Retrieves information regarding the navigation system capability
+   *
+   * @return NAVIGATION system capability
+   */
   virtual const smart_objects::SmartObject* navigation_capability() const = 0;
 
-  virtual void set_phone_capability(const smart_objects::SmartObject& phone_capability) = 0;
+  /*
+   * @brief Interface used to store information regarding
+   * the phone "System Capability"
+   *
+   * @param phone_capability contains information related
+   * to the phone system capability.
+   */
+  virtual void set_phone_capability(
+      const smart_objects::SmartObject& phone_capability) = 0;
 
+  /*
+   * @brief Retrieves information regarding the phone call system capability
+   *
+   * @return PHONE_CALL system capability
+   */
   virtual const smart_objects::SmartObject* phone_capability() const = 0;
 
   virtual void Init(resumption::LastState* last_state) = 0;
diff --git a/src/components/interfaces/MOBILE_API.xml b/src/components/interfaces/MOBILE_API.xml
index cac520d349..e94cbf3183 100644
--- a/src/components/interfaces/MOBILE_API.xml
+++ b/src/components/interfaces/MOBILE_API.xml
@@ -5061,8 +5061,8 @@
           <element name="IGNORED"/>

           <element name="DISALLOWED"/>

           <element name="USER_DISALLOWED"/>

-          <element name="UNSUPPORTED_RESOURCE"/><description>The capability does not exist on the module</description>

-          <element name="DATA_NOT_AVAILABLE"/><description>The capability should exist on the module but there was an error retrieving the data.</description>

+          <element name="UNSUPPORTED_RESOURCE"><description>The capability does not exist on the module</description></element>

+          <element name="DATA_NOT_AVAILABLE"><description>The capability should exist on the module but there was an error retrieving the data.</description></element>

     </param>

     <param name="info" type="String" maxlength="1000" mandatory="false">

     </param>