diff options
author | JackLivio <jack@livio.io> | 2019-03-17 13:49:14 -0400 |
---|---|---|
committer | JackLivio <jack@livio.io> | 2019-03-17 13:49:14 -0400 |
commit | c7cfce0fe516b1b5edb231fe65b1e6d57580abd6 (patch) | |
tree | c10db3e0db9991d07e35d69e46765aab08239bd4 | |
parent | baf16b9012ed2478d7b84cd64adbd6779224899d (diff) | |
download | sdl_core-c7cfce0fe516b1b5edb231fe65b1e6d57580abd6.tar.gz |
Address comments
4 files changed, 45 insertions, 35 deletions
diff --git a/src/components/application_manager/test/policy_handler_test.cc b/src/components/application_manager/test/policy_handler_test.cc index da6e45162a..27e9120661 100644 --- a/src/components/application_manager/test/policy_handler_test.cc +++ b/src/components/application_manager/test/policy_handler_test.cc @@ -403,13 +403,17 @@ TEST_F(PolicyHandlerTest, AppServiceUpdate_CheckAppService) { 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"); - (app_service_params)["MEDIA"].service_names->mark_initialized(); + std::string media_str = "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(); policy_table::AppServiceHandledRpc handled_rpc; handled_rpc.function_id = 41; - (app_service_params)["MEDIA"].handled_rpcs.push_back(handled_rpc); + (app_service_params)[media_str].handled_rpcs.push_back(handled_rpc); EXPECT_CALL(*mock_policy_manager_, GetAppServiceParameters(_, _)) .WillRepeatedly(SetArgPointee<1>(app_service_params)); @@ -421,23 +425,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)); + EXPECT_TRUE(policy_handler_.CheckAppServiceParameters( + as_app_id, service_name1, media_str, &requested_handled_rpcs)); + EXPECT_TRUE(policy_handler_.CheckAppServiceParameters( + as_app_id, service_name2, media_str, &requested_handled_rpcs)); + EXPECT_TRUE(policy_handler_.CheckAppServiceParameters( + as_app_id, service_name2, media_str, NULL)); + EXPECT_TRUE(policy_handler_.CheckAppServiceParameters( + as_app_id, "", media_str, 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)); + EXPECT_FALSE(policy_handler_.CheckAppServiceParameters( + as_app_id, service_name2, media_str, &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 5af345eb7c..0d70f7d198 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,6 +347,7 @@ TEST_F(PolicyManagerImplTest2, GetCurrentDeviceId) { TEST_F(PolicyManagerImplTest2, UpdateApplication_AppServices) { // Arrange + std::string media_str = "MEDIA"; CreateLocalPT(preloaded_pt_filename_); EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus()); GetPTU("json/valid_sdl_pt_update.json"); @@ -356,18 +357,19 @@ TEST_F(PolicyManagerImplTest2, UpdateApplication_AppServices) { policy_table::AppServiceParameters(); policy_manager_->GetAppServiceParameters(app_id_2_, &app_service_parameters); - ASSERT_FALSE(app_service_parameters.find("MEDIA") == + ASSERT_FALSE(app_service_parameters.find(media_str) == app_service_parameters.end()); - auto service_names = *(app_service_parameters["MEDIA"].service_names); + auto service_names = *(app_service_parameters[media_str].service_names); - EXPECT_TRUE(service_names.is_initialized()); + 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"].handled_rpcs; + auto handled_rpcs = app_service_parameters[media_str].handled_rpcs; - EXPECT_TRUE(handled_rpcs.is_initialized()); + ASSERT_TRUE(handled_rpcs.is_initialized()); EXPECT_EQ(handled_rpcs[0].function_id, 41); // Check no update required 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 5f3e81232e..da5a677602 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,6 +835,7 @@ TEST_F( } TEST_F(PolicyManagerImplTest2, UpdateApplication_AppServices) { + std::string media_str = "MEDIA"; // Arrange CreateLocalPT("sdl_preloaded_pt.json"); EXPECT_EQ("UP_TO_DATE", manager->GetPolicyTableStatus()); @@ -845,18 +846,19 @@ TEST_F(PolicyManagerImplTest2, UpdateApplication_AppServices) { policy_table::AppServiceParameters(); manager->GetAppServiceParameters(app_id2, &app_service_parameters); - ASSERT_FALSE(app_service_parameters.find("MEDIA") == + ASSERT_FALSE(app_service_parameters.find(media_str) == app_service_parameters.end()); - auto service_names = *(app_service_parameters["MEDIA"].service_names); + auto service_names = *(app_service_parameters[media_str].service_names); - EXPECT_TRUE(service_names.is_initialized()); + 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"].handled_rpcs; + auto handled_rpcs = app_service_parameters[media_str].handled_rpcs; - EXPECT_TRUE(handled_rpcs.is_initialized()); + ASSERT_TRUE(handled_rpcs.is_initialized()); EXPECT_EQ(handled_rpcs[0].function_id, 41); // Check no update required 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 9063c280bd..0055ce2ee9 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,16 +1730,18 @@ TEST_F(SQLPTRepresentationTest, Save_SetPolicyTableThenSave_ExpectSavedToPT) { EXPECT_EQ(3u, devices.size()); const std::string kAppId = "1234"; + const std::string media_str = "MEDIA"; policy_table::AppServiceParameters app_service_parameters; GatherAppServiceParameters(kAppId, &app_service_parameters); - ASSERT_FALSE(app_service_parameters.find("MEDIA") == + ASSERT_FALSE(app_service_parameters.find(media_str) == app_service_parameters.end()); - auto service_names = *(app_service_parameters["MEDIA"].service_names); + auto service_names = *(app_service_parameters[media_str].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"].handled_rpcs; + auto handled_rpcs = app_service_parameters[media_str].handled_rpcs; EXPECT_TRUE(handled_rpcs.is_initialized()); EXPECT_EQ(handled_rpcs[0].function_id, 41); |