Fix style

4 files changed, 52 insertions, 46 deletions

diff --git a/src/components/application_manager/test/policy_handler_test.cc b/src/components/application_manager/test/policy_handler_test.cc
index 553c804e35..da6e45162a 100644
--- a/src/components/application_manager/test/policy_handler_test.cc
+++ b/src/components/application_manager/test/policy_handler_test.cc
@@ -401,7 +401,8 @@ TEST_F(PolicyHandlerTest, AppServiceUpdate_CheckAppService) {
   EXPECT_CALL(*mock_policy_manager_, LoadPT("", msg)).WillOnce(Return(true));
   policy_handler_.ReceiveMessageFromSDK("", msg);
 
-  policy_table::AppServiceParameters app_service_params = policy_table::AppServiceParameters();
+  policy_table::AppServiceParameters app_service_params =
+      policy_table::AppServiceParameters();
   (app_service_params)["MEDIA"] = policy_table::AppServiceInfo();
   (app_service_params)["MEDIA"].service_names->push_back("SDL App");
   (app_service_params)["MEDIA"].service_names->push_back("SDL Music");
@@ -409,8 +410,9 @@ TEST_F(PolicyHandlerTest, AppServiceUpdate_CheckAppService) {
   policy_table::AppServiceHandledRpc handled_rpc;
   handled_rpc.function_id = 41;
   (app_service_params)["MEDIA"].handled_rpcs.push_back(handled_rpc);
-  EXPECT_CALL(*mock_policy_manager_, GetAppServiceParameters(_,_)).WillRepeatedly(SetArgPointee<1>(app_service_params));
-  
+  EXPECT_CALL(*mock_policy_manager_, GetAppServiceParameters(_, _))
+      .WillRepeatedly(SetArgPointee<1>(app_service_params));
+
   ns_smart_device_link::ns_smart_objects::SmartArray requested_handled_rpcs;
   ns_smart_device_link::ns_smart_objects::SmartObject rpc_id(41);
   requested_handled_rpcs.push_back(rpc_id);
@@ -419,16 +421,23 @@ TEST_F(PolicyHandlerTest, AppServiceUpdate_CheckAppService) {
   ns_smart_device_link::ns_smart_objects::SmartObject fake_rpc_id(40);
   fake_handled_rpcs.push_back(fake_rpc_id);
 
-  ASSERT_TRUE(policy_handler_.CheckAppServiceParameters("1010101010", "SDL Music", "MEDIA", &requested_handled_rpcs));
-  ASSERT_TRUE(policy_handler_.CheckAppServiceParameters("1010101010", "SDL App", "MEDIA", &requested_handled_rpcs));
-  ASSERT_TRUE(policy_handler_.CheckAppServiceParameters("1010101010", "SDL App", "MEDIA", NULL));
-  ASSERT_TRUE(policy_handler_.CheckAppServiceParameters("1010101010", "", "MEDIA", NULL));
-  
-  ASSERT_FALSE(policy_handler_.CheckAppServiceParameters("1010101010", "", "", NULL));
-  ASSERT_FALSE(policy_handler_.CheckAppServiceParameters("1010101010", "SDL App", "NAVIGATION", &requested_handled_rpcs));
-  ASSERT_FALSE(policy_handler_.CheckAppServiceParameters("1010101010", "MUSIC", "MEDIA", &requested_handled_rpcs));
-  ASSERT_FALSE(policy_handler_.CheckAppServiceParameters("1010101010", "SDL App", "MEDIA", &fake_handled_rpcs));
-
+  ASSERT_TRUE(policy_handler_.CheckAppServiceParameters(
+      "1010101010", "SDL Music", "MEDIA", &requested_handled_rpcs));
+  ASSERT_TRUE(policy_handler_.CheckAppServiceParameters(
+      "1010101010", "SDL App", "MEDIA", &requested_handled_rpcs));
+  ASSERT_TRUE(policy_handler_.CheckAppServiceParameters(
+      "1010101010", "SDL App", "MEDIA", NULL));
+  ASSERT_TRUE(policy_handler_.CheckAppServiceParameters(
+      "1010101010", "", "MEDIA", NULL));
+
+  ASSERT_FALSE(
+      policy_handler_.CheckAppServiceParameters("1010101010", "", "", NULL));
+  ASSERT_FALSE(policy_handler_.CheckAppServiceParameters(
+      "1010101010", "SDL App", "NAVIGATION", &requested_handled_rpcs));
+  ASSERT_FALSE(policy_handler_.CheckAppServiceParameters(
+      "1010101010", "MUSIC", "MEDIA", &requested_handled_rpcs));
+  ASSERT_FALSE(policy_handler_.CheckAppServiceParameters(
+      "1010101010", "SDL App", "MEDIA", &fake_handled_rpcs));
 }
 
 TEST_F(PolicyHandlerTest, ReceiveMessageFromSDK) {
diff --git a/src/components/policy/policy_external/test/policy_manager_impl_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_test.cc
index 72c9e1a2bd..5af345eb7c 100644
--- a/src/components/policy/policy_external/test/policy_manager_impl_test.cc
+++ b/src/components/policy/policy_external/test/policy_manager_impl_test.cc
@@ -345,9 +345,7 @@ TEST_F(PolicyManagerImplTest2, GetCurrentDeviceId) {
   EXPECT_EQ("", policy_manager_->GetCurrentDeviceId(app_id_2_));
 }
 
-TEST_F(
-    PolicyManagerImplTest2,
-    UpdateApplication_AppServices) {
+TEST_F(PolicyManagerImplTest2, UpdateApplication_AppServices) {
   // Arrange
   CreateLocalPT(preloaded_pt_filename_);
   EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
@@ -359,21 +357,19 @@ TEST_F(
   policy_manager_->GetAppServiceParameters(app_id_2_, &app_service_parameters);
 
   ASSERT_FALSE(app_service_parameters.find("MEDIA") ==
-      app_service_parameters.end());
+               app_service_parameters.end());
 
-  auto service_names =
-    *(app_service_parameters["MEDIA"].service_names);
+  auto service_names = *(app_service_parameters["MEDIA"].service_names);
 
   EXPECT_TRUE(service_names.is_initialized());
   EXPECT_EQ(static_cast<std::string>(service_names[0]), "SDL App");
   EXPECT_EQ(static_cast<std::string>(service_names[1]), "SDL Music");
 
-  auto handled_rpcs =
-    app_service_parameters["MEDIA"].handled_rpcs;
+  auto handled_rpcs = app_service_parameters["MEDIA"].handled_rpcs;
 
   EXPECT_TRUE(handled_rpcs.is_initialized());
   EXPECT_EQ(handled_rpcs[0].function_id, 41);
-  
+
   // Check no update required
   EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
 }
diff --git a/src/components/policy/policy_regular/test/policy_manager_impl_test.cc b/src/components/policy/policy_regular/test/policy_manager_impl_test.cc
index 1fb72cb0f9..5f3e81232e 100644
--- a/src/components/policy/policy_regular/test/policy_manager_impl_test.cc
+++ b/src/components/policy/policy_regular/test/policy_manager_impl_test.cc
@@ -834,9 +834,7 @@ TEST_F(
   EXPECT_EQ("UP_TO_DATE", manager->GetPolicyTableStatus());
 }
 
-TEST_F(
-    PolicyManagerImplTest2,
-    UpdateApplication_AppServices) {
+TEST_F(PolicyManagerImplTest2, UpdateApplication_AppServices) {
   // Arrange
   CreateLocalPT("sdl_preloaded_pt.json");
   EXPECT_EQ("UP_TO_DATE", manager->GetPolicyTableStatus());
@@ -848,21 +846,19 @@ TEST_F(
   manager->GetAppServiceParameters(app_id2, &app_service_parameters);
 
   ASSERT_FALSE(app_service_parameters.find("MEDIA") ==
-      app_service_parameters.end());
+               app_service_parameters.end());
 
-  auto service_names =
-    *(app_service_parameters["MEDIA"].service_names);
+  auto service_names = *(app_service_parameters["MEDIA"].service_names);
 
   EXPECT_TRUE(service_names.is_initialized());
   EXPECT_EQ(static_cast<std::string>(service_names[0]), "SDL App");
   EXPECT_EQ(static_cast<std::string>(service_names[1]), "SDL Music");
 
-  auto handled_rpcs =
-    app_service_parameters["MEDIA"].handled_rpcs;
+  auto handled_rpcs = app_service_parameters["MEDIA"].handled_rpcs;
 
   EXPECT_TRUE(handled_rpcs.is_initialized());
   EXPECT_EQ(handled_rpcs[0].function_id, 41);
-  
+
   // Check no update required
   EXPECT_EQ("UP_TO_DATE", manager->GetPolicyTableStatus());
 }
diff --git a/src/components/policy/policy_regular/test/sql_pt_representation_test.cc b/src/components/policy/policy_regular/test/sql_pt_representation_test.cc
index 2fa5156362..9063c280bd 100644
--- a/src/components/policy/policy_regular/test/sql_pt_representation_test.cc
+++ b/src/components/policy/policy_regular/test/sql_pt_representation_test.cc
@@ -125,7 +125,8 @@ class SQLPTRepresentationTest : public SQLPTRepresentation,
     return ::SQLPTRepresentation::GatherApplicationPoliciesSection(policies);
   }
 
-  bool GatherAppServiceParameters(const std::string& app_id,
+  bool GatherAppServiceParameters(
+      const std::string& app_id,
       policy_table::AppServiceParameters* policies) const {
     return ::SQLPTRepresentation::GatherAppServiceParameters(app_id, policies);
   }
@@ -321,14 +322,20 @@ class SQLPTRepresentationTest : public SQLPTRepresentation,
     app_policies["1234"]["steal_focus"] = Json::Value(false);
     app_policies["1234"]["RequestType"] = Json::Value(Json::arrayValue);
     app_policies["1234"]["app_services"] = Json::Value(Json::objectValue);
-    app_policies["1234"]["app_services"]["MEDIA"] = Json::Value(Json::objectValue);
-    app_policies["1234"]["app_services"]["MEDIA"]["service_names"] = Json::Value(Json::arrayValue);
-    app_policies["1234"]["app_services"]["MEDIA"]["service_names"][0] = Json::Value("SDL App");
-    app_policies["1234"]["app_services"]["MEDIA"]["service_names"][1] = Json::Value("SDL Music");
-    app_policies["1234"]["app_services"]["MEDIA"]["handled_rpcs"] = Json::Value(Json::arrayValue);
-    app_policies["1234"]["app_services"]["MEDIA"]["handled_rpcs"][0] = Json::Value(Json::objectValue);
-    app_policies["1234"]["app_services"]["MEDIA"]["handled_rpcs"][0]["function_id"] = Json::Value(41);
-
+    app_policies["1234"]["app_services"]["MEDIA"] =
+        Json::Value(Json::objectValue);
+    app_policies["1234"]["app_services"]["MEDIA"]["service_names"] =
+        Json::Value(Json::arrayValue);
+    app_policies["1234"]["app_services"]["MEDIA"]["service_names"][0] =
+        Json::Value("SDL App");
+    app_policies["1234"]["app_services"]["MEDIA"]["service_names"][1] =
+        Json::Value("SDL Music");
+    app_policies["1234"]["app_services"]["MEDIA"]["handled_rpcs"] =
+        Json::Value(Json::arrayValue);
+    app_policies["1234"]["app_services"]["MEDIA"]["handled_rpcs"][0] =
+        Json::Value(Json::objectValue);
+    app_policies["1234"]["app_services"]["MEDIA"]["handled_rpcs"][0]
+                ["function_id"] = Json::Value(41);
 
     app_policies["device"] = Json::Value(Json::objectValue);
     app_policies["device"]["groups"] = Json::Value(Json::arrayValue);
@@ -1724,17 +1731,15 @@ TEST_F(SQLPTRepresentationTest, Save_SetPolicyTableThenSave_ExpectSavedToPT) {
 
   const std::string kAppId = "1234";
   policy_table::AppServiceParameters app_service_parameters;
-  GatherAppServiceParameters(kAppId , &app_service_parameters);
+  GatherAppServiceParameters(kAppId, &app_service_parameters);
   ASSERT_FALSE(app_service_parameters.find("MEDIA") ==
-      app_service_parameters.end());
-  auto service_names =
-    *(app_service_parameters["MEDIA"].service_names);
+               app_service_parameters.end());
+  auto service_names = *(app_service_parameters["MEDIA"].service_names);
   EXPECT_TRUE(service_names.is_initialized());
   EXPECT_EQ(static_cast<std::string>(service_names[0]), "SDL App");
   EXPECT_EQ(static_cast<std::string>(service_names[1]), "SDL Music");
 
-  auto handled_rpcs =
-    app_service_parameters["MEDIA"].handled_rpcs;
+  auto handled_rpcs = app_service_parameters["MEDIA"].handled_rpcs;
 
   EXPECT_TRUE(handled_rpcs.is_initialized());
   EXPECT_EQ(handled_rpcs[0].function_id, 41);