17 files changed, 1 insertions, 316 deletions
diff --git a/src/components/application_manager/test/include/application_manager/application_manager_mock.h b/src/components/application_manager/test/include/application_manager/application_manager_mock.h
deleted file mode 100644
index 35f5f4dbdb..0000000000
--- a/src/components/application_manager/test/include/application_manager/application_manager_mock.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2015, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_TEST_STATE_CONTROLLER_INCLUDE_APPLICATION_MANAGER_MOCK_H_
-#define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_STATE_CONTROLLER_INCLUDE_APPLICATION_MANAGER_MOCK_H_
-#include <string>
-#include <vector>
-#include "gmock/gmock.h"
-#include "application_manager/application_manager.h"
-#include "application_manager/usage_statistics.h"
-#include "application_manager/commands/command.h"
-#include "media_manager/media_manager.h"
-#include "resumption/last_state.h"
-#include "application_manager/policies/policy_handler.h"
-namespace test {
-namespace components {
-namespace state_controller_test {
-namespace am = application_manager;
-
-class ApplicationManagerMock : public application_manager::ApplicationManager {
- public:
-  MOCK_METHOD1(Init, bool(resumption::LastState& last_state));
-  MOCK_METHOD0(Stop, bool());
-
-  MOCK_METHOD1(set_hmi_message_handler,
-               void(hmi_message_handler::HMIMessageHandler*));
-  MOCK_METHOD1(set_protocol_handler, void(protocol_handler::ProtocolHandler*));
-  MOCK_METHOD1(set_connection_handler,
-               void(connection_handler::ConnectionHandler*));
-  MOCK_CONST_METHOD0(applications, DataAccessor<am::ApplicationSet>());
-  MOCK_CONST_METHOD1(application, am::ApplicationSharedPtr(uint32_t app_id));
-  MOCK_CONST_METHOD1(application_by_hmi_app,
-                     am::ApplicationSharedPtr(uint32_t));
-  MOCK_CONST_METHOD0(active_application, am::ApplicationSharedPtr());
-  MOCK_CONST_METHOD1(application_by_policy_id,
-                     am::ApplicationSharedPtr(const std::string&));
-  MOCK_METHOD1(applications_by_button,
-               std::vector<am::ApplicationSharedPtr>(uint32_t));
-  MOCK_METHOD0(applications_with_navi, std::vector<am::ApplicationSharedPtr>());
-  MOCK_CONST_METHOD0(get_limited_media_application, am::ApplicationSharedPtr());
-  MOCK_CONST_METHOD0(get_limited_navi_application, am::ApplicationSharedPtr());
-  MOCK_CONST_METHOD0(get_limited_voice_application, am::ApplicationSharedPtr());
-  MOCK_METHOD1(application_id, const uint32_t(const int32_t));
-  MOCK_METHOD2(set_application_id, void(const int32_t, const uint32_t));
-  MOCK_METHOD3(OnHMILevelChanged,
-               void(uint32_t,
-                    mobile_apis::HMILevel::eType,
-                    mobile_apis::HMILevel::eType));
-  MOCK_METHOD1(SendHMIStatusNotification, void(const am::ApplicationSharedPtr));
-  MOCK_CONST_METHOD1(
-      GetDefaultHmiLevel,
-      mobile_apis::HMILevel::eType(am::ApplicationConstSharedPtr));
-  MOCK_METHOD0(hmi_capabilities, am::HMICapabilities&());
-  MOCK_METHOD0(is_attenuated_supported, bool());
-  MOCK_CONST_METHOD1(IsAppTypeExistsInFullOrLimited,
-                     bool(am::ApplicationConstSharedPtr));
-  MOCK_METHOD1(OnApplicationRegistered, void(am::ApplicationSharedPtr));
-  MOCK_METHOD2(SendMessageToMobile,
-               void(const smart_objects::SmartObjectSPtr message,
-                    bool final_message));
-  MOCK_METHOD1(SendMessageToMobile,
-               void(const smart_objects::SmartObjectSPtr message));
-  MOCK_METHOD1(SendMessageToHMI,
-               void(const smart_objects::SmartObjectSPtr message));
-  MOCK_METHOD2(ManageMobileCommand,
-               bool(const smart_objects::SmartObjectSPtr message,
-                    am::commands::Command::CommandOrigin origin));
-  MOCK_METHOD1(ManageHMICommand,
-               bool(const smart_objects::SmartObjectSPtr message));
-  MOCK_CONST_METHOD2(CanAppStream,
-                     bool(uint32_t app_id,
-                          protocol_handler::ServiceType service_type));
-  MOCK_METHOD1(ForbidStreaming, void(uint32_t app_id));
-  MOCK_METHOD2(SendAudioPassThroughNotification,
-               void(uint32_t session_key, std::vector<uint8_t>& binary_data));
-  MOCK_CONST_METHOD0(connection_handler,
-                     connection_handler::ConnectionHandler&());
-};
-}  // namespace state_controller_test
-}  // namespace components
-}  // namespace test
-
-#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_TEST_STATE_CONTROLLER_INCLUDE_APPLICATION_MANAGER_MOCK_H_
diff --git a/src/components/application_manager/test/include/application_manager/policy_handler_interface_mock.h b/src/components/application_manager/test/include/application_manager/policy_handler_interface_mock.h
deleted file mode 100644
index 6f3748e317..0000000000
--- a/src/components/application_manager/test/include/application_manager/policy_handler_interface_mock.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 2015, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_TEST_MOCK_POLICY_HANDLER_INTERFACE_MOCK_H_
-#define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_MOCK_POLICY_HANDLER_INTERFACE_MOCK_H_
-
-#include "application_manager/policies/policy_handler_interface.h"
-#include "gmock/gmock.h"
-#include "policy/policy_types.h"
-#include "smart_objects/smart_object.h"
-
-namespace policy {
-
-class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface {
- public:
-  MOCK_METHOD0(LoadPolicyLibrary, bool());
-  MOCK_CONST_METHOD0(PolicyEnabled, bool());
-  MOCK_METHOD0(InitPolicyTable, bool());
-  MOCK_METHOD0(ResetPolicyTable, bool());
-  MOCK_METHOD0(ClearUserConsent, bool());
-  MOCK_METHOD2(SendMessageToSDK,
-               bool(const policy::BinaryMessage& pt_string,
-                    const std::string& url));
-  MOCK_METHOD2(ReceiveMessageFromSDK,
-               bool(const std::string& file,
-                    const policy::BinaryMessage& pt_string));
-  MOCK_METHOD0(UnloadPolicyLibrary, bool());
-  MOCK_METHOD3(OnPermissionsUpdated,
-               void(const std::string& policy_app_id,
-                    const policy::Permissions& permissions,
-                    const policy::HMILevel& default_hmi));
-  MOCK_METHOD2(OnPermissionsUpdated,
-               void(const std::string& policy_app_id,
-                    const policy::Permissions& permissions));
-  MOCK_METHOD3(OnSnapshotCreated,
-               void(const policy::BinaryMessage& pt_string,
-                    const std::vector<int>& retry_delay_seconds,
-                    int timeout_exchange));
-  MOCK_CONST_METHOD2(GetPriority,
-                     bool(const std::string& policy_app_id,
-                          std::string* priority));
-  MOCK_METHOD5(CheckPermissions,
-               void(const policy::PTString& app_id,
-                    const policy::PTString& hmi_level,
-                    const policy::PTString& rpc,
-                    const policy::RPCParams& rpc_params,
-                    policy::CheckPermissionResult& result));
-  MOCK_CONST_METHOD1(GetNotificationsNumber,
-                     uint32_t(const std::string& priority));
-  MOCK_CONST_METHOD1(GetUserConsentForDevice,
-                     policy::DeviceConsent(const std::string& device_id));
-  MOCK_CONST_METHOD2(GetDefaultHmi,
-                     bool(const std::string& policy_app_id,
-                          std::string* default_hmi));
-
-  MOCK_METHOD3(GetInitialAppData,
-               bool(const std::string& application_id,
-                    policy::StringArray* nicknames,
-                    policy::StringArray* app_hmi_types));
-  MOCK_METHOD2(GetInitialAppData,
-               bool(const std::string& application_id,
-                    policy::StringArray* nicknames));
-  MOCK_METHOD1(GetInitialAppData, bool(const std::string& application_id));
-  MOCK_METHOD2(GetUpdateUrls,
-               void(int service_type, policy::EndpointUrls& end_points));
-  MOCK_METHOD0(ResetRetrySequence, void());
-  MOCK_METHOD0(NextRetryTimeout, uint32_t());
-  MOCK_METHOD0(TimeoutExchange, int());
-  MOCK_METHOD0(OnExceededTimeout, void());
-  MOCK_METHOD0(OnSystemReady, void());
-  MOCK_METHOD2(PTUpdatedAt, void(policy::Counters counter, int value));
-  MOCK_METHOD1(add_listener, void(policy::PolicyHandlerObserver* listener));
-  MOCK_METHOD1(remove_listener, void(policy::PolicyHandlerObserver* listener));
-  MOCK_CONST_METHOD0(GetStatisticManager,
-                     utils::SharedPtr<usage_statistics::StatisticsManager>());
-  MOCK_CONST_METHOD2(CheckSystemAction,
-                     bool(mobile_apis::SystemAction::eType system_action,
-                          const std::string& policy_app_id));
-  MOCK_METHOD1(KmsChanged, void(int kms));
-  MOCK_METHOD2(OnActivateApp,
-               void(uint32_t connection_key, uint32_t correlation_id));
-  MOCK_METHOD2(OnAllowSDLFunctionalityNotification,
-               void(bool is_allowed, const std::string& device_id));
-  MOCK_METHOD0(OnIgnitionCycleOver, void());
-  MOCK_METHOD1(OnPendingPermissionChange,
-               void(const std::string& policy_app_id));
-  MOCK_METHOD1(PTExchangeAtUserRequest, void(uint32_t correlation_id));
-  MOCK_METHOD2(AddDevice,
-               void(const std::string& device_id,
-                    const std::string& connection_type));
-  MOCK_METHOD2(SetDeviceInfo,
-               void(const std::string& device_id,
-                    const policy::DeviceInfo& device_info));
-  MOCK_METHOD2(OnAppPermissionConsent,
-               void(const uint32_t connection_key,
-                    const policy::PermissionConsent& permissions));
-  MOCK_METHOD3(OnGetUserFriendlyMessage,
-               void(const std::vector<std::string>& message_codes,
-                    const std::string& language,
-                    uint32_t correlation_id));
-  MOCK_METHOD2(OnGetListOfPermissions,
-               void(const uint32_t connection_key,
-                    const uint32_t correlation_id));
-  MOCK_METHOD1(OnGetStatusUpdate, void(const uint32_t correlation_id));
-  MOCK_METHOD1(OnUpdateStatusChanged, void(const std::string& status));
-  MOCK_METHOD1(OnCurrentDeviceIdUpdateRequired,
-               std::string(const std::string& policy_app_id));
-  MOCK_METHOD1(OnSystemInfoChanged, void(const std::string& language));
-  MOCK_METHOD3(OnGetSystemInfo,
-               void(const std::string& ccpu_version,
-                    const std::string& wers_country_code,
-                    const std::string& language));
-  MOCK_METHOD0(OnSystemInfoUpdateRequired, void());
-  MOCK_METHOD0(OnVIIsReady, void());
-  MOCK_METHOD1(OnVehicleDataUpdated,
-               void(const smart_objects::SmartObject& message));
-  MOCK_METHOD1(RemoveDevice, void(const std::string& device_id));
-  MOCK_METHOD1(AddStatisticsInfo, void(int type));
-  MOCK_METHOD1(OnSystemError, void(int code));
-  MOCK_CONST_METHOD0(GetAppIdForSending, uint32_t());
-  MOCK_METHOD1(
-      GetAppName,
-      utils::custom_string::CustomString(const std::string& policy_app_id));
-  MOCK_METHOD1(OnUpdateHMIAppType,
-               void(std::map<std::string, policy::StringArray> app_hmi_types));
-  MOCK_METHOD1(OnCertificateUpdated, void(const std::string& certificate_data));
-  MOCK_METHOD1(OnCertificateDecrypted, void(bool is_succeeded));
-  MOCK_METHOD0(CanUpdate, bool());
-  MOCK_METHOD2(OnDeviceConsentChanged,
-               void(const std::string& device_id, bool is_allowed));
-  MOCK_CONST_METHOD2(SendOnAppPermissionsChanged,
-                     void(const policy::AppPermissions& permissions,
-                          const std::string& policy_app_id));
-  MOCK_METHOD0(OnPTExchangeNeeded, void());
-  MOCK_METHOD1(GetAvailableApps, void(std::queue<std::string>& apps));
-  MOCK_METHOD1(AddApplication, void(const std::string& application_id));
-  MOCK_METHOD1(IsApplicationRevoked, bool(const std::string& app_id));
-  MOCK_METHOD0(OnUpdateRequestSentToMobile, void());
-  MOCK_CONST_METHOD1(HeartBeatTimeout, uint32_t(const std::string& app_id));
-  MOCK_METHOD0(OnAppsSearchStarted, void());
-  MOCK_METHOD0(OnAppsSearchCompleted, void());
-  MOCK_METHOD1(OnAppRegisteredOnMobile,
-               void(const std::string& application_id));
-  MOCK_CONST_METHOD2(IsRequestTypeAllowed,
-                     bool(const std::string& policy_app_id,
-                          mobile_apis::RequestType::eType type));
-  MOCK_CONST_METHOD1(
-      GetAppRequestTypes,
-      const std::vector<std::string>(const std::string& policy_app_id));
-  MOCK_CONST_METHOD0(GetVehicleInfo, const policy::VehicleInfo());
-  MOCK_METHOD1(Increment, void(usage_statistics::GlobalCounterId type));
-  MOCK_METHOD2(Increment,
-               void(const std::string& app_id,
-                    usage_statistics::AppCounterId type));
-  MOCK_METHOD3(Set,
-               void(const std::string& app_id,
-                    usage_statistics::AppInfoId type,
-                    const std::string& value));
-  MOCK_METHOD3(Add,
-               void(const std::string& app_id,
-                    usage_statistics::AppStopwatchId type,
-                    int32_t timespan_seconds));
-  MOCK_CONST_METHOD0(RetrieveCertificate, std::string());
-  MOCK_CONST_METHOD0(get_settings, const policy::PolicySettings&());
-
- private:
-  MOCK_METHOD2(OnAppPermissionConsentInternal,
-               void(const uint32_t connection_key,
-                    policy::PermissionConsent& permissions));
-};
-
-}  // namespace policy
-
-#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_TEST_MOCK_POLICY_HANDLER_INTERFACE_MOCK_H_
diff --git a/src/components/application_manager/include/application_manager/application_manager.h b/src/components/include/application_manager/application_manager.h
index e67864b9b1..a58e4e3598 100644
--- a/src/components/application_manager/include/application_manager/application_manager.h
+++ b/src/components/include/application_manager/application_manager.h
@@ -36,7 +36,7 @@
 #include <string>
 #include <vector>
 #include <set>
-#include "vehicle_info_data.h"
+#include "application_manager/vehicle_info_data.h"
 #include "application_manager/application.h"
 #include "application_manager/hmi_capabilities.h"
 #include "application_manager/commands/command.h"
diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler_observer.h b/src/components/include/application_manager/policies/policy_handler_observer.h
index 794da0cdfb..794da0cdfb 100644
--- a/src/components/application_manager/include/application_manager/policies/policy_handler_observer.h
+++ b/src/components/include/application_manager/policies/policy_handler_observer.h
diff --git a/src/components/application_manager/include/application_manager/vehicle_info_data.h b/src/components/include/application_manager/vehicle_info_data.h
index 390a1707c8..390a1707c8 100644
--- a/src/components/application_manager/include/application_manager/vehicle_info_data.h
+++ b/src/components/include/application_manager/vehicle_info_data.h
diff --git a/src/components/connection_handler/include/connection_handler/connection_handler.h b/src/components/include/connection_handler/connection_handler.h
index 7e7a7db114..7e7a7db114 100644
--- a/src/components/connection_handler/include/connection_handler/connection_handler.h
+++ b/src/components/include/connection_handler/connection_handler.h
diff --git a/src/components/connection_handler/include/connection_handler/connection_handler_observer.h b/src/components/include/connection_handler/connection_handler_observer.h
index 54b8d3a92e..54b8d3a92e 100644
--- a/src/components/connection_handler/include/connection_handler/connection_handler_observer.h
+++ b/src/components/include/connection_handler/connection_handler_observer.h
diff --git a/src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_adapter.h b/src/components/include/hmi_message_handler/hmi_message_adapter.h
index d2a3a5b907..d2a3a5b907 100644
--- a/src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_adapter.h
+++ b/src/components/include/hmi_message_handler/hmi_message_adapter.h
diff --git a/src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_handler.h b/src/components/include/hmi_message_handler/hmi_message_handler.h
index 217075e89f..217075e89f 100644
--- a/src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_handler.h
+++ b/src/components/include/hmi_message_handler/hmi_message_handler.h
diff --git a/src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_observer.h b/src/components/include/hmi_message_handler/hmi_message_observer.h
index f2f84b13e7..f2f84b13e7 100644
--- a/src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_observer.h
+++ b/src/components/include/hmi_message_handler/hmi_message_observer.h
diff --git a/src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_sender.h b/src/components/include/hmi_message_handler/hmi_message_sender.h
index f00b493aa1..f00b493aa1 100644
--- a/src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_sender.h
+++ b/src/components/include/hmi_message_handler/hmi_message_sender.h
diff --git a/src/components/media_manager/include/media_manager/media_manager.h b/src/components/include/media_manager/media_manager.h
index 53e3690c13..53e3690c13 100644
--- a/src/components/media_manager/include/media_manager/media_manager.h
+++ b/src/components/include/media_manager/media_manager.h
diff --git a/src/components/policy/include/policy/policy_manager.h b/src/components/include/policy/policy_manager.h
index 70ec5d23a2..70ec5d23a2 100644
--- a/src/components/policy/include/policy/policy_manager.h
+++ b/src/components/include/policy/policy_manager.h
diff --git a/src/components/policy/include/policy/usage_statistics/app_stopwatch.h b/src/components/include/policy/usage_statistics/app_stopwatch.h
index 0f9ce35459..0f9ce35459 100644
--- a/src/components/policy/include/policy/usage_statistics/app_stopwatch.h
+++ b/src/components/include/policy/usage_statistics/app_stopwatch.h
diff --git a/src/components/protocol_handler/include/protocol_handler/telemetry_observer.h b/src/components/include/protocol_handler/telemetry_observer.h
index 1f4c1ebcb5..1f4c1ebcb5 100644
--- a/src/components/protocol_handler/include/protocol_handler/telemetry_observer.h
+++ b/src/components/include/protocol_handler/telemetry_observer.h
diff --git a/src/components/application_manager/test/include/application_manager/mock_application_manager.h b/src/components/include/test/application_manager/mock_application_manager.h
index b5e0a4fa24..b5e0a4fa24 100644
--- a/src/components/application_manager/test/include/application_manager/mock_application_manager.h
+++ b/src/components/include/test/application_manager/mock_application_manager.h
diff --git a/src/components/protocol_handler/test/include/protocol_handler/protocol_observer_mock.h b/src/components/include/test/protocol_handler/protocol_observer_mock.h
index 9f99ee41f8..9f99ee41f8 100644
--- a/src/components/protocol_handler/test/include/protocol_handler/protocol_observer_mock.h
+++ b/src/components/include/test/protocol_handler/protocol_observer_mock.h