SM: Rename and use one label generators

[platform/core/test/security-tests.git] / src / security-manager-tests / test_cases_trusted_sharing.cpp

diff --git a/src/security-manager-tests/test_cases_trusted_sharing.cpp b/src/security-manager-tests/test_cases_trusted_sharing.cpp
index a728c3e..975f350 100644 (file)
--- a/src/security-manager-tests/test_cases_trusted_sharing.cpp
+++ b/src/security-manager-tests/test_cases_trusted_sharing.cpp
@@ -131,8 +131,8 @@ RUNNER_TEST(security_manager_43_app_install_with_trusted_path)
     // check rules
     check_exact_access("System", trusted_label, system_access);
     check_exact_access("User", trusted_label, system_access);
-    check_exact_access(generateAppLabel(provider.getAppId()), trusted_label, trusted_access);
-    check_exact_access(generatePkgLabel(provider.getPkgId()), trusted_label, "");
+    check_exact_access(generateProcessLabel(provider.getAppId()), trusted_label, trusted_access);
+    check_exact_access(generatePathRWLabel(provider.getPkgId()), trusted_label, "");
 
     // install trusted app
     InstallRequest trustedApp;
@@ -142,8 +142,8 @@ RUNNER_TEST(security_manager_43_app_install_with_trusted_path)
     Api::install(trustedApp);
 
     // check rules
-    check_exact_access(generateAppLabel(user.getAppId()), trusted_label, trusted_access);
-    check_exact_access(generatePkgLabel(user.getPkgId()), trusted_label, "");
+    check_exact_access(generateProcessLabel(user.getAppId()), trusted_label, trusted_access);
+    check_exact_access(generatePathRWLabel(user.getPkgId()), trusted_label, "");
 
     // install untrusted app
     InstallRequest untrustedApp;
@@ -152,8 +152,8 @@ RUNNER_TEST(security_manager_43_app_install_with_trusted_path)
     Api::install(untrustedApp);
 
     // check rules
-    check_exact_access(generateAppLabel(untrusted.getAppId()), trusted_label, "");
-    check_exact_access(generatePkgLabel(untrusted.getPkgId()), trusted_label, "");
+    check_exact_access(generateProcessLabel(untrusted.getAppId()), trusted_label, "");
+    check_exact_access(generatePathRWLabel(untrusted.getPkgId()), trusted_label, "");
 
     // uninstall trusting app
     Api::uninstall(trustingApp);
@@ -161,18 +161,18 @@ RUNNER_TEST(security_manager_43_app_install_with_trusted_path)
     // there's still one app with author id, rules should be kept
     check_exact_access("System", trusted_label, system_access);
     check_exact_access("User", trusted_label, system_access);
-    check_exact_access(generateAppLabel(provider.getAppId()), trusted_label, "");
-    check_exact_access(generatePkgLabel(provider.getPkgId()), trusted_label, "");
-    check_exact_access(generateAppLabel(user.getAppId()), trusted_label, trusted_access);
-    check_exact_access(generatePkgLabel(user.getPkgId()), trusted_label, "");
+    check_exact_access(generateProcessLabel(provider.getAppId()), trusted_label, "");
+    check_exact_access(generatePathRWLabel(provider.getPkgId()), trusted_label, "");
+    check_exact_access(generateProcessLabel(user.getAppId()), trusted_label, trusted_access);
+    check_exact_access(generatePathRWLabel(user.getPkgId()), trusted_label, "");
 
     Api::uninstall(trustedApp);
 
     // no more apps with author id
     check_exact_access("System", trusted_label, "");
     check_exact_access("User", trusted_label, "");
-    check_exact_access(generateAppLabel(user.getAppId()), trusted_label, "");
-    check_exact_access(generatePkgLabel(user.getPkgId()), trusted_label, "");
+    check_exact_access(generateProcessLabel(user.getAppId()), trusted_label, "");
+    check_exact_access(generatePathRWLabel(user.getPkgId()), trusted_label, "");
 
     Api::uninstall(untrustedApp);
 }
@@ -268,26 +268,26 @@ RUNNER_TEST(security_manager_46_pkgId_deinstalation_test)
     trustingApp2.setAuthorId(authorId1);
     Api::install(trustingApp2);
 
-    check_exact_access("System", generateAppLabel(trusted1.getAppId()), "rwxl");
-    check_exact_access("User", generateAppLabel(trusted1.getAppId()), "rwxl");
-    check_exact_access("System", generatePkgLabel(trusted1.getPkgId()), "rwxatl");
-    check_exact_access("User", generatePkgLabel(trusted1.getPkgId()), "rwxatl");
-    check_exact_access("System", generateAppLabel(trusted2.getAppId()), "rwxl");
-    check_exact_access("User", generateAppLabel(trusted2.getAppId()), "rwxl");
+    check_exact_access("System", generateProcessLabel(trusted1.getAppId()), "rwxl");
+    check_exact_access("User", generateProcessLabel(trusted1.getAppId()), "rwxl");
+    check_exact_access("System", generatePathRWLabel(trusted1.getPkgId()), "rwxatl");
+    check_exact_access("User", generatePathRWLabel(trusted1.getPkgId()), "rwxatl");
+    check_exact_access("System", generateProcessLabel(trusted2.getAppId()), "rwxl");
+    check_exact_access("User", generateProcessLabel(trusted2.getAppId()), "rwxl");
 
     Api::uninstall(trustingApp2);
 
-    check_exact_access("System", generateAppLabel(trusted1.getAppId()), "rwxl");
-    check_exact_access("User", generateAppLabel(trusted1.getAppId()), "rwxl");
-    check_exact_access("System", generatePkgLabel(trusted1.getPkgId()), "rwxatl");
-    check_exact_access("User", generatePkgLabel(trusted1.getPkgId()), "rwxatl");
-    check_exact_access("System", generateAppLabel(trusted2.getAppId()), "");
-    check_exact_access("User", generateAppLabel(trusted2.getAppId()), "");
+    check_exact_access("System", generateProcessLabel(trusted1.getAppId()), "rwxl");
+    check_exact_access("User", generateProcessLabel(trusted1.getAppId()), "rwxl");
+    check_exact_access("System", generatePathRWLabel(trusted1.getPkgId()), "rwxatl");
+    check_exact_access("User", generatePathRWLabel(trusted1.getPkgId()), "rwxatl");
+    check_exact_access("System", generateProcessLabel(trusted2.getAppId()), "");
+    check_exact_access("User", generateProcessLabel(trusted2.getAppId()), "");
 
     Api::uninstall(trustingApp);
 
-    check_exact_access("System", generateAppLabel(trusted1.getAppId()), "");
-    check_exact_access("User", generateAppLabel(trusted1.getAppId()), "");
-    check_exact_access("System", generatePkgLabel(trusted1.getPkgId()), "");
-    check_exact_access("User", generatePkgLabel(trusted1.getPkgId()), "");
+    check_exact_access("System", generateProcessLabel(trusted1.getAppId()), "");
+    check_exact_access("User", generateProcessLabel(trusted1.getAppId()), "");
+    check_exact_access("System", generatePathRWLabel(trusted1.getPkgId()), "");
+    check_exact_access("User", generatePathRWLabel(trusted1.getPkgId()), "");
 }