Introduce environment class for CKM async API tests

CKMAsyncAPIEnv class takes care of initializing and deinitializing
environment before and after each test from CKM_ASYNC_API group.

This was formerly done by TA0000_init and TA9999_deinit tests that
in current solution were removed.

Change-Id: I27aa07c4c1b7b41964b4407937457432fa194911

diff --git a/src/ckm/async-api.cpp b/src/ckm/async-api.cpp
index 27284c4..3b74ea3 100644 (file)
--- a/src/ckm/async-api.cpp
+++ b/src/ckm/async-api.cpp
@@ -314,29 +314,46 @@ typedef void (ManagerAsync::*certChainFn2)(const ManagerAsync::ObserverPtr&,
                                            const AliasVector&,
                                            const AliasVector&,
                                            bool);
-} // namespace anonymous
 
+class CKMAsyncAPIEnv
+{
+public:
+    void init(const std::string &) {
+        int temp;
+        ControlShPtr control = Control::create();
+
+        RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = control->removeUserData(0)),
+                          "Error=" << CKM::ErrorToString(temp));
+        RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = control->unlockUserKey(0, TEST_PASS)),
+                          "Error=" << CKM::ErrorToString(temp));
+
+        RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = control->removeUserData(APP_UID)),
+                          "Error=" << ErrorToString(temp));
+        RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = control->unlockUserKey(APP_UID, TEST_PASS)),
+                          "Error=" << ErrorToString(temp));
+    }
+    void finish() {
+        int temp;
+        ControlShPtr control = Control::create();
+        RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = control->lockUserKey(APP_UID)),
+                          "Error=" << ErrorToString(temp));
+        RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = control->removeUserData(APP_UID)),
+                         "Error=" << ErrorToString(temp));
 
-RUNNER_TEST_GROUP_INIT(CKM_ASYNC_API);
+        RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = control->lockUserKey(0)),
+                          "Error=" << ErrorToString(temp));
+        RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = control->removeUserData(0)),
+                          "Error=" << ErrorToString(temp));
+    }
+};
 
-RUNNER_TEST(TA0000_init)
-{
-    int temp;
-    ControlShPtr control = Control::create();
+} // namespace anonymous
 
-    RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = control->removeUserData(0)),
-                      "Error=" << CKM::ErrorToString(temp));
-    RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = control->unlockUserKey(0, TEST_PASS)),
-                      "Error=" << CKM::ErrorToString(temp));
 
-    RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = control->removeUserData(APP_UID)),
-                      "Error=" << ErrorToString(temp));
-    RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = control->unlockUserKey(APP_UID, TEST_PASS)),
-                      "Error=" << ErrorToString(temp));
-}
+RUNNER_TEST_GROUP_INIT(CKM_ASYNC_API);
 
 // saveKey
-RUNNER_CHILD_TEST(TA0010_save_key_invalid_param)
+RUNNER_CHILD_TEST(TA0010_save_key_invalid_param, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -345,7 +362,7 @@ RUNNER_CHILD_TEST(TA0010_save_key_invalid_param)
     test_invalid_param(&ManagerAsync::saveKey, "alias", KeyShPtr(), Policy());
 }
 
-RUNNER_CHILD_TEST(TA0020_save_key_already_exists)
+RUNNER_CHILD_TEST(TA0020_save_key_already_exists, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -358,7 +375,7 @@ RUNNER_CHILD_TEST(TA0020_save_key_already_exists)
                   Policy());
 }
 
-RUNNER_CHILD_TEST(TA0050_save_key_positive)
+RUNNER_CHILD_TEST(TA0050_save_key_positive, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -368,7 +385,7 @@ RUNNER_CHILD_TEST(TA0050_save_key_positive)
 
 
 // saveCertificate
-RUNNER_CHILD_TEST(TA0110_save_cert_invalid_param)
+RUNNER_CHILD_TEST(TA0110_save_cert_invalid_param, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -378,7 +395,7 @@ RUNNER_CHILD_TEST(TA0110_save_cert_invalid_param)
     test_invalid_param(&ManagerAsync::saveCertificate, "alias", CertificateShPtr(), Policy());
 }
 
-RUNNER_CHILD_TEST(TA0120_save_cert_already_exists)
+RUNNER_CHILD_TEST(TA0120_save_cert_already_exists, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -391,7 +408,7 @@ RUNNER_CHILD_TEST(TA0120_save_cert_already_exists)
                   Policy());
 }
 
-RUNNER_CHILD_TEST(TA0150_save_cert_positive)
+RUNNER_CHILD_TEST(TA0150_save_cert_positive, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -401,7 +418,7 @@ RUNNER_CHILD_TEST(TA0150_save_cert_positive)
 
 
 // saveData
-RUNNER_CHILD_TEST(TA0210_save_data_invalid_param)
+RUNNER_CHILD_TEST(TA0210_save_data_invalid_param, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -410,7 +427,7 @@ RUNNER_CHILD_TEST(TA0210_save_data_invalid_param)
     test_invalid_param(&ManagerAsync::saveData, "alias", RawBuffer(), Policy());
 }
 
-RUNNER_CHILD_TEST(TA0220_save_data_already_exists)
+RUNNER_CHILD_TEST(TA0220_save_data_already_exists, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -423,7 +440,7 @@ RUNNER_CHILD_TEST(TA0220_save_data_already_exists)
                   Policy());
 }
 
-RUNNER_CHILD_TEST(TA0250_save_data_positive)
+RUNNER_CHILD_TEST(TA0250_save_data_positive, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -433,7 +450,7 @@ RUNNER_CHILD_TEST(TA0250_save_data_positive)
 
 
 // removeKey
-RUNNER_CHILD_TEST(TA0310_remove_alias_invalid_param)
+RUNNER_CHILD_TEST(TA0310_remove_alias_invalid_param, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -441,14 +458,14 @@ RUNNER_CHILD_TEST(TA0310_remove_alias_invalid_param)
     test_invalid_param(&ManagerAsync::removeAlias, "");
 }
 
-RUNNER_CHILD_TEST(TA0330_remove_alias_unknown_alias)
+RUNNER_CHILD_TEST(TA0330_remove_alias_unknown_alias, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
     test_negative(&ManagerAsync::removeAlias, CKM_API_ERROR_DB_ALIAS_UNKNOWN, "non-existing-alias");
 }
 
-RUNNER_CHILD_TEST(TA0350_remove_key_positive)
+RUNNER_CHILD_TEST(TA0350_remove_key_positive, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -458,7 +475,7 @@ RUNNER_CHILD_TEST(TA0350_remove_key_positive)
 }
 
 
-RUNNER_CHILD_TEST(TA0450_remove_cert_positive)
+RUNNER_CHILD_TEST(TA0450_remove_cert_positive, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -468,7 +485,7 @@ RUNNER_CHILD_TEST(TA0450_remove_cert_positive)
 }
 
 
-RUNNER_CHILD_TEST(TA0550_remove_data_positive)
+RUNNER_CHILD_TEST(TA0550_remove_data_positive, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -479,7 +496,7 @@ RUNNER_CHILD_TEST(TA0550_remove_data_positive)
 
 
 // getKey
-RUNNER_CHILD_TEST(TA0610_get_key_invalid_param)
+RUNNER_CHILD_TEST(TA0610_get_key_invalid_param, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -487,14 +504,14 @@ RUNNER_CHILD_TEST(TA0610_get_key_invalid_param)
     test_invalid_param(&ManagerAsync::getKey, "", "");
 }
 
-RUNNER_CHILD_TEST(TA0630_get_key_unknown_alias)
+RUNNER_CHILD_TEST(TA0630_get_key_unknown_alias, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
     test_negative(&ManagerAsync::getKey, CKM_API_ERROR_DB_ALIAS_UNKNOWN, "non-existing-alias", "");
 }
 
-RUNNER_CHILD_TEST(TA0640_get_key_wrong_password)
+RUNNER_CHILD_TEST(TA0640_get_key_wrong_password, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -506,7 +523,7 @@ RUNNER_CHILD_TEST(TA0640_get_key_wrong_password)
                   "wrong-password");
 }
 
-RUNNER_CHILD_TEST(TA0650_get_key_positive)
+RUNNER_CHILD_TEST(TA0650_get_key_positive, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -517,7 +534,7 @@ RUNNER_CHILD_TEST(TA0650_get_key_positive)
 
 
 // getCertificate
-RUNNER_CHILD_TEST(TA0710_get_cert_invalid_param)
+RUNNER_CHILD_TEST(TA0710_get_cert_invalid_param, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -525,7 +542,7 @@ RUNNER_CHILD_TEST(TA0710_get_cert_invalid_param)
     test_invalid_param(&ManagerAsync::getCertificate, "", "");
 }
 
-RUNNER_CHILD_TEST(TA0730_get_cert_unknown_alias)
+RUNNER_CHILD_TEST(TA0730_get_cert_unknown_alias, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -535,7 +552,7 @@ RUNNER_CHILD_TEST(TA0730_get_cert_unknown_alias)
                   "");
 }
 
-RUNNER_CHILD_TEST(TA0740_get_cert_wrong_password)
+RUNNER_CHILD_TEST(TA0740_get_cert_wrong_password, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -550,7 +567,7 @@ RUNNER_CHILD_TEST(TA0740_get_cert_wrong_password)
                   "wrong-password");
 }
 
-RUNNER_CHILD_TEST(TA0750_get_cert_positive)
+RUNNER_CHILD_TEST(TA0750_get_cert_positive, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -561,7 +578,7 @@ RUNNER_CHILD_TEST(TA0750_get_cert_positive)
 
 
 // getData
-RUNNER_CHILD_TEST(TA0810_get_data_invalid_param)
+RUNNER_CHILD_TEST(TA0810_get_data_invalid_param, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -569,14 +586,14 @@ RUNNER_CHILD_TEST(TA0810_get_data_invalid_param)
     test_invalid_param(&ManagerAsync::getData, "", "");
 }
 
-RUNNER_CHILD_TEST(TA0830_get_data_unknown_alias)
+RUNNER_CHILD_TEST(TA0830_get_data_unknown_alias, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
     test_negative(&ManagerAsync::getData, CKM_API_ERROR_DB_ALIAS_UNKNOWN, "non-existing-alias", "");
 }
 
-RUNNER_CHILD_TEST(TA0840_get_data_wrong_password)
+RUNNER_CHILD_TEST(TA0840_get_data_wrong_password, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -588,7 +605,7 @@ RUNNER_CHILD_TEST(TA0840_get_data_wrong_password)
                   "wrong-password");
 }
 
-RUNNER_CHILD_TEST(TA0850_get_data_positive)
+RUNNER_CHILD_TEST(TA0850_get_data_positive, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -599,14 +616,14 @@ RUNNER_CHILD_TEST(TA0850_get_data_positive)
 
 
 // getKeyAliasVector
-RUNNER_CHILD_TEST(TA0910_get_key_alias_vector_invalid_param)
+RUNNER_CHILD_TEST(TA0910_get_key_alias_vector_invalid_param, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
     test_no_observer(&ManagerAsync::getKeyAliasVector);
 }
 
-RUNNER_CHILD_TEST(TA0950_get_key_alias_vector_positive)
+RUNNER_CHILD_TEST(TA0950_get_key_alias_vector_positive, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -624,14 +641,14 @@ RUNNER_CHILD_TEST(TA0950_get_key_alias_vector_positive)
 
 
 // getCertificateAliasVector
-RUNNER_CHILD_TEST(TA1010_get_cert_alias_vector_invalid_param)
+RUNNER_CHILD_TEST(TA1010_get_cert_alias_vector_invalid_param, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
     test_no_observer(&ManagerAsync::getCertificateAliasVector);
 }
 
-RUNNER_CHILD_TEST(TA1050_get_cert_alias_vector_positive)
+RUNNER_CHILD_TEST(TA1050_get_cert_alias_vector_positive, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -649,14 +666,14 @@ RUNNER_CHILD_TEST(TA1050_get_cert_alias_vector_positive)
 
 
 // getDataAliasVector
-RUNNER_CHILD_TEST(TA1110_get_data_alias_vector_invalid_param)
+RUNNER_CHILD_TEST(TA1110_get_data_alias_vector_invalid_param, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
     test_no_observer(&ManagerAsync::getDataAliasVector);
 }
 
-RUNNER_CHILD_TEST(TA1150_get_data_alias_vector_positive)
+RUNNER_CHILD_TEST(TA1150_get_data_alias_vector_positive, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -674,7 +691,7 @@ RUNNER_CHILD_TEST(TA1150_get_data_alias_vector_positive)
 
 
 // createKeyPairRSA
-RUNNER_CHILD_TEST(TA1210_create_key_pair_rsa_invalid_param)
+RUNNER_CHILD_TEST(TA1210_create_key_pair_rsa_invalid_param, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -686,7 +703,7 @@ RUNNER_CHILD_TEST(TA1210_create_key_pair_rsa_invalid_param)
                      Policy());
 }
 
-RUNNER_CHILD_TEST(TA1220_create_key_pair_rsa_already_exists)
+RUNNER_CHILD_TEST(TA1220_create_key_pair_rsa_already_exists, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -701,7 +718,7 @@ RUNNER_CHILD_TEST(TA1220_create_key_pair_rsa_already_exists)
                   Policy());
 }
 
-RUNNER_CHILD_TEST(TA1250_create_key_pair_rsa_positive)
+RUNNER_CHILD_TEST(TA1250_create_key_pair_rsa_positive, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -718,7 +735,7 @@ RUNNER_CHILD_TEST(TA1250_create_key_pair_rsa_positive)
 }
 
 // createKeyPairDSA
-RUNNER_CHILD_TEST(TA1270_create_key_pair_dsa_invalid_param)
+RUNNER_CHILD_TEST(TA1270_create_key_pair_dsa_invalid_param, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -730,7 +747,7 @@ RUNNER_CHILD_TEST(TA1270_create_key_pair_dsa_invalid_param)
                      Policy());
 }
 
-RUNNER_CHILD_TEST(TA1280_create_key_pair_dsa_already_exists)
+RUNNER_CHILD_TEST(TA1280_create_key_pair_dsa_already_exists, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -745,7 +762,7 @@ RUNNER_CHILD_TEST(TA1280_create_key_pair_dsa_already_exists)
                   Policy());
 }
 
-RUNNER_CHILD_TEST(TA1290_create_key_pair_dsa_positive)
+RUNNER_CHILD_TEST(TA1290_create_key_pair_dsa_positive, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -762,7 +779,7 @@ RUNNER_CHILD_TEST(TA1290_create_key_pair_dsa_positive)
 }
 
 // createKeyPairECDSA
-RUNNER_CHILD_TEST(TA1310_create_key_pair_ecdsa_invalid_param)
+RUNNER_CHILD_TEST(TA1310_create_key_pair_ecdsa_invalid_param, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -774,7 +791,7 @@ RUNNER_CHILD_TEST(TA1310_create_key_pair_ecdsa_invalid_param)
                      Policy());
 }
 
-RUNNER_CHILD_TEST(TA1320_create_key_pair_ecdsa_already_exists)
+RUNNER_CHILD_TEST(TA1320_create_key_pair_ecdsa_already_exists, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -789,7 +806,7 @@ RUNNER_CHILD_TEST(TA1320_create_key_pair_ecdsa_already_exists)
                   Policy());
 }
 
-RUNNER_CHILD_TEST(TA1350_create_key_pair_ecdsa_positive)
+RUNNER_CHILD_TEST(TA1350_create_key_pair_ecdsa_positive, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -807,7 +824,7 @@ RUNNER_CHILD_TEST(TA1350_create_key_pair_ecdsa_positive)
 
 
 // getCertificateChain
-RUNNER_CHILD_TEST(TA1410_get_certificate_chain_invalid_param)
+RUNNER_CHILD_TEST(TA1410_get_certificate_chain_invalid_param, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -838,7 +855,7 @@ RUNNER_CHILD_TEST(TA1410_get_certificate_chain_invalid_param)
                                      true);
 }
 
-RUNNER_CHILD_TEST(TA1420_get_certificate_chain_negative)
+RUNNER_CHILD_TEST(TA1420_get_certificate_chain_negative, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -873,7 +890,7 @@ RUNNER_CHILD_TEST(TA1420_get_certificate_chain_negative)
                                 true);
 }
 
-RUNNER_CHILD_TEST(TA1450_get_certificate_chain_positive)
+RUNNER_CHILD_TEST(TA1450_get_certificate_chain_positive, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -899,7 +916,7 @@ RUNNER_CHILD_TEST(TA1450_get_certificate_chain_positive)
 
 
 // createSignature
-RUNNER_CHILD_TEST(TA1510_create_signature_invalid_param)
+RUNNER_CHILD_TEST(TA1510_create_signature_invalid_param, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -923,7 +940,7 @@ RUNNER_CHILD_TEST(TA1510_create_signature_invalid_param)
                        RSAPaddingAlgorithm::PKCS1);
 }
 
-RUNNER_CHILD_TEST(TA1520_create_signature_invalid_password)
+RUNNER_CHILD_TEST(TA1520_create_signature_invalid_password, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -938,7 +955,7 @@ RUNNER_CHILD_TEST(TA1520_create_signature_invalid_password)
                   RSAPaddingAlgorithm::PKCS1);
 }
 
-RUNNER_CHILD_TEST(TA1550_create_signature_positive)
+RUNNER_CHILD_TEST(TA1550_create_signature_positive, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -954,7 +971,7 @@ RUNNER_CHILD_TEST(TA1550_create_signature_positive)
 
 
 // verifySignature
-RUNNER_CHILD_TEST(TA1610_verify_signature_invalid_param)
+RUNNER_CHILD_TEST(TA1610_verify_signature_invalid_param, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -974,7 +991,7 @@ RUNNER_CHILD_TEST(TA1610_verify_signature_invalid_param)
                        RSAPaddingAlgorithm::PKCS1);
 }
 
-RUNNER_CHILD_TEST(TA1620_verify_signature_invalid_password)
+RUNNER_CHILD_TEST(TA1620_verify_signature_invalid_password, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -998,7 +1015,7 @@ RUNNER_CHILD_TEST(TA1620_verify_signature_invalid_password)
                   RSAPaddingAlgorithm::PKCS1);
 }
 
-RUNNER_CHILD_TEST(TA1630_verify_signature_invalid_message)
+RUNNER_CHILD_TEST(TA1630_verify_signature_invalid_message, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -1023,7 +1040,7 @@ RUNNER_CHILD_TEST(TA1630_verify_signature_invalid_message)
                   RSAPaddingAlgorithm::PKCS1);
 }
 
-RUNNER_CHILD_TEST(TA1640_verify_signature_invalid_signature)
+RUNNER_CHILD_TEST(TA1640_verify_signature_invalid_signature, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -1040,7 +1057,7 @@ RUNNER_CHILD_TEST(TA1640_verify_signature_invalid_signature)
                   RSAPaddingAlgorithm::PKCS1);
 }
 
-RUNNER_CHILD_TEST(TA1650_verify_signature_wrong_key)
+RUNNER_CHILD_TEST(TA1650_verify_signature_wrong_key, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -1063,7 +1080,7 @@ RUNNER_CHILD_TEST(TA1650_verify_signature_wrong_key)
                   RSAPaddingAlgorithm::PKCS1);
 }
 
-RUNNER_CHILD_TEST(TA1660_verify_signature_positive)
+RUNNER_CHILD_TEST(TA1660_verify_signature_positive, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -1088,13 +1105,13 @@ RUNNER_CHILD_TEST(TA1660_verify_signature_positive)
 
 
 // ocspCheck
-RUNNER_CHILD_TEST(TA1710_ocsp_check_invalid_param)
+RUNNER_CHILD_TEST(TA1710_ocsp_check_invalid_param, CKMAsyncAPIEnv)
 {
     test_no_observer(&ManagerAsync::ocspCheck, EMPTY_CERT_VECTOR);
     test_invalid_param(&ManagerAsync::ocspCheck, EMPTY_CERT_VECTOR);
 }
 
-RUNNER_CHILD_TEST(TA1720_ocsp_check_negative)
+RUNNER_CHILD_TEST(TA1720_ocsp_check_negative, CKMAsyncAPIEnv)
 {
     switch_to_storage_ocsp_user(TEST_LABEL);
 
@@ -1106,7 +1123,7 @@ RUNNER_CHILD_TEST(TA1720_ocsp_check_negative)
                          "Verification should fail. Got: " << obs->m_ocspStatus);
 }
 
-RUNNER_CHILD_TEST(TA1750_ocsp_check_positive)
+RUNNER_CHILD_TEST(TA1750_ocsp_check_positive, CKMAsyncAPIEnv)
 {
     switch_to_storage_ocsp_user(TEST_LABEL);
 
@@ -1125,7 +1142,7 @@ RUNNER_CHILD_TEST(TA1750_ocsp_check_positive)
 }
 
 // setPermission
-RUNNER_CHILD_TEST(TA1810_allow_access_invalid_param)
+RUNNER_CHILD_TEST(TA1810_allow_access_invalid_param, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -1134,7 +1151,7 @@ RUNNER_CHILD_TEST(TA1810_allow_access_invalid_param)
     test_invalid_param(&ManagerAsync::setPermission, "alias", "", CKM::Permission::READ | CKM::Permission::REMOVE);
 }
 
-RUNNER_TEST(TA1820_allow_access)
+RUNNER_TEST(TA1820_allow_access, CKMAsyncAPIEnv)
 {
     DBCleanup dbc;
     CharPtr top_label = get_label();
@@ -1171,7 +1188,7 @@ RUNNER_TEST(TA1820_allow_access)
 }
 
 // denyAccess
-RUNNER_CHILD_TEST(TA1910_deny_access_invalid_param)
+RUNNER_CHILD_TEST(TA1910_deny_access_invalid_param, CKMAsyncAPIEnv)
 {
     switch_to_storage_user(TEST_LABEL);
 
@@ -1180,7 +1197,7 @@ RUNNER_CHILD_TEST(TA1910_deny_access_invalid_param)
     test_invalid_param(&ManagerAsync::setPermission, "alias", "", CKM::Permission::NONE);
 }
 
-RUNNER_TEST(TA1920_deny_access)
+RUNNER_TEST(TA1920_deny_access, CKMAsyncAPIEnv)
 {
     DBCleanup dbc;
     CharPtr top_label = get_label();
@@ -1206,7 +1223,7 @@ CKM::Alias alias_PKCS_exportable = "async-test-PKCS-export";
 CKM::Alias alias_PKCS_not_exportable = "async-test-PKCS-no-export";
 }
 
-RUNNER_TEST(TA2000_PKCS_add_bundle_with_chain_certs)
+RUNNER_TEST(TA2000_PKCS_add_bundle_with_chain_certs, CKMAsyncAPIEnv)
 {
     DBCleanup dbc;
     auto manager = CKM::Manager::create();
@@ -1266,7 +1283,7 @@ RUNNER_TEST(TA2000_PKCS_add_bundle_with_chain_certs)
                   notExportable);
 }
 
-RUNNER_TEST(TA2010_PKCS_get)
+RUNNER_TEST(TA2010_PKCS_get, CKMAsyncAPIEnv)
 {
     DBCleanup dbc;
     auto manager = CKM::Manager::create();
@@ -1307,18 +1324,3 @@ RUNNER_TEST(TA2010_PKCS_get)
         2 == caVector.size(),
         "Wrong size of vector");
 }
-
-RUNNER_TEST(TA9999_deinit)
-{
-    int temp;
-    ControlShPtr control = Control::create();
-    RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = control->lockUserKey(APP_UID)),
-                         "Error=" << ErrorToString(temp));
-    RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = control->removeUserData(APP_UID)),
-                         "Error=" << ErrorToString(temp));
-
-    RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = control->lockUserKey(0)),
-                         "Error=" << ErrorToString(temp));
-    RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = control->removeUserData(0)),
-                         "Error=" << ErrorToString(temp));
-}