From 68087877d2150f4547a3e968ef2d5e98b8665e92 Mon Sep 17 00:00:00 2001 From: kyungwook tak Date: Wed, 1 Oct 2014 13:46:45 +0900 Subject: [PATCH] Rebase TC and TC Group numbering Change-Id: Ic8f4346a5c863347d054ee033a694bb0a6892224 Signed-off-by: kyungwook tak --- tests/ckm/capi-testcases.cpp | 149 +++++++++++++++++++++---------------------- 1 file changed, 74 insertions(+), 75 deletions(-) diff --git a/tests/ckm/capi-testcases.cpp b/tests/ckm/capi-testcases.cpp index d7ba986..ab523a0 100644 --- a/tests/ckm/capi-testcases.cpp +++ b/tests/ckm/capi-testcases.cpp @@ -91,9 +91,9 @@ ckmc_raw_buffer_s prepare_message_buffer(const char * input) } -RUNNER_TEST_GROUP_INIT (T201_CKMC_CONTROL_C_API); +RUNNER_TEST_GROUP_INIT (T301_CKMC_CONTROL_C_API); -RUNNER_TEST(T2011_Control_C_API) +RUNNER_TEST(T3011_Control_C_API) { int temp; @@ -104,7 +104,7 @@ RUNNER_TEST(T2011_Control_C_API) "Error=" << temp); } -RUNNER_TEST(T2012_Control_C_API) +RUNNER_TEST(T3012_Control_C_API) { int temp; @@ -114,7 +114,7 @@ RUNNER_TEST(T2012_Control_C_API) "Error=" << temp); } -RUNNER_TEST(T2013_Control_C_API) +RUNNER_TEST(T3013_Control_C_API) { int temp; @@ -122,7 +122,7 @@ RUNNER_TEST(T2013_Control_C_API) "Error=" << temp); } -RUNNER_TEST(T2014_Control_C_API) +RUNNER_TEST(T3014_Control_C_API) { int temp; @@ -130,7 +130,7 @@ RUNNER_TEST(T2014_Control_C_API) "Error=" << temp); } -RUNNER_TEST(T2015_Control_C_API) +RUNNER_TEST(T3015_Control_C_API) { int temp; @@ -146,7 +146,7 @@ RUNNER_TEST(T2015_Control_C_API) "Error=" << temp); } -RUNNER_TEST(TT2016_Control_C_API) +RUNNER_TEST(T3016_Control_C_API) { int temp; @@ -164,9 +164,9 @@ RUNNER_TEST(TT2016_Control_C_API) "Error=" << temp); } -RUNNER_TEST_GROUP_INIT (T202_CKMC_QUICK_SET_GET_TESTS_C_API); +RUNNER_TEST_GROUP_INIT (T302_CKMC_QUICK_SET_GET_TESTS_C_API); -RUNNER_TEST(T2021_init_C_API) +RUNNER_TEST(T3021_init_C_API) { int temp; @@ -178,7 +178,7 @@ RUNNER_TEST(T2021_init_C_API) "Error=" << temp); } -RUNNER_TEST(T2022_key_C_API) +RUNNER_TEST(T3022_key_C_API) { int temp; @@ -220,7 +220,7 @@ RUNNER_TEST(T2022_key_C_API) "Error=" << temp); } -RUNNER_TEST(T2023_certificate_C_API) +RUNNER_TEST(T3023_certificate_C_API) { int temp; @@ -279,7 +279,7 @@ RUNNER_TEST(T2023_certificate_C_API) ckmc_cert_free(cert2); } -RUNNER_TEST(T2024_certificate_remove_C_API) +RUNNER_TEST(T3024_certificate_remove_C_API) { int temp; @@ -301,7 +301,7 @@ RUNNER_TEST(T2024_certificate_remove_C_API) "Error=" << temp); } -RUNNER_TEST(T2025_certificate_list_C_API) +RUNNER_TEST(T3025_certificate_list_C_API) { int temp; @@ -366,7 +366,7 @@ RUNNER_TEST(T2025_certificate_list_C_API) } -RUNNER_CHILD_TEST(T2026_user_app_save_key_C_API) +RUNNER_CHILD_TEST(T3026_user_app_save_key_C_API) { SecurityServer::AccessProvider ap("mylabel"); ap.allowAPI("key-manager::api-storage", "rw"); @@ -415,7 +415,7 @@ RUNNER_CHILD_TEST(T2026_user_app_save_key_C_API) // key.getDER() == key2.getDER(), "Key value has been changed by service"); } -RUNNER_CHILD_TEST(T2027_app_user_save_keys_exportable_flag) +RUNNER_CHILD_TEST(T3027_app_user_save_keys_exportable_flag) { SecurityServer::AccessProvider ap("mylabel"); ap.allowAPI("key-manager::api-storage", "rw"); @@ -458,7 +458,7 @@ RUNNER_CHILD_TEST(T2027_app_user_save_keys_exportable_flag) } -RUNNER_TEST(T2028_certificate_with_DSA_key_C_API) +RUNNER_TEST(T3028_certificate_with_DSA_key_C_API) { int temp; @@ -516,7 +516,7 @@ RUNNER_TEST(T2028_certificate_with_DSA_key_C_API) ckmc_cert_free(cert2); } -RUNNER_TEST(T2029_deinit_C_API) +RUNNER_TEST(T3029_deinit_C_API) { int temp; @@ -533,9 +533,9 @@ RUNNER_TEST(T2029_deinit_C_API) } -RUNNER_TEST_GROUP_INIT (T2030_CKMC_QUICK_GET_ALIAS_TESTS_C_API); +RUNNER_TEST_GROUP_INIT (T3030_CKMC_QUICK_GET_ALIAS_TESTS_C_API); -RUNNER_TEST(T2031_init_C_API) +RUNNER_TEST(T3031_init_C_API) { int temp; @@ -547,7 +547,7 @@ RUNNER_TEST(T2031_init_C_API) "Error=" << temp); } -RUNNER_TEST(T2032_save_keys_get_alias_C_API) +RUNNER_TEST(T3032_save_keys_get_alias_C_API) { int temp; @@ -602,7 +602,7 @@ RUNNER_TEST(T2032_save_keys_get_alias_C_API) } -RUNNER_TEST(T2033_remove_key_C_API) +RUNNER_TEST(T3033_remove_key_C_API) { int temp; @@ -622,7 +622,7 @@ RUNNER_TEST(T2033_remove_key_C_API) "Error=" << temp); } -RUNNER_TEST(T2034_deinit_C_API) +RUNNER_TEST(T3034_deinit_C_API) { int temp; @@ -638,9 +638,9 @@ RUNNER_TEST(T2034_deinit_C_API) "Error=" << temp); } -RUNNER_TEST_GROUP_INIT (T2040_CKMC_QUICK_REMOVE_BIN_DATA_TEST_C_API); +RUNNER_TEST_GROUP_INIT (T3040_CKMC_QUICK_REMOVE_BIN_DATA_TEST_C_API); -RUNNER_TEST(T2041_init_C_API) +RUNNER_TEST(T3041_init_C_API) { int temp; RUNNER_ASSERT_MSG( @@ -651,7 +651,7 @@ RUNNER_TEST(T2041_init_C_API) "Error=" << temp); } -RUNNER_TEST(T2042_save_get_bin_data_C_API) +RUNNER_TEST(T3042_save_get_bin_data_C_API) { int temp; @@ -716,7 +716,7 @@ RUNNER_TEST(T2042_save_get_bin_data_C_API) "Data corrupted"); } -RUNNER_CHILD_TEST(T2043_app_user_save_bin_data_C_API) +RUNNER_CHILD_TEST(T3043_app_user_save_bin_data_C_API) { SecurityServer::AccessProvider ap("mylabel"); ap.allowAPI("key-manager::api-storage", "rw"); @@ -758,7 +758,7 @@ RUNNER_CHILD_TEST(T2043_app_user_save_bin_data_C_API) "Error: expecting " << (current_aliases_num+3) << " aliases, while found " << temp); } -RUNNER_TEST(T2044_remove_bin_data_C_API) +RUNNER_TEST(T3044_remove_bin_data_C_API) { int temp; @@ -800,7 +800,7 @@ RUNNER_TEST(T2044_remove_bin_data_C_API) "Error=" << temp); } -RUNNER_TEST(T2045_deinit_C_API) +RUNNER_TEST(T3045_deinit_C_API) { int temp; @@ -818,9 +818,9 @@ RUNNER_TEST(T2045_deinit_C_API) "Error=" << temp); } -RUNNER_TEST_GROUP_INIT(T205_CKMC_QUICK_CREATE_PAIR_CAPI); +RUNNER_TEST_GROUP_INIT(T305_CKMC_QUICK_CREATE_PAIR_CAPI); -RUNNER_TEST(T2051_CAPI_init) +RUNNER_TEST(T3051_CAPI_init) { int temp; @@ -833,7 +833,7 @@ RUNNER_TEST(T2051_CAPI_init) "Error=" << temp); } -RUNNER_CHILD_TEST(T2052_CAPI_create_rsa_key) +RUNNER_CHILD_TEST(T3052_CAPI_create_rsa_key) { int temp; @@ -892,7 +892,7 @@ RUNNER_CHILD_TEST(T2052_CAPI_create_rsa_key) "Error=" << temp << ", ret=" << temp); } -RUNNER_CHILD_TEST(T2053_CAPI_create_dsa_key) +RUNNER_CHILD_TEST(T3053_CAPI_create_dsa_key) { int temp; size_t size = 1024; @@ -919,7 +919,7 @@ RUNNER_CHILD_TEST(T2053_CAPI_create_dsa_key) ckmc_key_s *privateKey = 0; RUNNER_ASSERT_MSG( - CKMC_ERROR_NONE == (temp = ckmc_get_key(private_key_alias, policy_private_key.password, &privateKey)), + CKMC_ERROR_NONE == (temp = ckmc_get_key(private_key_alias, policy_private_key.password,&privateKey)), "Error=" << temp); RUNNER_ASSERT_MSG( privateKey != NULL && privateKey->key_size > 0 && privateKey->raw_key != NULL, @@ -948,7 +948,7 @@ RUNNER_CHILD_TEST(T2053_CAPI_create_dsa_key) } -RUNNER_TEST(T2053_CAPI_deinit) +RUNNER_TEST(T3054_CAPI_deinit) { int temp; @@ -961,9 +961,9 @@ RUNNER_TEST(T2053_CAPI_deinit) } -RUNNER_TEST_GROUP_INIT(T206_CKMC_CAPI_CreateKeyPair); +RUNNER_TEST_GROUP_INIT(T306_CKMC_CAPI_CreateKeyPair); -RUNNER_TEST(T2061_CAPI_init) +RUNNER_TEST(T3061_CAPI_init) { int temp; RUNNER_ASSERT_MSG( @@ -980,7 +980,7 @@ RUNNER_TEST(T2061_CAPI_init) "Error=" << temp); } -RUNNER_TEST(T2062_CAPI_CreateKeyPairRSA) +RUNNER_TEST(T3062_CAPI_CreateKeyPairRSA) { int temp; @@ -1006,7 +1006,7 @@ RUNNER_TEST(T2062_CAPI_CreateKeyPairRSA) "Error=" << temp << ", ret=" << temp); } -RUNNER_TEST(T2063_CAPI_CreateKeyPairDSA) +RUNNER_TEST(T3063_CAPI_CreateKeyPairDSA) { int temp; @@ -1027,7 +1027,7 @@ RUNNER_TEST(T2063_CAPI_CreateKeyPairDSA) "Error=" << temp); } -RUNNER_TEST(T2064_CAPI_CreateKeyPairECDSA) +RUNNER_TEST(T3064_CAPI_CreateKeyPairECDSA) { int temp; @@ -1048,7 +1048,7 @@ RUNNER_TEST(T2064_CAPI_CreateKeyPairECDSA) "Error=" << temp); } -RUNNER_TEST(T2065_CAPI_deinit) +RUNNER_TEST(T3065_CAPI_deinit) { int temp; @@ -1065,9 +1065,9 @@ RUNNER_TEST(T2065_CAPI_deinit) -RUNNER_TEST_GROUP_INIT(T207_CKMC_CAPI_QUICK_SET_GET_TESTS); +RUNNER_TEST_GROUP_INIT(T307_CKMC_CAPI_QUICK_SET_GET_TESTS); -RUNNER_TEST(T2071_CAPI_init) +RUNNER_TEST(T3071_CAPI_init) { int temp; RUNNER_ASSERT_MSG( @@ -1075,7 +1075,7 @@ RUNNER_TEST(T2071_CAPI_init) "Error=" << temp); } -RUNNER_TEST(T2072_CAPI_get_chain) +RUNNER_TEST(T3072_CAPI_get_chain) { std::string ee = "-----BEGIN CERTIFICATE-----\n" @@ -1192,7 +1192,7 @@ RUNNER_TEST(T2072_CAPI_get_chain) "Wrong size of certificate chain."); } -RUNNER_TEST(T2073_CAPI_deinit) +RUNNER_TEST(T3073_CAPI_deinit) { int temp; @@ -1205,9 +1205,9 @@ RUNNER_TEST(T2073_CAPI_deinit) } -RUNNER_TEST_GROUP_INIT(T208_CAPI_CREATE_AND_VERIFY_SIGNATURE); +RUNNER_TEST_GROUP_INIT(T308_CAPI_CREATE_AND_VERIFY_SIGNATURE); -RUNNER_TEST(T2081_CAPI__init) +RUNNER_TEST(T3081_CAPI__init) { int temp; @@ -1228,7 +1228,7 @@ RUNNER_TEST(T2081_CAPI__init) "Error=" << temp); } -RUNNER_TEST(T2082_CAPI__rsa_key_create_verify) +RUNNER_TEST(T3082_CAPI__rsa_key_create_verify) { int temp; @@ -1334,7 +1334,7 @@ RUNNER_TEST(T2082_CAPI__rsa_key_create_verify) "Error=" << temp); } -RUNNER_TEST(T2083_CAPI__rsa_key_create_verify_negative) +RUNNER_TEST(T3083_CAPI__rsa_key_create_verify_negative) { int temp; @@ -1381,7 +1381,7 @@ RUNNER_TEST(T2083_CAPI__rsa_key_create_verify_negative) "Error=" << temp); } -RUNNER_TEST(T2084_CAPI__ec_key_create_verify) +RUNNER_TEST(T3084_CAPI__ec_key_create_verify) { int temp; @@ -1467,7 +1467,7 @@ RUNNER_TEST(T2084_CAPI__ec_key_create_verify) "Error=" << temp); } -RUNNER_TEST(T2085_CAPI__rsa_cert_create_verify_signature) +RUNNER_TEST(T3085_CAPI__rsa_cert_create_verify_signature) { int temp; @@ -1578,7 +1578,7 @@ RUNNER_TEST(T2085_CAPI__rsa_cert_create_verify_signature) "Error=" << temp); } -RUNNER_TEST(T2086_CAPI__dsa_ext_key_create_verify_with_negative) +RUNNER_TEST(T3086_CAPI__dsa_ext_key_create_verify_with_negative) { int temp; @@ -1683,7 +1683,7 @@ RUNNER_TEST(T2086_CAPI__dsa_ext_key_create_verify_with_negative) ckmc_buffer_free(signature); } -RUNNER_TEST(T2087_CAPI__dsa_int_key_create_verify_with_negative) +RUNNER_TEST(T3087_CAPI__dsa_int_key_create_verify_with_negative) { int temp; @@ -1755,13 +1755,12 @@ RUNNER_TEST(T2087_CAPI__dsa_int_key_create_verify_with_negative) pad_algo)), "Error=" << temp); - ckmc_key_free(prikey); ckmc_key_free(pubkey); ckmc_buffer_free(signature); } -RUNNER_TEST(T2088_CAPI__ecdsa_cert_create_verify_signature) +RUNNER_TEST(T3088_CAPI__ecdsa_cert_create_verify_signature) { int temp; @@ -1865,7 +1864,7 @@ RUNNER_TEST(T2088_CAPI__ecdsa_cert_create_verify_signature) "Error=" << temp); } -RUNNER_TEST(T2089_CAPI__deinit) +RUNNER_TEST(T3089_CAPI__deinit) { int temp; @@ -1904,9 +1903,9 @@ void _assertKey(ckmc_key_s *key, unsigned char *raw_key, unsigned int key_size, } } -RUNNER_TEST_GROUP_INIT(T209_CKMC_CAPI_TYPES); +RUNNER_TEST_GROUP_INIT(T309_CKMC_CAPI_TYPES); -RUNNER_TEST(T2091_CAPI_TYPE_init) +RUNNER_TEST(T3091_CAPI_TYPE_init) { int temp; RUNNER_ASSERT_MSG( @@ -1923,7 +1922,7 @@ RUNNER_TEST(T2091_CAPI_TYPE_init) "Error=" << temp); } -RUNNER_TEST(T2092_CAPI_TYPE_KEY) +RUNNER_TEST(T3092_CAPI_TYPE_KEY) { std::string keyPem = "-----BEGIN PUBLIC KEY-----\n" "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2b1bXDa+S8/MGWnMkru4\n" @@ -1952,7 +1951,7 @@ RUNNER_TEST(T2092_CAPI_TYPE_KEY) ckmc_key_free(key2); } -RUNNER_TEST(T2093_CAPI_TYPE_BUFFER) +RUNNER_TEST(T3093_CAPI_TYPE_BUFFER) { std::string keyPem = "-----BEGIN PUBLIC KEY-----\n" "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2b1bXDa+S8/MGWnMkru4\n" @@ -1985,7 +1984,7 @@ RUNNER_TEST(T2093_CAPI_TYPE_BUFFER) ckmc_buffer_free(buff); } -RUNNER_TEST(T2094_CAPI_TYPE_CERT) +RUNNER_TEST(T3094_CAPI_TYPE_CERT) { std::string certPem = "-----BEGIN CERTIFICATE-----\n" @@ -2041,7 +2040,7 @@ RUNNER_TEST(T2094_CAPI_TYPE_CERT) } -RUNNER_TEST(T2095_CAPI_TYPE_load_cert_file) +RUNNER_TEST(T3095_CAPI_TYPE_load_cert_file) { int ret; @@ -2110,7 +2109,7 @@ RUNNER_TEST(T2095_CAPI_TYPE_load_cert_file) remove(file_name); } -RUNNER_TEST(T2096_CAPI_TYPE_load_p12_file) { +RUNNER_TEST(T3096_CAPI_TYPE_load_p12_file) { std::string p12Base64 = "MIINaQIBAzCCDS8GCSqGSIb3DQEHAaCCDSAEgg0cMIINGDCCChcGCSqGSIb3DQEH\n" "BqCCCggwggoEAgEAMIIJ/QYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYwDgQIvO01\n" @@ -2256,7 +2255,7 @@ RUNNER_TEST(T2096_CAPI_TYPE_load_p12_file) { } -RUNNER_TEST(T2098_CAPI_TYPE_deinit) +RUNNER_TEST(T3098_CAPI_TYPE_deinit) { int temp; RUNNER_ASSERT_MSG( @@ -2274,9 +2273,9 @@ RUNNER_TEST(T2098_CAPI_TYPE_deinit) } -RUNNER_TEST_GROUP_INIT(T2000_CAPI_LOCKTYPE_TESTS); +RUNNER_TEST_GROUP_INIT(T3000_CAPI_LOCKTYPE_TESTS); -RUNNER_CHILD_TEST(T2101_CAPI_init_lock_key) +RUNNER_CHILD_TEST(T3101_CAPI_init_lock_key) { int tmp; SecurityServer::AccessProvider ap("my-label"); @@ -2292,7 +2291,7 @@ RUNNER_CHILD_TEST(T2101_CAPI_init_lock_key) "Error=" << CKM::ErrorToString(tmp)); } -RUNNER_CHILD_TEST(T2102_CAPI_unlock_default_passwd) +RUNNER_CHILD_TEST(T3102_CAPI_unlock_default_passwd) { SecurityServer::AccessProvider ap("my-label"); ap.allowAPI("key-manager::api-storage", "rw"); @@ -2341,7 +2340,7 @@ RUNNER_CHILD_TEST(T2102_CAPI_unlock_default_passwd) "Error=" << temp); } -RUNNER_CHILD_TEST(T2103_CAPI_init_change_user_password) +RUNNER_CHILD_TEST(T3103_CAPI_init_change_user_password) { int tmp; SecurityServer::AccessProvider ap("my-label"); @@ -2357,7 +2356,7 @@ RUNNER_CHILD_TEST(T2103_CAPI_init_change_user_password) "Error=" << CKM::ErrorToString(tmp)); } -RUNNER_CHILD_TEST(T2104_CAPI_unlock_default_passwd_negative) +RUNNER_CHILD_TEST(T3104_CAPI_unlock_default_passwd_negative) { SecurityServer::AccessProvider ap("my-label"); ap.allowAPI("key-manager::api-storage", "rw"); @@ -2403,16 +2402,16 @@ RUNNER_CHILD_TEST(T2104_CAPI_unlock_default_passwd_negative) "Error=" << temp); } -RUNNER_CHILD_TEST(T2109_CAPI_deinit) +RUNNER_CHILD_TEST(T3109_CAPI_deinit) { SecurityServer::AccessProvider ap("my-label"); ap.allowAPI("key-manager::api-control", "rw"); ap.applyAndSwithToUser(USER_APP, GROUP_APP); } -RUNNER_TEST_GROUP_INIT(T220_CAPI_EMPTY_DATABASE); +RUNNER_TEST_GROUP_INIT(T320_CAPI_EMPTY_DATABASE); -RUNNER_TEST(T2201_CAPI_unlock_database) +RUNNER_TEST(T3201_CAPI_unlock_database) { int temp; RUNNER_ASSERT_MSG( CKMC_ERROR_NONE == (temp = ckmc_lock_user_key(0)), @@ -2423,7 +2422,7 @@ RUNNER_TEST(T2201_CAPI_unlock_database) "Error=" << temp); } -RUNNER_CHILD_TEST(T2202_CAPI_get_data_from_empty_database) +RUNNER_CHILD_TEST(T3202_CAPI_get_data_from_empty_database) { int temp; char alias[10] = "mykey"; @@ -2437,14 +2436,14 @@ RUNNER_CHILD_TEST(T2202_CAPI_get_data_from_empty_database) RUNNER_ASSERT_MSG(NULL == test_key, "Key value should not be changed"); } -RUNNER_CHILD_TEST(T2203_CAPI_lock_database) +RUNNER_CHILD_TEST(T3203_CAPI_lock_database) { int temp; RUNNER_ASSERT_MSG( CKMC_ERROR_NONE == (temp = ckmc_lock_user_key(0)), "Error=" << temp); } -RUNNER_CHILD_TEST(T2204_CAPI_get_data_from_locked_database) +RUNNER_CHILD_TEST(T3204_CAPI_get_data_from_locked_database) { int temp; char alias[10] = "mykey"; @@ -2458,7 +2457,7 @@ RUNNER_CHILD_TEST(T2204_CAPI_get_data_from_locked_database) RUNNER_ASSERT_MSG(NULL == test_key, "Key value should not be changed"); } -RUNNER_TEST(T2204_deinit) +RUNNER_TEST(T3204_deinit) { int temp; RUNNER_ASSERT_MSG( CKMC_ERROR_NONE == (temp = ckmc_remove_user_data(0)), -- 2.7.4