diff options
author | JackLivio <jack@livio.io> | 2019-03-17 14:26:12 -0400 |
---|---|---|
committer | JackLivio <jack@livio.io> | 2019-03-17 14:26:12 -0400 |
commit | d309b03fcb3240bea005132682400f4c5444e61b (patch) | |
tree | e4eef687fd9efed7ce27e2e588b7252f8abcdb23 | |
parent | c7cfce0fe516b1b5edb231fe65b1e6d57580abd6 (diff) | |
download | sdl_core-feature/app_service_policies_unit_tests.tar.gz |
Update var name to kServiceTypefeature/app_service_policies_unit_tests
4 files changed, 24 insertions, 24 deletions
diff --git a/src/components/application_manager/test/policy_handler_test.cc b/src/components/application_manager/test/policy_handler_test.cc index 27e9120661..5b31b8d574 100644 --- a/src/components/application_manager/test/policy_handler_test.cc +++ b/src/components/application_manager/test/policy_handler_test.cc @@ -403,17 +403,17 @@ TEST_F(PolicyHandlerTest, AppServiceUpdate_CheckAppService) { policy_table::AppServiceParameters app_service_params = policy_table::AppServiceParameters(); - std::string media_str = "MEDIA"; + std::string kServiceType = "MEDIA"; std::string as_app_id = "1010101010"; std::string service_name1 = "SDL Music"; std::string service_name2 = "SDL App"; - (app_service_params)[media_str] = policy_table::AppServiceInfo(); - (app_service_params)[media_str].service_names->push_back(service_name2); - (app_service_params)[media_str].service_names->push_back(service_name1); - (app_service_params)[media_str].service_names->mark_initialized(); + (app_service_params)[kServiceType] = policy_table::AppServiceInfo(); + (app_service_params)[kServiceType].service_names->push_back(service_name2); + (app_service_params)[kServiceType].service_names->push_back(service_name1); + (app_service_params)[kServiceType].service_names->mark_initialized(); policy_table::AppServiceHandledRpc handled_rpc; handled_rpc.function_id = 41; - (app_service_params)[media_str].handled_rpcs.push_back(handled_rpc); + (app_service_params)[kServiceType].handled_rpcs.push_back(handled_rpc); EXPECT_CALL(*mock_policy_manager_, GetAppServiceParameters(_, _)) .WillRepeatedly(SetArgPointee<1>(app_service_params)); @@ -426,22 +426,22 @@ TEST_F(PolicyHandlerTest, AppServiceUpdate_CheckAppService) { fake_handled_rpcs.push_back(fake_rpc_id); EXPECT_TRUE(policy_handler_.CheckAppServiceParameters( - as_app_id, service_name1, media_str, &requested_handled_rpcs)); + as_app_id, service_name1, kServiceType, &requested_handled_rpcs)); EXPECT_TRUE(policy_handler_.CheckAppServiceParameters( - as_app_id, service_name2, media_str, &requested_handled_rpcs)); + as_app_id, service_name2, kServiceType, &requested_handled_rpcs)); EXPECT_TRUE(policy_handler_.CheckAppServiceParameters( - as_app_id, service_name2, media_str, NULL)); + as_app_id, service_name2, kServiceType, NULL)); EXPECT_TRUE(policy_handler_.CheckAppServiceParameters( - as_app_id, "", media_str, NULL)); + as_app_id, "", kServiceType, NULL)); EXPECT_FALSE( policy_handler_.CheckAppServiceParameters(as_app_id, "", "", NULL)); EXPECT_FALSE(policy_handler_.CheckAppServiceParameters( as_app_id, service_name2, "NAVIGATION", &requested_handled_rpcs)); EXPECT_FALSE(policy_handler_.CheckAppServiceParameters( - as_app_id, "MUSIC", media_str, &requested_handled_rpcs)); + as_app_id, "MUSIC", kServiceType, &requested_handled_rpcs)); EXPECT_FALSE(policy_handler_.CheckAppServiceParameters( - as_app_id, service_name2, media_str, &fake_handled_rpcs)); + as_app_id, service_name2, kServiceType, &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 0d70f7d198..1916e09efc 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 @@ -347,7 +347,7 @@ TEST_F(PolicyManagerImplTest2, GetCurrentDeviceId) { TEST_F(PolicyManagerImplTest2, UpdateApplication_AppServices) { // Arrange - std::string media_str = "MEDIA"; + std::string kServiceType = "MEDIA"; CreateLocalPT(preloaded_pt_filename_); EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus()); GetPTU("json/valid_sdl_pt_update.json"); @@ -357,17 +357,17 @@ TEST_F(PolicyManagerImplTest2, UpdateApplication_AppServices) { policy_table::AppServiceParameters(); policy_manager_->GetAppServiceParameters(app_id_2_, &app_service_parameters); - ASSERT_FALSE(app_service_parameters.find(media_str) == + ASSERT_FALSE(app_service_parameters.find(kServiceType) == app_service_parameters.end()); - auto service_names = *(app_service_parameters[media_str].service_names); + auto service_names = *(app_service_parameters[kServiceType].service_names); ASSERT_TRUE(service_names.is_initialized()); ASSERT_EQ(service_names.size(), 2u); 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_str].handled_rpcs; + auto handled_rpcs = app_service_parameters[kServiceType].handled_rpcs; ASSERT_TRUE(handled_rpcs.is_initialized()); EXPECT_EQ(handled_rpcs[0].function_id, 41); 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 da5a677602..97b1768666 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 @@ -835,7 +835,7 @@ TEST_F( } TEST_F(PolicyManagerImplTest2, UpdateApplication_AppServices) { - std::string media_str = "MEDIA"; + std::string kServiceType = "MEDIA"; // Arrange CreateLocalPT("sdl_preloaded_pt.json"); EXPECT_EQ("UP_TO_DATE", manager->GetPolicyTableStatus()); @@ -846,17 +846,17 @@ TEST_F(PolicyManagerImplTest2, UpdateApplication_AppServices) { policy_table::AppServiceParameters(); manager->GetAppServiceParameters(app_id2, &app_service_parameters); - ASSERT_FALSE(app_service_parameters.find(media_str) == + ASSERT_FALSE(app_service_parameters.find(kServiceType) == app_service_parameters.end()); - auto service_names = *(app_service_parameters[media_str].service_names); + auto service_names = *(app_service_parameters[kServiceType].service_names); ASSERT_TRUE(service_names.is_initialized()); ASSERT_EQ(service_names.size(), 2u); 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_str].handled_rpcs; + auto handled_rpcs = app_service_parameters[kServiceType].handled_rpcs; ASSERT_TRUE(handled_rpcs.is_initialized()); EXPECT_EQ(handled_rpcs[0].function_id, 41); 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 0055ce2ee9..675d708843 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 @@ -1730,18 +1730,18 @@ TEST_F(SQLPTRepresentationTest, Save_SetPolicyTableThenSave_ExpectSavedToPT) { EXPECT_EQ(3u, devices.size()); const std::string kAppId = "1234"; - const std::string media_str = "MEDIA"; + const std::string kServiceType = "MEDIA"; policy_table::AppServiceParameters app_service_parameters; GatherAppServiceParameters(kAppId, &app_service_parameters); - ASSERT_FALSE(app_service_parameters.find(media_str) == + ASSERT_FALSE(app_service_parameters.find(kServiceType) == app_service_parameters.end()); - auto service_names = *(app_service_parameters[media_str].service_names); + auto service_names = *(app_service_parameters[kServiceType].service_names); EXPECT_TRUE(service_names.is_initialized()); ASSERT_EQ(service_names.size(), 2u); 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_str].handled_rpcs; + auto handled_rpcs = app_service_parameters[kServiceType].handled_rpcs; EXPECT_TRUE(handled_rpcs.is_initialized()); EXPECT_EQ(handled_rpcs[0].function_id, 41); |