summaryrefslogtreecommitdiff
path: root/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands
diff options
context:
space:
mode:
authorConlain Kelly <conlain.k@gmail.com>2018-07-18 11:24:11 -0400
committerConlain Kelly <conlain.k@gmail.com>2018-07-18 11:24:11 -0400
commit81fb6ddaf3ba4ecb5e0129401239af75db45d84d (patch)
treec71fc838d006b6b37b008e6f452e6ac2d7463f8c /src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands
parent5019af50b9a2236dd75e630aae5b82e440be9620 (diff)
downloadsdl_core-81fb6ddaf3ba4ecb5e0129401239af75db45d84d.tar.gz
style fix
Diffstat (limited to 'src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands')
-rw-r--r--src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc30
-rw-r--r--src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc15
-rw-r--r--src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_interior_vehicle_data_notification_test.cc18
-rw-r--r--src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc13
-rw-r--r--src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc14
-rw-r--r--src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc13
6 files changed, 46 insertions, 57 deletions
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc
index 329f4de5a6..8613fb1829 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc
@@ -42,7 +42,6 @@
#include "application_manager/commands/command_request_test.h"
#include "application_manager/policies/mock_policy_handler_interface.h"
-
#include "interfaces/HMI_API.h"
#include "interfaces/MOBILE_API.h"
@@ -147,15 +146,14 @@ class ButtonPressRequestTest
}
template <class Command>
- std::shared_ptr<Command> CreateRCCommand(
- MessageSharedPtr& msg) {
+ std::shared_ptr<Command> CreateRCCommand(MessageSharedPtr& msg) {
InitCommand(kDefaultTimeout_);
return std::make_shared<Command>(msg ? msg : msg = CreateMessage(),
- app_mngr_,
- mock_rpc_service_,
- mock_hmi_capabilities_,
- mock_policy_handler_,
- mock_allocation_manager_);
+ app_mngr_,
+ mock_rpc_service_,
+ mock_hmi_capabilities_,
+ mock_policy_handler_,
+ mock_allocation_manager_);
}
protected:
@@ -195,8 +193,8 @@ TEST_F(ButtonPressRequestTest,
.WillOnce(Return(true));
// Act
- std::shared_ptr<rc_rpc_plugin::commands::ButtonPressRequest>
- command = CreateRCCommand<rc_rpc_plugin::commands::ButtonPressRequest>(
+ std::shared_ptr<rc_rpc_plugin::commands::ButtonPressRequest> command =
+ CreateRCCommand<rc_rpc_plugin::commands::ButtonPressRequest>(
mobile_message);
ASSERT_TRUE(command->Init());
command->Run();
@@ -234,8 +232,8 @@ TEST_F(
.WillOnce(DoAll(SaveArg<0>(&command_result), Return(true)));
// Act
- std::shared_ptr<rc_rpc_plugin::commands::ButtonPressRequest>
- command = CreateRCCommand<rc_rpc_plugin::commands::ButtonPressRequest>(
+ std::shared_ptr<rc_rpc_plugin::commands::ButtonPressRequest> command =
+ CreateRCCommand<rc_rpc_plugin::commands::ButtonPressRequest>(
mobile_message);
ASSERT_TRUE(command->Init());
command->Run();
@@ -273,8 +271,8 @@ TEST_F(ButtonPressRequestTest, OnEvent_ExpectSuccessfullResponseSentToMobile) {
application_manager::event_engine::Event event(
hmi_apis::FunctionID::Buttons_ButtonPress);
event.set_smart_object(*hmi_message);
- std::shared_ptr<rc_rpc_plugin::commands::ButtonPressRequest>
- command = CreateRCCommand<rc_rpc_plugin::commands::ButtonPressRequest>(
+ std::shared_ptr<rc_rpc_plugin::commands::ButtonPressRequest> command =
+ CreateRCCommand<rc_rpc_plugin::commands::ButtonPressRequest>(
mobile_message);
command->on_event(event);
}
@@ -312,8 +310,8 @@ TEST_F(ButtonPressRequestTest,
application_manager::event_engine::Event event(
hmi_apis::FunctionID::Buttons_ButtonPress);
event.set_smart_object(*hmi_message);
- std::shared_ptr<rc_rpc_plugin::commands::ButtonPressRequest>
- command = CreateRCCommand<rc_rpc_plugin::commands::ButtonPressRequest>(
+ std::shared_ptr<rc_rpc_plugin::commands::ButtonPressRequest> command =
+ CreateRCCommand<rc_rpc_plugin::commands::ButtonPressRequest>(
mobile_message);
command->on_event(event);
}
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc
index 8f69b29275..a6f0ee12ca 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc
@@ -41,8 +41,6 @@
#include "application_manager/commands/command_request_test.h"
#include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h"
-
-
using ::testing::_;
using ::testing::Mock;
using ::testing::NiceMock;
@@ -116,15 +114,14 @@ class GetInteriorVehicleDataRequestTest
return message;
}
template <class Command>
- std::shared_ptr<Command> CreateRCCommand(
- MessageSharedPtr& msg) {
+ std::shared_ptr<Command> CreateRCCommand(MessageSharedPtr& msg) {
InitCommand(kDefaultTimeout_);
return std::make_shared<Command>(msg ? msg : msg = CreateMessage(),
- app_mngr_,
- mock_rpc_service_,
- mock_hmi_capabilities_,
- mock_policy_handler_,
- mock_allocation_manager_);
+ app_mngr_,
+ mock_rpc_service_,
+ mock_hmi_capabilities_,
+ mock_policy_handler_,
+ mock_allocation_manager_);
}
protected:
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_interior_vehicle_data_notification_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_interior_vehicle_data_notification_test.cc
index 690586d0e1..df11bf8c88 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_interior_vehicle_data_notification_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_interior_vehicle_data_notification_test.cc
@@ -85,15 +85,14 @@ class OnInteriorVehicleDataNotificationTest
}
template <class Command>
- std::shared_ptr<Command> CreateRCCommand(
- MessageSharedPtr& msg) {
+ std::shared_ptr<Command> CreateRCCommand(MessageSharedPtr& msg) {
InitCommand(kDefaultTimeout_);
return std::make_shared<Command>(msg ? msg : msg = CreateMessage(),
- app_mngr_,
- mock_rpc_service_,
- mock_hmi_capabilities_,
- mock_policy_handler_,
- mock_allocation_manager_);
+ app_mngr_,
+ mock_rpc_service_,
+ mock_hmi_capabilities_,
+ mock_policy_handler_,
+ mock_allocation_manager_);
}
protected:
@@ -126,9 +125,8 @@ TEST_F(OnInteriorVehicleDataNotificationTest,
EXPECT_CALL(mock_rpc_service_, SendMessageToMobile(_, false))
.WillOnce(SaveArg<0>(&message));
// Act
- std::shared_ptr<
- rc_rpc_plugin::commands::OnInteriorVehicleDataNotification> command =
- CreateRCCommand<
+ std::shared_ptr<rc_rpc_plugin::commands::OnInteriorVehicleDataNotification>
+ command = CreateRCCommand<
rc_rpc_plugin::commands::OnInteriorVehicleDataNotification>(
mobile_message);
command->Run();
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc
index 907292f150..9054ce4830 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc
@@ -85,15 +85,14 @@ class RCOnRemoteControlSettingsNotificationTest
}
template <class Command>
- std::shared_ptr<Command> CreateRCCommand(
- MessageSharedPtr& msg) {
+ std::shared_ptr<Command> CreateRCCommand(MessageSharedPtr& msg) {
InitCommand(kDefaultTimeout_);
return std::make_shared<Command>(msg ? msg : msg = CreateMessage(),
- app_mngr_,
- mock_rpc_service_,
- mock_hmi_capabilities_,
- mock_policy_handler_,
- mock_allocation_manager_);
+ app_mngr_,
+ mock_rpc_service_,
+ mock_hmi_capabilities_,
+ mock_policy_handler_,
+ mock_allocation_manager_);
}
protected:
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc
index a1fff199ee..7d32d64a87 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc
@@ -54,7 +54,6 @@
#include "include/test/protocol_handler/mock_protocol_handler.h"
#include "test/application_manager/mock_application_manager_settings.h"
-
using ::testing::_;
using ::testing::Return;
using ::testing::ReturnRef;
@@ -146,15 +145,14 @@ class RCGetInteriorVehicleDataConsentTest
}
template <class Command>
- std::shared_ptr<Command> CreateRCCommand(
- MessageSharedPtr& msg) {
+ std::shared_ptr<Command> CreateRCCommand(MessageSharedPtr& msg) {
InitCommand(kDefaultTimeout_);
return std::make_shared<Command>(msg ? msg : msg = CreateMessage(),
- app_mngr_,
- rpc_service,
- mock_hmi_capabilities_,
- mock_policy_handler_,
- mock_allocation_manager_);
+ app_mngr_,
+ rpc_service,
+ mock_hmi_capabilities_,
+ mock_policy_handler_,
+ mock_allocation_manager_);
}
MessageSharedPtr CreateBasicMessage() {
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc
index fdee55a30c..8072783a71 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc
@@ -106,15 +106,14 @@ class SetInteriorVehicleDataRequestTest
}
template <class Command>
- std::shared_ptr<Command> CreateRCCommand(
- MessageSharedPtr& msg) {
+ std::shared_ptr<Command> CreateRCCommand(MessageSharedPtr& msg) {
InitCommand(kDefaultTimeout_);
return std::make_shared<Command>(msg ? msg : msg = CreateMessage(),
- app_mngr_,
- mock_rpc_service_,
- mock_hmi_capabilities_,
- mock_policy_handler_,
- mock_allocation_manager_);
+ app_mngr_,
+ mock_rpc_service_,
+ mock_hmi_capabilities_,
+ mock_policy_handler_,
+ mock_allocation_manager_);
}
protected: