CKM::ErrorToString removed from key-manager

[platform/core/test/security-tests.git] / src / ckm-integration / group01.cpp

diff --git a/src/ckm-integration/group01.cpp b/src/ckm-integration/group01.cpp
index c40da84..563a68b 100644 (file)
--- a/src/ckm-integration/group01.cpp
+++ b/src/ckm-integration/group01.cpp
@@ -20,6 +20,7 @@
  */
 #include <sys/types.h>
 #include <unistd.h>
+#include <ckm-common.h>
 
 #include <dpl/test/test_runner.h>
 #include <dpl/test/test_runner_child.h>
@@ -60,32 +61,32 @@ RUNNER_CHILD_TEST(G01T01_ControlNegative) {
 
     RUNNER_ASSERT_MSG(
         CKM_API_ERROR_ACCESS_DENIED == (temp = control->removeUserData(ps.GetUid())),
-        "Error=" << CKM::ErrorToString(temp));
+        "Error=" << CKMErrorToString(temp));
 
     RUNNER_ASSERT_MSG(
         CKM_API_ERROR_ACCESS_DENIED == (temp = control->resetUserPassword(ps.GetUid(),
         "simple-password")),
-        "Error=" << CKM::ErrorToString(temp));
+        "Error=" << CKMErrorToString(temp));
 
     RUNNER_ASSERT_MSG(
         CKM_API_ERROR_ACCESS_DENIED == (temp = control->resetUserPassword(ps.GetUid(), "something")),
-        "Error=" << CKM::ErrorToString(temp));
+        "Error=" << CKMErrorToString(temp));
 
     RUNNER_ASSERT_MSG(
         CKM_API_ERROR_ACCESS_DENIED == (temp = control->unlockUserKey(ps.GetUid(), "test-pass")),
-        "Error=" << CKM::ErrorToString(temp));
+        "Error=" << CKMErrorToString(temp));
 
     RUNNER_ASSERT_MSG(
         CKM_API_ERROR_ACCESS_DENIED == (temp = control->lockUserKey(ps.GetUid())),
-        "Error=" << CKM::ErrorToString(temp));
+        "Error=" << CKMErrorToString(temp));
 
     RUNNER_ASSERT_MSG(
         CKM_API_ERROR_ACCESS_DENIED == (temp = control->resetUserPassword(ps.GetUid(), "something")),
-        "Error=" << CKM::ErrorToString(temp));
+        "Error=" << CKMErrorToString(temp));
 
     RUNNER_ASSERT_MSG(
         CKM_API_ERROR_ACCESS_DENIED == (temp = control->removeUserData(ps.GetUid())),
-        "Error=" << CKM::ErrorToString(temp));
+        "Error=" << CKMErrorToString(temp));
 }
 
 RUNNER_CHILD_TEST(G01T02_ControlPositive) {
@@ -98,32 +99,32 @@ RUNNER_CHILD_TEST(G01T02_ControlPositive) {
 
     RUNNER_ASSERT_MSG(
         CKM_API_SUCCESS == (temp = control->removeUserData(USER_UID)),
-        "Error=" << CKM::ErrorToString(temp));
+        "Error=" << CKMErrorToString(temp));
 
     RUNNER_ASSERT_MSG(
         CKM_API_SUCCESS == (temp = control->resetUserPassword(USER_UID,
         "simple-password")),
-        "Error=" << CKM::ErrorToString(temp));
+        "Error=" << CKMErrorToString(temp));
 
     RUNNER_ASSERT_MSG(
         CKM_API_SUCCESS == (temp = control->resetUserPassword(USER_UID, "something")),
-        "Error=" << CKM::ErrorToString(temp));
+        "Error=" << CKMErrorToString(temp));
 
     RUNNER_ASSERT_MSG(
         CKM_API_SUCCESS == (temp = control->unlockUserKey(USER_UID, "test-pass")),
-        "Error=" << CKM::ErrorToString(temp));
+        "Error=" << CKMErrorToString(temp));
 
     RUNNER_ASSERT_MSG(
         CKM_API_SUCCESS == (temp = control->lockUserKey(USER_UID)),
-        "Error=" << CKM::ErrorToString(temp));
+        "Error=" << CKMErrorToString(temp));
 
     RUNNER_ASSERT_MSG(
         CKM_API_ERROR_BAD_REQUEST == (temp = control->resetUserPassword(USER_UID, "something")),
-        "Error=" << CKM::ErrorToString(temp));
+        "Error=" << CKMErrorToString(temp));
 
     RUNNER_ASSERT_MSG(
         CKM_API_SUCCESS == (temp = control->removeUserData(USER_UID)),
-        "Error=" << CKM::ErrorToString(temp));
+        "Error=" << CKMErrorToString(temp));
 }
 
 RUNNER_CHILD_TEST(G01T03_ProcessIdentificationBySecurityManager) {