Changes in tests regarding libprivilege API change

[Issue#]        SSDWSSP-620
[Bug/Feature]   Add new API in libprivilege-control and use it in
                installators (perm_app_setup_permissions)
[Cause]         There is a need that only installators could add
                persistent rules
[Solution]      Update tests to use new libprivilege api mainly for
                perm_app_setup_permissions.
[Verification]  Build, install, run tests.

Change-Id: I18ddd5d286988584cd822a4b929419c8bc1c6102

diff --git a/tests/libprivilege-control-tests/libprivilege-control_test_common.cpp b/tests/libprivilege-control-tests/libprivilege-control_test_common.cpp
index 3215141..dbe05a6 100644 (file)
--- a/tests/libprivilege-control-tests/libprivilege-control_test_common.cpp
+++ b/tests/libprivilege-control-tests/libprivilege-control_test_common.cpp
@@ -384,10 +384,10 @@ void test_app_enable_permissions_efl(bool smack)
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
             "perm_app_install failed: " << result);
 
-    // Enable a permission:
-    result = perm_app_enable_permissions(EFL_APP_ID, APP_TYPE_EFL, PRIVS_EFL, 0);
+    // Register a permission:
+    result = perm_app_setup_permissions(EFL_APP_ID, APP_TYPE_EFL, PRIVS_EFL);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
-        "Error enabling app permissions. Result: " << result);
+        "Error registering app permissions. Result: " << result);
 
     DB_END
 
@@ -425,10 +425,10 @@ void test_app_disable_permissions_efl(bool smack)
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
             "perm_app_install failed: " << result);
 
-    // Enable a permission
-    result = perm_app_enable_permissions(EFL_APP_ID, APP_TYPE_EFL, PRIVS_EFL, 0);
+    // Register a permission
+    result = perm_app_setup_permissions(EFL_APP_ID, APP_TYPE_EFL, PRIVS_EFL);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
-        "Error enabling app permissions. Result: " << result);
+        "Error registering app permissions. Result: " << result);
 
     DB_END
 
@@ -482,9 +482,9 @@ void test_app_disable_permissions(bool smack)
  */
 
     // Prepare permissions that we want to disable
-    result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2, 1);
+    result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
-            " Error enabling app permissions. Result: " << result);
+            " Error registering app permissions. Result: " << result);
 
     DB_END
 
@@ -516,12 +516,12 @@ void test_app_disable_permissions(bool smack)
     DB_BEGIN
 
     // Prepare permissions that will not be disabled
-    result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS, 1);
+    result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
             " Error adding app first permissions. Result: " << result);
 
     // Prepare permissions that we want to disable
-    result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2, 1);
+    result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
             " Error adding app second permissions. Result: " << result);
 
@@ -565,9 +565,13 @@ void test_app_disable_permissions(bool smack)
     DB_BEGIN
 
     // Prepare permissions
-    result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_R, 1);
+    result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_R);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
-            " Error adding app permissions. Result: " << result);
+            " Error registering app r permissions. Result: " << result);
+
+    result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_NO_R);
+    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
+            " Error registering app no r permissions. Result: " << result);
 
     // Disable same permissions without r
     result = perm_app_disable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_NO_R);
@@ -648,9 +652,9 @@ void test_appsettings_privilege(bool smack)
     RUNNER_ASSERT_MSG(ret == PC_OPERATION_SUCCESS, "Error in perm_app_install.");
 
 
-    ret = perm_app_enable_permissions(APP_TEST, APP_TYPE_OSP, PRIV_APPSETTING, true);
+    ret = perm_app_setup_permissions(APP_TEST, APP_TYPE_OSP, PRIV_APPSETTING);
     RUNNER_ASSERT_MSG(ret == PC_OPERATION_SUCCESS,
-        " Error enabling app permissions. Result: " << ret);
+        " Error registering app permissions. Result: " << ret);
 
     DB_END
 

diff --git a/tests/libprivilege-control-tests/test_cases.cpp b/tests/libprivilege-control-tests/test_cases.cpp
index 5c341c5..13cee41 100644 (file)
--- a/tests/libprivilege-control-tests/test_cases.cpp
+++ b/tests/libprivilege-control-tests/test_cases.cpp
@@ -356,9 +356,9 @@ RUNNER_TEST_SMACK(privilege_control04_add_permissions)
     RUNNER_ASSERT_MSG(result == 0, "perm_app_install returned " << result << ". Errno: " << strerror(errno));
 
 
-    result = perm_app_enable_permissions(APP_ID, APP_TYPE_EFL, PRIVS_EFL, TRUE);
+    result = perm_app_setup_permissions(APP_ID, APP_TYPE_EFL, PRIVS_EFL);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
-        " perm_app_enable_permissions failed with result: " << result);
+        " perm_app_setup_permissions failed with result: " << result);
 
     DB_END
 
@@ -446,9 +446,9 @@ void set_app_privilege(int line_no,
             " perm_app_install returned " << result << ". Errno: " << strerror(errno));
 
     // TEST:
-    result = perm_app_enable_permissions(app_id, APP_TYPE, privileges, 1);
+    result = perm_app_setup_permissions(app_id, APP_TYPE, privileges);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Line: " << line_no <<
-        " Error enabling app permissions. Result: " << result);
+        " Error registering app permissions. Result: " << result);
 
     DB_END
 
@@ -777,9 +777,9 @@ RUNNER_TEST_SMACK(privilege_control11_app_enable_permissions)
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
 
-    result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2, 1);
+    result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
-        " Error enabling app permissions. Result: " << result);
+        " Error registering app permissions. Result: " << result);
 
     DB_END
 
@@ -807,6 +807,9 @@ RUNNER_TEST_SMACK(privilege_control11_app_enable_permissions)
  */
 
     DB_BEGIN
+    result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2);
+    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
+        " Error registering app permissions. Result: " << result);
 
     result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2, 0);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
@@ -834,14 +837,14 @@ RUNNER_TEST_SMACK(privilege_control11_app_enable_permissions)
     check_app_has_permission(WGT_APP_ID, APP_TYPE_WGT, PRIVS2, false);
 
 /**
- * Test - Enabling all permissions in two complementary files
+ * Test - Registering new permissions in two complementary files
  */
 
     DB_BEGIN
 
-    result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_R_AND_NO_R, 1);
+    result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_R_AND_NO_R);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
-        " Error enabling app permissions. Result: " << result);
+        " Error registering app permissions. Result: " << result);
 
     DB_END
 
@@ -870,10 +873,10 @@ RUNNER_TEST_SMACK(privilege_control11_app_enable_permissions)
 
     DB_BEGIN
 
-    // Enable permission for rules 2 no r
-    result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_NO_R, 1);
+    // Register permission for rules 2 no r
+    result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_NO_R);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
-        " Error enabling app permissions without r. Result: " << result);
+        " Error registering app permissions without r. Result: " << result);
 
     DB_END
 
@@ -883,10 +886,10 @@ RUNNER_TEST_SMACK(privilege_control11_app_enable_permissions)
 
     DB_BEGIN
 
-    // Enable permission for rules 2
-    result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2, 1);
+    // Register permission for rules 2
+    result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
-        " Error enabling app all permissions. Result: " << result);
+        " Error registering app all permissions. Result: " << result);
 
     DB_END
 
@@ -906,9 +909,9 @@ RUNNER_TEST_SMACK(privilege_control11_app_enable_permissions)
  */
 
     // Enable permission for rules 2 no r
-    result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_NO_R, 1);
+    result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_NO_R);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
-        " Error enabling app permissions without r. Result: " << result);
+        " Error registering app permissions without r. Result: " << result);
 
     DB_END
 
@@ -919,9 +922,9 @@ RUNNER_TEST_SMACK(privilege_control11_app_enable_permissions)
     DB_BEGIN
 
     // Enable permission for rules 2
-    result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_R, 1);
+    result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_R);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
-        " Error enabling app permissions with only r. Result: " << result);
+        " Error registering app permissions with only r. Result: " << result);
 
     DB_END
 
@@ -986,9 +989,9 @@ RUNNER_TEST_SMACK(privilege_control13_app_reset_permissions)
     RUNNER_ASSERT_MSG(result == 0, "perm_app_install returned " << result << ". Errno: " << strerror(errno));
 
     // Prepare permissions to reset
-    result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2, 1);
+    result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
-        " Error adding app permissions. Result: " << result);
+        " Error registering app permissions. Result: " << result);
 
     // Reset permissions
     result = perm_app_reset_permissions(WGT_APP_ID);
@@ -1518,10 +1521,10 @@ RUNNER_TEST(privilege_control21_early_rules)
 
     DB_BEGIN
 
-    result = perm_app_enable_permissions(APP_ID, APP_TYPE_WGT, (const char**) &perm, 1);
-    RUNNER_ASSERT_MSG(result == 0, "app_enable_permission failed: " << result);
-    result = perm_app_enable_permissions(APP_TEST_APP_1, APP_TYPE_WGT, (const char**) &perm, 1);
-    RUNNER_ASSERT_MSG(result == 0, "app_enable_permission failed: " << result);
+    result = perm_app_setup_permissions(APP_ID, APP_TYPE_WGT, (const char**) &perm);
+    RUNNER_ASSERT_MSG(result == 0, "app_register_permissions failed: " << result);
+    result = perm_app_setup_permissions(APP_TEST_APP_1, APP_TYPE_WGT, (const char**) &perm);
+    RUNNER_ASSERT_MSG(result == 0, "app_register_permissions failed: " << result);
 
     DB_END
 
@@ -1677,8 +1680,8 @@ void InstallAV(const char* av_id, app_type_t av_type)
     result = perm_app_install(av_id);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "perm_app_install failed. Result: "
             << result << ", av_type: " << av_type);
-    result = perm_app_enable_permissions(av_id, av_type, PRIVS_AV, 1);
-    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "enable_permissions failed. Result: "
+    result = perm_app_setup_permissions(av_id, av_type, PRIVS_AV);
+    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "register_permissions failed. Result: "
             << result << ", av_type: " << av_type);
 
     DB_END

diff --git a/tests/libprivilege-control-tests/test_cases_incorrect_params.cpp b/tests/libprivilege-control-tests/test_cases_incorrect_params.cpp
index 5cdfc35..b886be2 100644 (file)
--- a/tests/libprivilege-control-tests/test_cases_incorrect_params.cpp
+++ b/tests/libprivilege-control-tests/test_cases_incorrect_params.cpp
@@ -179,3 +179,23 @@ RUNNER_TEST(privilege_control21m_incorrect_params_perm_app_has_permission)
                                               PRIVS2[0], NULL) == PC_ERR_INVALID_PARAM,
             "perm_app_has_permission didn't check if has_permission isn't NULL.");
 }
+
+RUNNER_TEST(privilege_control21n_incorrect_params_perm_app_setup_permissions)
+{
+    RUNNER_ASSERT_MSG(perm_app_setup_permissions(APP_ID, APP_TYPE_OTHER,
+                      NULL) == PC_ERR_INVALID_PARAM,
+            "perm_app_setup_permissions didn't check if perm_list isn't NULL");
+    RUNNER_ASSERT_MSG(perm_app_setup_permissions(NULL, APP_TYPE_OTHER,
+                      PRIVS2) == PC_ERR_INVALID_PARAM,
+            "perm_app_setup_permissions didn't check if pkg_id isn't NULL.");
+    RUNNER_ASSERT_MSG(perm_app_setup_permissions("", APP_TYPE_OTHER,
+                      PRIVS2) == PC_ERR_INVALID_PARAM,
+            "perm_app_setup_permissions didn't check if pkg_id isn't empty.");
+    RUNNER_ASSERT_MSG(perm_app_setup_permissions(APP_ID, (app_type_t)-1,
+                      PRIVS2) == PC_ERR_INVALID_PARAM,
+            "perm_app_setup_permissions didn't check if app type is valid.");
+    RUNNER_ASSERT_MSG(perm_app_setup_permissions("~APP~", APP_TYPE_OTHER,
+                      PRIVS2) == PC_ERR_INVALID_PARAM,
+            "perm_app_setup_permissions didn't check if pkg_id is valid");
+}
+

diff --git a/tests/libprivilege-control-tests/test_cases_stress.cpp b/tests/libprivilege-control-tests/test_cases_stress.cpp
index 3aa5dc3..e640c1f 100644 (file)
--- a/tests/libprivilege-control-tests/test_cases_stress.cpp
+++ b/tests/libprivilege-control-tests/test_cases_stress.cpp
@@ -126,8 +126,8 @@ RUNNER_TEST(privilege_control22_app_installation_1x100)
     result = perm_app_install(APP_TEST_SETTINGS_ASP1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
                   "Error in perm_app_install. Result: " << result);
-    result = perm_app_enable_permissions(APP_TEST_SETTINGS_ASP1,
-                                         APP_TYPE_OSP, PRIV_APPSETTING, 1);
+    result = perm_app_setup_permissions(APP_TEST_SETTINGS_ASP1,
+                                        APP_TYPE_OSP, PRIV_APPSETTING);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
                   "Error enabling App-Setting permissions. Result: " << result);
 
@@ -141,8 +141,8 @@ RUNNER_TEST(privilege_control22_app_installation_1x100)
     result = perm_app_install(TEST_OSP_FEATURE_APP_ID);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
                   "Error in perm_app_install. Result: " << result);
-    result = perm_app_enable_permissions(TEST_OSP_FEATURE_APP_ID,
-                                         APP_TYPE_OSP,(const char*[]) {NULL}, 1);
+    result = perm_app_setup_permissions(TEST_OSP_FEATURE_APP_ID,
+                                        APP_TYPE_OSP,(const char*[]) {NULL});
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
                   "Error enabling permissions. Result: " << result);
 
@@ -174,16 +174,16 @@ RUNNER_TEST(privilege_control22_app_installation_1x100)
                           << ". Result: " << result);
 
         // Add persistent permissions
-        result = perm_app_enable_permissions(APP_ID, APP_TYPE_OSP,
-                                             TEST_OSP_FEATURE_PRIVS, 1);
+        result = perm_app_setup_permissions(APP_ID, APP_TYPE_OSP,
+                                            TEST_OSP_FEATURE_PRIVS);
         RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
-           "Error in perm_app_enable_permissions from OSP Feature. Loop index: "
+           "Error in perm_app_setup_permissions from OSP Feature. Loop index: "
            << i << ". Result: " << result);
 
-        result = perm_app_enable_permissions(APP_ID, APP_TYPE_WGT,
-                                             TEST_WGT_FEATURE_PRIVS, 1);
+        result = perm_app_setup_permissions(APP_ID, APP_TYPE_WGT,
+                                            TEST_WGT_FEATURE_PRIVS);
         RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
-           "Error in perm_app_enable_permissions from WGT Feature. Loop index: "
+           "Error in perm_app_setup_permissions from WGT Feature. Loop index: "
            << i << ". Result: " << result);
 
         DB_END
@@ -443,10 +443,10 @@ RUNNER_TEST(privilege_control23_app_installation2_10x10)
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
                       "Error in perm_app_install."
                       << " Result: " << result);
-    result = perm_app_enable_permissions(APP_TEST_SETTINGS_ASP1,
-                                         APP_TYPE_OSP, PRIV_APPSETTING, 1);
+    result = perm_app_setup_permissions(APP_TEST_SETTINGS_ASP1,
+                                        APP_TYPE_OSP, PRIV_APPSETTING);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
-                      "Error enabling App-Setting permissions."
+                      "Error registering App-Setting permissions."
                       << " Result: " << result);
 
     // Register two valid api features
@@ -498,16 +498,16 @@ RUNNER_TEST(privilege_control23_app_installation2_10x10)
         for (int j = 0; j < (app_count/2); ++j)
         {
             // add persistent api feature permissions
-            result = perm_app_enable_permissions(app_ids[j], APP_TYPE_OSP,
-                                                 TEST_OSP_FEATURE_PRIVS, 1);
+            result = perm_app_setup_permissions(app_ids[j], APP_TYPE_OSP,
+                                                TEST_OSP_FEATURE_PRIVS);
             RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
-               "Error in perm_app_enable_permissions from OSP Feature. App id: "
+               "Error in perm_app_setup_permissions from OSP Feature. App id: "
                << app_ids[j] << " Loop index: " << i << ". Result: " << result);
 
-            result = perm_app_enable_permissions(app_ids[j+5], APP_TYPE_WGT,
-                                                 TEST_WGT_FEATURE_PRIVS, 1);
+            result = perm_app_setup_permissions(app_ids[j+5], APP_TYPE_WGT,
+                                                TEST_WGT_FEATURE_PRIVS);
             RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
-               "Error in perm_app_enable_permissions from WGT Feature. App id: "
+               "Error in perm_app_setup_permissions from WGT Feature. App id: "
                << app_ids[j+5] << " Loop index: " << i << ". Result: " << result);
         }