CAPI changes (set permission, remove alias): tests adjusted.

[platform/core/test/security-tests.git] / tests / ckm / async-api.cpp

diff --git a/tests/ckm/async-api.cpp b/tests/ckm/async-api.cpp
index a340c98..ded20be 100644 (file)
--- a/tests/ckm/async-api.cpp
+++ b/tests/ckm/async-api.cpp
@@ -144,13 +144,6 @@ struct KeyPair
 
 typedef map<Type, vector<KeyPair> > KeyMap;
 
-std::string format_full_label_alias(const std::string &label, const std::string &alias)
-{
-    std::stringstream ss;
-    ss << label << std::string(ckmc_label_name_separator) << alias;
-    return ss.str();
-}
-
 
 KeyMap initializeKeys()
 {
@@ -406,8 +399,6 @@ RUNNER_TEST(TA0000_init)
 {
     int temp;
     ControlShPtr control = Control::create();
-    RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = control->unlockUserKey(APP_UID, TEST_PASS)),
-                         "Error=" << ErrorToString(temp));
     RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = control->removeUserData(APP_UID)),
                          "Error=" << ErrorToString(temp));
 }
@@ -689,14 +680,14 @@ RUNNER_CHILD_TEST(TA0950_get_key_alias_vector_positive)
 
     DBCleanup dbc;
     test_positive(&ManagerAsync::saveKey, dbc.alias("alias1"), keys[RSA][0].prv, Policy());
-    test_check_aliases(&ManagerAsync::getKeyAliasVector, { format_full_label_alias(std::string(TEST_LABEL), Alias(dbc.alias("alias1"))) });
+    test_check_aliases(&ManagerAsync::getKeyAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias1")) });
 
     test_positive(&ManagerAsync::saveKey, dbc.alias("alias2"), keys[DSA][0].prv, Policy());
-    test_check_aliases(&ManagerAsync::getKeyAliasVector, { format_full_label_alias(std::string(TEST_LABEL), Alias(dbc.alias("alias1"))),
-                                                           format_full_label_alias(std::string(TEST_LABEL), Alias(dbc.alias("alias2"))) });
+    test_check_aliases(&ManagerAsync::getKeyAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias1")),
+                                                           aliasWithLabel(TEST_LABEL, dbc.alias("alias2")) });
 
     test_positive(&ManagerAsync::removeAlias, dbc.alias("alias1"));
-    test_check_aliases(&ManagerAsync::getKeyAliasVector, { format_full_label_alias(std::string(TEST_LABEL), Alias(dbc.alias("alias2"))) });
+    test_check_aliases(&ManagerAsync::getKeyAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias2")) });
 }
 
 
@@ -714,14 +705,14 @@ RUNNER_CHILD_TEST(TA1050_get_cert_alias_vector_positive)
 
     DBCleanup dbc;
     test_positive(&ManagerAsync::saveCertificate, dbc.alias("alias1"), certs[0], Policy());
-    test_check_aliases(&ManagerAsync::getCertificateAliasVector, { format_full_label_alias(std::string(TEST_LABEL), Alias(dbc.alias("alias1"))) });
+    test_check_aliases(&ManagerAsync::getCertificateAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias1")) });
 
     test_positive(&ManagerAsync::saveCertificate, dbc.alias("alias2"), certs[1], Policy());
-    test_check_aliases(&ManagerAsync::getCertificateAliasVector, { format_full_label_alias(std::string(TEST_LABEL), Alias(dbc.alias("alias1"))),
-                                                                   format_full_label_alias(std::string(TEST_LABEL), Alias(dbc.alias("alias2"))) });
+    test_check_aliases(&ManagerAsync::getCertificateAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias1")),
+                                                                   aliasWithLabel(TEST_LABEL, dbc.alias("alias2")) });
 
     test_positive(&ManagerAsync::removeAlias, dbc.alias("alias1"));
-    test_check_aliases(&ManagerAsync::getCertificateAliasVector, { format_full_label_alias(std::string(TEST_LABEL), Alias(dbc.alias("alias2"))) });
+    test_check_aliases(&ManagerAsync::getCertificateAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias2")) });
 }
 
 
@@ -739,14 +730,14 @@ RUNNER_CHILD_TEST(TA1150_get_data_alias_vector_positive)
 
     DBCleanup dbc;
     test_positive(&ManagerAsync::saveData, dbc.alias("alias1"), test_buffer, Policy());
-    test_check_aliases(&ManagerAsync::getDataAliasVector, { format_full_label_alias(std::string(TEST_LABEL), Alias(dbc.alias("alias1"))) });
+    test_check_aliases(&ManagerAsync::getDataAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias1")) });
 
     test_positive(&ManagerAsync::saveData, dbc.alias("alias2"), test_buffer, Policy());
-    test_check_aliases(&ManagerAsync::getDataAliasVector, { format_full_label_alias(std::string(TEST_LABEL), Alias(dbc.alias("alias1"))),
-                                                            format_full_label_alias(std::string(TEST_LABEL), Alias(dbc.alias("alias2"))) });
+    test_check_aliases(&ManagerAsync::getDataAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias1")),
+                                                            aliasWithLabel(TEST_LABEL, dbc.alias("alias2")) });
 
     test_positive(&ManagerAsync::removeAlias, dbc.alias("alias1"));
-    test_check_aliases(&ManagerAsync::getDataAliasVector, { format_full_label_alias(std::string(TEST_LABEL), Alias(dbc.alias("alias2"))) });
+    test_check_aliases(&ManagerAsync::getDataAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias2")) });
 }
 
 
@@ -790,8 +781,8 @@ RUNNER_CHILD_TEST(TA1250_create_key_pair_rsa_positive)
                   Policy(),
                   Policy());
 
-    test_check_aliases(&ManagerAsync::getKeyAliasVector, { format_full_label_alias(std::string(TEST_LABEL), Alias(dbc.alias("alias_prv"))),
-                                                           format_full_label_alias(std::string(TEST_LABEL), Alias(dbc.alias("alias_pub"))) });
+    test_check_aliases(&ManagerAsync::getKeyAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias_prv")),
+                                                           aliasWithLabel(TEST_LABEL, dbc.alias("alias_pub")) });
 }
 
 // createKeyPairDSA
@@ -834,8 +825,8 @@ RUNNER_CHILD_TEST(TA1290_create_key_pair_dsa_positive)
                   Policy(),
                   Policy());
 
-    test_check_aliases(&ManagerAsync::getKeyAliasVector, { format_full_label_alias(std::string(TEST_LABEL), Alias(dbc.alias("alias_prv"))),
-                                                           format_full_label_alias(std::string(TEST_LABEL), Alias(dbc.alias("alias_pub"))) });
+    test_check_aliases(&ManagerAsync::getKeyAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias_prv")),
+                                                           aliasWithLabel(TEST_LABEL, dbc.alias("alias_pub")) });
 }
 
 // createKeyPairECDSA
@@ -878,8 +869,8 @@ RUNNER_CHILD_TEST(TA1350_create_key_pair_ecdsa_positive)
                   Policy(),
                   Policy());
 
-    test_check_aliases(&ManagerAsync::getKeyAliasVector, { format_full_label_alias(std::string(TEST_LABEL), Alias(dbc.alias("alias_prv"))),
-                                                           format_full_label_alias(std::string(TEST_LABEL), Alias(dbc.alias("alias_pub"))) });
+    test_check_aliases(&ManagerAsync::getKeyAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias_prv")),
+                                                           aliasWithLabel(TEST_LABEL, dbc.alias("alias_pub")) });
 }
 
 
@@ -1169,9 +1160,9 @@ RUNNER_CHILD_TEST(TA1810_allow_access_invalid_param)
 {
     switch_to_storage_user(TEST_LABEL);
 
-    test_no_observer(&ManagerAsync::setPermission, "alias", "accessor", Permission::READ_REMOVE);
-    test_invalid_param(&ManagerAsync::setPermission, "", "accessor", Permission::READ_REMOVE);
-    test_invalid_param(&ManagerAsync::setPermission, "alias", "", Permission::READ_REMOVE);
+    test_no_observer(&ManagerAsync::setPermission, "alias", "accessor", CKM::Permission::READ | CKM::Permission::REMOVE);
+    test_invalid_param(&ManagerAsync::setPermission, "", "accessor", CKM::Permission::READ | CKM::Permission::REMOVE);
+    test_invalid_param(&ManagerAsync::setPermission, "alias", "", CKM::Permission::READ | CKM::Permission::REMOVE);
 }
 
 RUNNER_TEST(TA1820_allow_access)
@@ -1184,11 +1175,11 @@ RUNNER_TEST(TA1820_allow_access)
     test_positive(&ManagerAsync::setPermission,
                   dbc.alias("alias2"),
                   TEST_LABEL,
-                  Permission::READ);
+                  CKM::Permission::READ);
     test_positive(&ManagerAsync::setPermission,
                   dbc.alias("alias3"),
                   TEST_LABEL,
-                  Permission::READ_REMOVE);
+                  CKM::Permission::READ | CKM::Permission::REMOVE);
 
     {
         ScopedLabel label(TEST_LABEL);
@@ -1228,7 +1219,7 @@ RUNNER_TEST(TA1920_deny_access)
     test_positive(&ManagerAsync::setPermission,
                   dbc.alias("alias"),
                   TEST_LABEL,
-                  Permission::READ_REMOVE);
+                  CKM::Permission::READ | CKM::Permission::REMOVE);
     test_positive(&ManagerAsync::setPermission, dbc.alias("alias"), TEST_LABEL, CKM::Permission::NONE);
 
     {