From d0c1264475e93859c3957728abcdb2259149b4a4 Mon Sep 17 00:00:00 2001 From: Yana Chernysheva Date: Wed, 30 Dec 2020 16:00:30 +0200 Subject: Add new methods to PolicyHandler class --- .../include/application_manager/policies/policy_handler.h | 4 ++++ .../application_manager/src/policies/policy_handler.cc | 15 +++++++++++++++ .../application_manager/test/policy_handler_test.cc | 13 ------------- .../policies/policy_handler_interface.h | 14 ++++++++++++++ .../policies/mock_policy_handler_interface.h | 3 +++ 5 files changed, 36 insertions(+), 13 deletions(-) diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h index 61b228d4f8..0a815b4c5b 100644 --- a/src/components/application_manager/include/application_manager/policies/policy_handler.h +++ b/src/components/application_manager/include/application_manager/policies/policy_handler.h @@ -386,10 +386,14 @@ class PolicyHandler : public PolicyHandlerInterface, const std::string& wers_country_code, const std::string& language) OVERRIDE; + void OnHardwareVersionReceived(const std::string& hardware_version) OVERRIDE; + void SetPreloadedPtFlag(const bool is_preloaded) OVERRIDE; std::string GetCCPUVersionFromPT() const OVERRIDE; + std::string GetHardwareVersionFromPT() const OVERRIDE; + /** * @brief Sends GetVehicleData request in case when Vechicle info is ready. */ diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc index 890dd5b57a..7dae4fc0b3 100644 --- a/src/components/application_manager/src/policies/policy_handler.cc +++ b/src/components/application_manager/src/policies/policy_handler.cc @@ -1097,6 +1097,14 @@ void PolicyHandler::OnGetSystemInfo(const std::string& ccpu_version, policy_manager->SetSystemInfo(ccpu_version, wers_country_code, language); } +void PolicyHandler::OnHardwareVersionReceived( + const std::string& hardware_version) { + SDL_LOG_AUTO_TRACE(); + const auto policy_manager = LoadPolicyManager(); + POLICY_LIB_CHECK_VOID(policy_manager); + policy_manager->SetHardwareVersion(hardware_version); +} + std::string PolicyHandler::GetCCPUVersionFromPT() const { SDL_LOG_AUTO_TRACE(); const auto policy_manager = LoadPolicyManager(); @@ -1104,6 +1112,13 @@ std::string PolicyHandler::GetCCPUVersionFromPT() const { return policy_manager->GetCCPUVersionFromPT(); } +std::string PolicyHandler::GetHardwareVersionFromPT() const { + SDL_LOG_AUTO_TRACE(); + const auto policy_manager = LoadPolicyManager(); + POLICY_LIB_CHECK_OR_RETURN(policy_manager, std::string()); + return policy_manager->GetHardwareVersionFromPT(); +} + void PolicyHandler::OnVIIsReady() { SDL_LOG_AUTO_TRACE(); const uint32_t correlation_id = diff --git a/src/components/application_manager/test/policy_handler_test.cc b/src/components/application_manager/test/policy_handler_test.cc index f566bed934..9142d11199 100644 --- a/src/components/application_manager/test/policy_handler_test.cc +++ b/src/components/application_manager/test/policy_handler_test.cc @@ -1323,19 +1323,6 @@ TEST_F(PolicyHandlerTest, OnSystemInfoChanged) { policy_handler_.OnSystemInfoChanged(language); } -TEST_F(PolicyHandlerTest, OnGetSystemInfo) { - // Arrange - ChangePolicyManagerToMock(); - // Check expectations - const std::string ccpu_version("4.1.3.B_EB355B"); - const std::string wers_country_code("WAEGB"); - const std::string language("ru-ru"); - EXPECT_CALL(*mock_policy_manager_, - SetSystemInfo(ccpu_version, wers_country_code, language)); - // Act - policy_handler_.OnGetSystemInfo(ccpu_version, wers_country_code, language); -} - TEST_F(PolicyHandlerTest, IsApplicationRevoked) { // Arrange EnablePolicy(); diff --git a/src/components/include/application_manager/policies/policy_handler_interface.h b/src/components/include/application_manager/policies/policy_handler_interface.h index d8aef7cc1a..7ada7884bf 100644 --- a/src/components/include/application_manager/policies/policy_handler_interface.h +++ b/src/components/include/application_manager/policies/policy_handler_interface.h @@ -331,12 +331,26 @@ class PolicyHandlerInterface : public VehicleDataItemProvider { const std::string& wers_country_code, const std::string& language) = 0; + /** + * @brief Save hardware version from GetSystemInfo request to policy table, if + * present + * @param hardware_version Hardware version + */ + virtual void OnHardwareVersionReceived( + const std::string& hardware_version) = 0; + /** * @brief Get information about last ccpu_version from PT * @return ccpu_version from PT */ virtual std::string GetCCPUVersionFromPT() const = 0; + /** + * @brief Get information about last hardware version from PT + * @return hardware version from PT + */ + virtual std::string GetHardwareVersionFromPT() const = 0; + /** * @brief Sends GetVehicleData request in case when Vechicle info is ready. */ diff --git a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h index 7b6da68c51..af4019ce21 100644 --- a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h +++ b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h @@ -186,7 +186,10 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { void(const std::string& ccpu_version, const std::string& wers_country_code, const std::string& language)); + MOCK_METHOD1(OnHardwareVersionReceived, + void(const std::string& hardware_version)); MOCK_CONST_METHOD0(GetCCPUVersionFromPT, std::string()); + MOCK_CONST_METHOD0(GetHardwareVersionFromPT, std::string()); MOCK_METHOD0(OnVIIsReady, void()); MOCK_METHOD1(OnVehicleDataUpdated, void(const smart_objects::SmartObject& message)); -- cgit v1.2.1