Migrated unit tests.

15 files changed, 77 insertions, 108 deletions

diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc
index 62e9243ec2..b5a33784b8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc
@@ -154,25 +154,10 @@
 #include "hmi/tts_get_capabilities_response.h"
 #include "hmi/vr_perform_interaction_request.h"
 #include "hmi/vr_perform_interaction_response.h"
-#include "hmi/vi_is_ready_request.h"
-#include "hmi/vi_is_ready_response.h"
-#include "hmi/vi_read_did_request.h"
-#include "hmi/vi_read_did_response.h"
 #include "hmi/sdl_activate_app_request.h"
 #include "hmi/sdl_activate_app_response.h"
 #include "hmi/on_app_permission_changed_notification.h"
 #include "hmi/on_event_changed_notification.h"
-#include "hmi/vi_get_vehicle_data_request.h"
-#include "hmi/vi_get_vehicle_data_response.h"
-#include "hmi/on_vi_vehicle_data_notification.h"
-#include "hmi/vi_subscribe_vehicle_data_request.h"
-#include "hmi/vi_subscribe_vehicle_data_response.h"
-#include "hmi/vi_unsubscribe_vehicle_data_request.h"
-#include "hmi/vi_unsubscribe_vehicle_data_response.h"
-#include "hmi/vi_get_dtcs_request.h"
-#include "hmi/vi_get_dtcs_response.h"
-#include "hmi/vi_diagnostic_message_request.h"
-#include "hmi/vi_diagnostic_message_response.h"
 #include "hmi/vi_get_vehicle_type_request.h"
 #include "hmi/vi_get_vehicle_type_response.h"
 #include "hmi/navi_is_ready_request.h"
@@ -211,7 +196,6 @@
 #include "hmi/on_button_event_notification.h"
 #include "hmi/on_button_press_notification.h"
 #include "hmi/on_button_subscription_notification.h"
-#include "hmi/on_vi_vehicle_data_notification.h"
 #include "hmi/on_ui_keyboard_input_notification.h"
 #include "hmi/on_ui_touch_event_notification.h"
 #include "hmi/on_ui_reset_timeout_notification.h"
@@ -447,19 +431,9 @@ typedef Types<commands::UIChangeRegistrationRequest,
               commands::ClosePopupResponse,
               commands::ClosePopupRequest,
               commands::UIIsReadyResponse,
-              commands::UIIsReadyRequest,
-              commands::VIIsReadyResponse> HMICommandsListSecond;
+              commands::UIIsReadyRequest> HMICommandsListSecond;
 
-typedef Types<commands::VIIsReadyRequest,
-              commands::VIReadDIDResponse,
-              commands::VIReadDIDRequest,
-              commands::VIGetVehicleDataResponse,
-              commands::VIGetVehicleDataRequest,
-              commands::VIGetDTCsResponse,
-              commands::VIGetDTCsRequest,
-              commands::VIDiagnosticMessageResponse,
-              commands::VIDiagnosticMessageRequest,
-              commands::VIGetVehicleTypeResponse,
+typedef Types<commands::VIGetVehicleTypeResponse,
               commands::VIGetVehicleTypeRequest,
               commands::NaviIsReadyResponse,
               commands::NaviIsReadyRequest,
@@ -502,11 +476,6 @@ typedef Types<commands::VIIsReadyRequest,
 typedef Types<commands::hmi::OnButtonEventNotification,
               commands::hmi::OnButtonPressNotification,
               commands::hmi::OnButtonSubscriptionNotification,
-              commands::VISubscribeVehicleDataResponse,
-              commands::VISubscribeVehicleDataRequest,
-              commands::VIUnsubscribeVehicleDataResponse,
-              commands::VIUnsubscribeVehicleDataRequest,
-              commands::OnVIVehicleDataNotification,
               commands::OnNaviTBTClientStateNotification,
               commands::hmi::OnUIKeyBoardInputNotification,
               commands::hmi::OnUITouchEventNotification,
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_requests_to_hmi_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_requests_to_hmi_test.cc
index 5929d8acb1..b313fc2363 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_requests_to_hmi_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_requests_to_hmi_test.cc
@@ -60,9 +60,6 @@
 #include "sdl_rpc_plugin/commands/hmi/ui_set_global_properties_request.h"
 #include "application_manager/commands/request_to_hmi.h"
 #include "sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_request.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_is_ready_request.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_read_did_request.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_request.h"
 #include "sdl_rpc_plugin/commands/hmi/dial_number_request.h"
 #include "sdl_rpc_plugin/commands/hmi/tts_is_ready_request.h"
 #include "sdl_rpc_plugin/commands/hmi/tts_set_global_properties_request.h"
@@ -86,13 +83,9 @@
 #include "sdl_rpc_plugin/commands/hmi/ui_is_ready_request.h"
 #include "sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_request.h"
 #include "sdl_rpc_plugin/commands/hmi/ui_perform_interaction_request.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_request.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_get_dtcs_request.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_request.h"
 #include "sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_request.h"
 #include "sdl_rpc_plugin/commands/hmi/ui_show_request.h"
 #include "sdl_rpc_plugin/commands/hmi/ui_slider_request.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request.h"
 #include "sdl_rpc_plugin/commands/hmi/vr_add_command_request.h"
 #include "sdl_rpc_plugin/commands/hmi/vr_change_registration_request.h"
 #include "sdl_rpc_plugin/commands/hmi/vr_delete_command_request.h"
@@ -172,8 +165,6 @@ class RequestToHMICommandsTest3
 };
 
 typedef Types<sdl_rpc_plugin::commands::VIGetVehicleTypeRequest,
-              sdl_rpc_plugin::commands::VIReadDIDRequest,
-              sdl_rpc_plugin::commands::VISubscribeVehicleDataRequest,
               sdl_rpc_plugin::commands::hmi::DialNumberRequest,
               sdl_rpc_plugin::commands::ClosePopupRequest,
               sdl_rpc_plugin::commands::TTSSetGlobalPropertiesRequest,
@@ -192,12 +183,8 @@ typedef Types<sdl_rpc_plugin::commands::VIGetVehicleTypeRequest,
               sdl_rpc_plugin::commands::UIGetSupportedLanguagesRequest,
               sdl_rpc_plugin::commands::UIPerformAudioPassThruRequest,
               sdl_rpc_plugin::commands::UIPerformInteractionRequest,
-              sdl_rpc_plugin::commands::VIDiagnosticMessageRequest,
-              sdl_rpc_plugin::commands::VIGetDTCsRequest,
-              sdl_rpc_plugin::commands::VIGetVehicleDataRequest,
               sdl_rpc_plugin::commands::UISetMediaClockTimerRequest,
               sdl_rpc_plugin::commands::UIShowRequest,
-              sdl_rpc_plugin::commands::VIUnsubscribeVehicleDataRequest,
               sdl_rpc_plugin::commands::VRAddCommandRequest,
               sdl_rpc_plugin::commands::VRChangeRegistrationRequest,
               sdl_rpc_plugin::commands::VRDeleteCommandRequest,
@@ -238,8 +225,7 @@ typedef Types<sdl_rpc_plugin::commands::UIScrollableMessageRequest,
               sdl_rpc_plugin::commands::hmi::DialNumberRequest>
     RequestCommandsList2;
 
-typedef Types<sdl_rpc_plugin::commands::VIIsReadyRequest,
-              sdl_rpc_plugin::commands::TTSIsReadyRequest,
+typedef Types<sdl_rpc_plugin::commands::TTSIsReadyRequest,
               sdl_rpc_plugin::commands::UIIsReadyRequest,
               sdl_rpc_plugin::commands::NaviIsReadyRequest,
               sdl_rpc_plugin::commands::VRIsReadyRequest> RequestCommandsList3;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_response_from_hmi_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_response_from_hmi_test.cc
index 1f89e4aefa..a7c07f8b1e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_response_from_hmi_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_response_from_hmi_test.cc
@@ -59,10 +59,7 @@
 #include "application_manager/mock_event_dispatcher.h"
 #include "application_manager/mock_hmi_capabilities.h"
 #include "application_manager/policies/mock_policy_handler_interface.h"
-#include "hmi/vi_read_did_response.h"
-#include "hmi/vi_subscribe_vehicle_data_response.h"
 #include "hmi/vi_get_vehicle_type_response.h"
-#include "hmi/vi_is_ready_response.h"
 #include "hmi/dial_number_response.h"
 #include "hmi/close_popup_response.h"
 #include "hmi/tts_set_global_properties_response.h"
@@ -78,12 +75,9 @@
 #include "hmi/ui_end_audio_pass_thru_response.h"
 #include "hmi/ui_perform_audio_pass_thru_response.h"
 #include "hmi/ui_perform_interaction_response.h"
-#include "hmi/vi_diagnostic_message_response.h"
-#include "hmi/vi_get_dtcs_response.h"
 #include "hmi/ui_set_media_clock_timer_response.h"
 #include "hmi/ui_show_response.h"
 #include "hmi/ui_slider_response.h"
-#include "hmi/vi_unsubscribe_vehicle_data_response.h"
 #include "hmi/vr_add_command_response.h"
 #include "hmi/vr_change_registration_response.h"
 #include "hmi/vr_delete_command_response.h"
@@ -183,16 +177,10 @@ typedef Types<
                 hmi_apis::FunctionID::UI_DeleteSubMenu>,
     CommandData<sdl_rpc_plugin::commands::UIEndAudioPassThruResponse,
                 hmi_apis::FunctionID::UI_EndAudioPassThru>,
-    CommandData<sdl_rpc_plugin::commands::VIDiagnosticMessageResponse,
-                hmi_apis::FunctionID::VehicleInfo_DiagnosticMessage>,
-    CommandData<sdl_rpc_plugin::commands::VIGetDTCsResponse,
-                hmi_apis::FunctionID::VehicleInfo_GetDTCs>,
     CommandData<sdl_rpc_plugin::commands::UISetMediaClockTimerResponse,
                 hmi_apis::FunctionID::UI_SetMediaClockTimer>,
     CommandData<sdl_rpc_plugin::commands::UIShowResponse,
                 hmi_apis::FunctionID::UI_Show>,
-    CommandData<sdl_rpc_plugin::commands::VIUnsubscribeVehicleDataResponse,
-                hmi_apis::FunctionID::VehicleInfo_UnsubscribeVehicleData>,
     CommandData<sdl_rpc_plugin::commands::VRAddCommandResponse,
                 hmi_apis::FunctionID::VR_AddCommand>,
     CommandData<sdl_rpc_plugin::commands::VRChangeRegistrationResponse,
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/diagnostic_message_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/diagnostic_message_request_test.cc
index 73799ad337..0ae24c7b9e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/diagnostic_message_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/diagnostic_message_request_test.cc
@@ -45,7 +45,6 @@
 #include "application_manager/mock_application.h"
 #include "application_manager/event_engine/event.h"
 #include "application_manager/mock_message_helper.h"
-#include "mobile/diagnostic_message_request.h"
 #include "interfaces/MOBILE_API.h"
 
 namespace test {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dummy_mobile_commands_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dummy_mobile_commands_test.cc
index e711ddce1c..a8afe4007f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dummy_mobile_commands_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dummy_mobile_commands_test.cc
@@ -57,17 +57,11 @@
 #include "mobile/delete_interaction_choice_set_response.h"
 #include "mobile/delete_sub_menu_request.h"
 #include "mobile/delete_sub_menu_response.h"
-#include "mobile/diagnostic_message_request.h"
-#include "mobile/diagnostic_message_response.h"
 #include "mobile/dial_number_request.h"
 #include "mobile/dial_number_response.h"
 #include "mobile/end_audio_pass_thru_request.h"
 #include "mobile/end_audio_pass_thru_response.h"
 #include "mobile/generic_response.h"
-#include "mobile/get_dtcs_request.h"
-#include "mobile/get_dtcs_response.h"
-#include "mobile/get_vehicle_data_request.h"
-#include "mobile/get_vehicle_data_response.h"
 #include "mobile/get_way_points_request.h"
 #include "mobile/get_way_points_response.h"
 #include "mobile/list_files_request.h"
@@ -87,7 +81,6 @@
 #include "mobile/on_system_request_notification.h"
 #include "mobile/on_tbt_client_state_notification.h"
 #include "mobile/on_touch_event_notification.h"
-#include "mobile/on_vehicle_data_notification.h"
 #include "mobile/on_way_point_change_notification.h"
 #include "mobile/perform_audio_pass_thru_request.h"
 #include "mobile/perform_audio_pass_thru_response.h"
@@ -95,8 +88,6 @@
 #include "mobile/perform_interaction_response.h"
 #include "mobile/put_file_request.h"
 #include "mobile/put_file_response.h"
-#include "mobile/read_did_request.h"
-#include "mobile/read_did_response.h"
 #include "mobile/register_app_interface_request.h"
 #include "mobile/register_app_interface_response.h"
 #include "mobile/reset_global_properties_request.h"
@@ -123,8 +114,6 @@
 #include "mobile/speak_response.h"
 #include "mobile/subscribe_button_request.h"
 #include "mobile/subscribe_button_response.h"
-#include "mobile/subscribe_vehicle_data_request.h"
-#include "mobile/subscribe_vehicle_data_response.h"
 #include "mobile/subscribe_way_points_request.h"
 #include "mobile/subscribe_way_points_response.h"
 #include "mobile/system_response.h"
@@ -132,8 +121,6 @@
 #include "mobile/unregister_app_interface_response.h"
 #include "mobile/unsubscribe_button_request.h"
 #include "mobile/unsubscribe_button_response.h"
-#include "mobile/unsubscribe_vehicle_data_request.h"
-#include "mobile/unsubscribe_vehicle_data_response.h"
 #include "mobile/unsubscribe_way_points_request.h"
 #include "mobile/unsubscribe_way_points_response.h"
 #include "mobile/update_turn_list_request.h"
@@ -228,17 +215,11 @@ typedef Types<commands::AddCommandRequest,
               commands::DeleteInteractionChoiceSetResponse,
               commands::DeleteSubMenuRequest,
               commands::DeleteSubMenuResponse,
-              commands::DiagnosticMessageRequest,
-              commands::DiagnosticMessageResponse,
               commands::DialNumberRequest,
               commands::DialNumberResponse,
               commands::EndAudioPassThruRequest,
               commands::EndAudioPassThruResponse,
               commands::GenericResponse,
-              commands::GetDTCsRequest,
-              commands::GetDTCsResponse,
-              commands::GetVehicleDataRequest,
-              commands::GetVehicleDataResponse,
               commands::GetWayPointsRequest,
               commands::GetWayPointsResponse,
               commands::ListFilesRequest,
@@ -260,16 +241,13 @@ typedef Types<commands::AddCommandRequest,
               commands::mobile::OnTouchEventNotification>
     MobileCommandsListFirst;
 
-typedef Types<commands::OnVehicleDataNotification,
-              commands::OnWayPointChangeNotification,
+typedef Types<commands::OnWayPointChangeNotification,
               commands::PerformAudioPassThruRequest,
               commands::PerformAudioPassThruResponse,
               commands::PerformInteractionRequest,
               commands::PerformInteractionResponse,
               commands::PutFileRequest,
               commands::PutFileResponse,
-              commands::ReadDIDRequest,
-              commands::ReadDIDResponse,
               commands::RegisterAppInterfaceRequest,
               commands::RegisterAppInterfaceResponse,
               commands::ResetGlobalPropertiesRequest,
@@ -296,19 +274,15 @@ typedef Types<commands::OnVehicleDataNotification,
               commands::SpeakResponse,
               commands::SubscribeButtonRequest,
               commands::SubscribeButtonResponse,
-              commands::SubscribeVehicleDataRequest,
-              commands::SubscribeVehicleDataResponse,
               commands::SubscribeWayPointsRequest,
               commands::SubscribeWayPointsResponse,
               commands::SystemResponse,
               commands::UnregisterAppInterfaceRequest,
               commands::UnregisterAppInterfaceResponse,
               commands::UnsubscribeButtonRequest,
-              commands::UnsubscribeButtonResponse,
-              commands::UnsubscribeVehicleDataRequest> MobileCommandsListSecond;
+              commands::UnsubscribeButtonResponse> MobileCommandsListSecond;
 
-typedef Types<commands::UnsubscribeVehicleDataResponse,
-              commands::UnSubscribeWayPointsRequest,
+typedef Types<commands::UnSubscribeWayPointsRequest,
               commands::UnsubscribeWayPointsResponse,
               commands::UpdateTurnListRequest,
               commands::UpdateTurnListResponse> MobileCommandsListThird;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/simple_response_commands_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/simple_response_commands_test.cc
index 665d71d3de..cf1f7c6711 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/simple_response_commands_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/simple_response_commands_test.cc
@@ -38,25 +38,20 @@
 #include "utils/shared_ptr.h"
 #include "application_manager/commands/commands_test.h"
 #include "application_manager/mock_application_manager.h"
-#include "mobile/read_did_response.h"
 #include "mobile/delete_command_response.h"
 #include "mobile/alert_maneuver_response.h"
 #include "mobile/alert_response.h"
 #include "mobile/list_files_response.h"
 #include "mobile/subscribe_button_response.h"
 #include "mobile/add_sub_menu_response.h"
-#include "mobile/diagnostic_message_response.h"
 #include "mobile/dial_number_response.h"
 #include "mobile/end_audio_pass_thru_response.h"
-#include "mobile/get_dtcs_response.h"
-#include "mobile/get_vehicle_data_response.h"
 #include "mobile/unregister_app_interface_response.h"
 #include "mobile/unsubscribe_button_response.h"
 #include "mobile/unsubscribe_way_points_response.h"
 #include "mobile/update_turn_list_response.h"
 #include "mobile/slider_response.h"
 #include "mobile/speak_response.h"
-#include "mobile/subscribe_vehicle_data_response.h"
 #include "mobile/subscribe_way_points_response.h"
 #include "mobile/system_response.h"
 #include "mobile/get_way_points_response.h"
@@ -98,24 +93,19 @@ class MobileResponseCommandsTest
 };
 
 typedef Types<commands::ListFilesResponse,
-              commands::ReadDIDResponse,
               commands::DeleteCommandResponse,
               commands::AlertManeuverResponse,
               commands::AlertResponse,
               commands::SubscribeButtonResponse,
               commands::AddSubMenuResponse,
-              commands::DiagnosticMessageResponse,
               commands::DialNumberResponse,
               commands::EndAudioPassThruResponse,
-              commands::GetDTCsResponse,
-              commands::GetVehicleDataResponse,
               commands::UnregisterAppInterfaceResponse,
               commands::UnsubscribeWayPointsResponse,
               commands::UpdateTurnListResponse,
               commands::UnsubscribeButtonResponse,
               commands::SliderResponse,
               commands::SpeakResponse,
-              commands::SubscribeVehicleDataResponse,
               commands::SubscribeWayPointsResponse,
               commands::SystemResponse,
               commands::GetWayPointsResponse,
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/CMakeLists.txt b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/CMakeLists.txt
new file mode 100644
index 0000000000..3ea4a50a8a
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/CMakeLists.txt
@@ -0,0 +1,64 @@
+# Copyright (c) 2018, 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 copyright holders nor the names of their 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.
+
+include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake)
+
+include_directories(
+  ${GMOCK_INCLUDE_DIRECTORY}
+  ${COMPONENTS_DIR}/application_manager/rpc_plugins/vehicle_info_plugin/include
+  ${COMPONENTS_DIR}/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/
+  ${COMPONENTS_DIR}/application_manager/test/include/
+)  
+
+
+set(COMMANDS_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/commands)
+
+file(GLOB SOURCES
+  ${COMPONENTS_DIR}/application_manager/test/mock_message_helper.cc
+  ${COMPONENTS_DIR}/application_manager/test/mock_application_helper.cc
+  ${COMPONENTS_DIR}/application_manager/src/smart_object_keys.cc
+  ${COMMANDS_TEST_DIR}/hmi/*
+  ${COMMANDS_TEST_DIR}/mobile/*
+  ${COMPONENTS_DIR}/application_manager/src/message.cc
+  ${COMPONENTS_DIR}/application_manager/src/event_engine/*
+)
+
+set(LIBRARIES
+  gmock
+  Utils
+  SmartObjects
+  HMI_API
+  MOBILE_API
+  connectionHandler
+  vehicle_info_plugin
+  jsoncpp
+)
+
+create_cotired_test("vi_commands_test" "${SOURCES}" "${LIBRARIES}" )
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vi_get_vehicle_data_response_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_get_vehicle_data_response_test.cc
index 3c52b348c3..ddfc8e8a55 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vi_get_vehicle_data_response_test.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_get_vehicle_data_response_test.cc
@@ -61,7 +61,7 @@ namespace am = ::application_manager;
 namespace strings = ::application_manager::strings;
 namespace hmi_response = am::hmi_response;
 using am::commands::MessageSharedPtr;
-using sdl_rpc_plugin::commands::VIGetVehicleDataResponse;
+using vehicle_info_plugin::commands::VIGetVehicleDataResponse;
 using am::event_engine::Event;
 using test::components::event_engine_test::MockEventDispatcher;
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vi_is_ready_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_is_ready_request_test.cc
index f09ff72856..d0093f45cf 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vi_is_ready_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_is_ready_request_test.cc
@@ -56,7 +56,7 @@ using ::testing::ReturnRef;
 using ::testing::Return;
 namespace am = ::application_manager;
 using am::commands::MessageSharedPtr;
-using sdl_rpc_plugin::commands::VIIsReadyRequest;
+using vehicle_info_plugin::commands::VIIsReadyRequest;
 using am::event_engine::Event;
 
 typedef SharedPtr<VIIsReadyRequest> VIIsReadyRequestPtr;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/get_dtcs_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_dtcs_request_test.cc
index c8d652ebd9..9719d3ceed 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/get_dtcs_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_dtcs_request_test.cc
@@ -58,7 +58,7 @@ using ::testing::_;
 using ::testing::Return;
 namespace am = ::application_manager;
 using am::commands::MessageSharedPtr;
-using sdl_rpc_plugin::commands::GetDTCsRequest;
+using vehicle_info_plugin::commands::GetDTCsRequest;
 using am::event_engine::Event;
 using am::MockMessageHelper;
 using testing::Mock;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/get_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_vehicle_data_request_test.cc
index f111985c06..d8e4c3d075 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/get_vehicle_data_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_vehicle_data_request_test.cc
@@ -59,7 +59,7 @@ using ::testing::Return;
 using ::testing::ReturnRef;
 namespace am = ::application_manager;
 using am::commands::MessageSharedPtr;
-using sdl_rpc_plugin::commands::GetVehicleDataRequest;
+using vehicle_info_plugin::commands::GetVehicleDataRequest;
 using am::event_engine::Event;
 namespace mobile_result = mobile_apis::Result;
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_vehicle_data_notification_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/on_vehicle_data_notification_test.cc
index f862db6442..af071ae716 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_vehicle_data_notification_test.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/on_vehicle_data_notification_test.cc
@@ -59,7 +59,7 @@ using ::testing::Return;
 using ::testing::ReturnRef;
 
 using am::commands::MessageSharedPtr;
-using sdl_rpc_plugin::commands::OnVehicleDataNotification;
+using vehicle_info_plugin::commands::OnVehicleDataNotification;
 
 typedef ::utils::SharedPtr<OnVehicleDataNotification> NotificationPtr;
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/read_did_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/read_did_request_test.cc
index 1224a0ccb4..e6649a14ad 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/read_did_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/read_did_request_test.cc
@@ -42,7 +42,6 @@
 #include "application_manager/mock_application_manager.h"
 #include "application_manager/mock_application.h"
 #include "application_manager/mock_message_helper.h"
-#include "mobile/read_did_request.h"
 #include "interfaces/MOBILE_API.h"
 #include "interfaces/HMI_API.h"
 #include "application_manager/smart_object_keys.h"
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_vehicle_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_request_test.cc
index ea9ad5d5e8..10934a99fa 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_vehicle_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_request_test.cc
@@ -51,7 +51,7 @@ namespace mobile_result = mobile_apis::Result;
 
 using ::testing::_;
 
-using sdl_rpc_plugin::commands::UnsubscribeVehicleDataRequest;
+using vehicle_info_plugin::commands::UnsubscribeVehicleDataRequest;
 using am::commands::MessageSharedPtr;
 
 typedef ::utils::SharedPtr<UnsubscribeVehicleDataRequest> CommandPtr;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_vehicle_response_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_response_test.cc
index 8e3ea78ee6..bed9cffeb2 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_vehicle_response_test.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_response_test.cc
@@ -50,7 +50,7 @@ using ::testing::_;
 using ::testing::NotNull;
 using ::testing::Types;
 
-using sdl_rpc_plugin::commands::UnsubscribeVehicleDataResponse;
+using vehicle_info_plugin::commands::UnsubscribeVehicleDataResponse;
 using commands::MessageSharedPtr;
 namespace am = ::application_manager;