Fix error messages for access denial tests

[platform/core/test/security-tests.git] / tests / security-server-tests / cookie_api.cpp

diff --git a/tests/security-server-tests/cookie_api.cpp b/tests/security-server-tests/cookie_api.cpp
index cc1530a..5145174 100644 (file)
--- a/tests/security-server-tests/cookie_api.cpp
+++ b/tests/security-server-tests/cookie_api.cpp
@@ -217,7 +217,7 @@ RUNNER_CHILD_TEST_SMACK(tc_unit_03_02_security_server_check_privilege)
 
     int ret = security_server_check_privilege(cookie.data(), 0);
     RUNNER_ASSERT_MSG_BT(ret == SECURITY_SERVER_API_ERROR_ACCESS_DENIED,
-                      "Error in security_server_check_privilege(): " << ret);
+                      "security_server_check_privilege() should return access denied: " << ret);
 }
 
 //privileges drop and added smack rule
@@ -301,7 +301,7 @@ RUNNER_CHILD_TEST_SMACK(tc_unit_05_02_security_server_get_cookie_pid)
 
     int ret = security_server_get_cookie_pid(cookie.data());
     RUNNER_ASSERT_MSG_BT(ret == SECURITY_SERVER_API_ERROR_ACCESS_DENIED,
-                      "Error in security_server_get_cookie_pid(): " << ret);
+                      "security_server_get_cookie_pid() should return access denied: " << ret);
 }
 
 //privileges drop and added smack rule
@@ -411,19 +411,28 @@ RUNNER_CHILD_TEST(tc_unit_09_02_cookie_API_access_deny)
     Cookie cookie = getCookieFromSS();
 
     int ret = security_server_check_privilege(cookie.data(), DB_ALARM_GID);
-    RUNNER_ASSERT_MSG_BT(ret == SECURITY_SERVER_API_ERROR_ACCESS_DENIED, "ret: " << ret);
+    RUNNER_ASSERT_MSG_BT(ret == SECURITY_SERVER_API_ERROR_ACCESS_DENIED,
+            "security_server_check_privilege should return access denied, "
+            "ret: " << ret);
 
     ret = security_server_get_gid(ROOT_USER);
-    RUNNER_ASSERT_MSG_BT(ret == SECURITY_SERVER_API_ERROR_ACCESS_DENIED, "ret: " << ret);
+    RUNNER_ASSERT_MSG_BT(ret == SECURITY_SERVER_API_ERROR_ACCESS_DENIED,
+            "security_server_get_gid should return access denied, "
+            "ret: " << ret);
 
     ret = security_server_get_cookie_pid(cookie.data());
-    RUNNER_ASSERT_MSG_BT(ret == SECURITY_SERVER_API_ERROR_ACCESS_DENIED, "ret: " << ret);
+    RUNNER_ASSERT_MSG_BT(ret == SECURITY_SERVER_API_ERROR_ACCESS_DENIED,
+            "security_server_get_cookie_pid should return access denied, "
+            "ret: " << ret);
 
     UniquePtrCstring ss_label(security_server_get_smacklabel_cookie(cookie.data()), free);
-    RUNNER_ASSERT_MSG_BT(ss_label.get() == NULL, "ss_label: " << ss_label.get());
+    RUNNER_ASSERT_MSG_BT(ss_label.get() == NULL,
+            "access should be denied so label should be NULL: " << ss_label.get());
 
     ret = security_server_check_privilege_by_pid(getpid(), "_", "rx");
-    RUNNER_ASSERT_MSG_BT(ret == SECURITY_SERVER_API_ERROR_ACCESS_DENIED, "ret: " << ret);
+    RUNNER_ASSERT_MSG_BT(ret == SECURITY_SERVER_API_ERROR_ACCESS_DENIED,
+            "security_server_check_privilege_by_pid should return access denied, "
+            "ret: " << ret);
 }
 
 // NOSMACK version of the test above