From 86e8c8f9f01f7c920e21b3a262cb747c479b8cea Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Mon, 27 Mar 2017 10:30:32 +0200 Subject: [PATCH] Fix account_creator tests server --- tester/account_creator_tester.c | 716 +++++++++++++++++++----------- tester/rcfiles/account_creator_rc | 5 +- 2 files changed, 456 insertions(+), 265 deletions(-) diff --git a/tester/account_creator_tester.c b/tester/account_creator_tester.c index 817d4a0cf..4e1895ee8 100644 --- a/tester/account_creator_tester.c +++ b/tester/account_creator_tester.c @@ -17,17 +17,43 @@ */ #include "liblinphone_tester.h" +#include "private.h" static const char XMLRPC_URL[] = "https://sip2.linphone.org:446/xmlrpc.php"; static const int TIMEOUT_REQUEST = 10000; +/////////// INIT ////////////// + +static void init_account_creator_request_cbs(LinphoneCore *lc) { + LinphoneAccountCreatorRequestCbs *cbs = linphone_account_creator_requests_cbs_new(); + linphone_account_creator_requests_cbs_set_constructor_cb(cbs, NULL); + linphone_account_creator_requests_cbs_set_destructor_cb(cbs, NULL); + linphone_account_creator_requests_cbs_set_create_account_cb(cbs, linphone_account_creator_create_account_custom); + linphone_account_creator_requests_cbs_set_is_account_exist_cb(cbs, linphone_account_creator_is_account_exist_custom); + linphone_account_creator_requests_cbs_set_activate_account_cb(cbs, linphone_account_creator_activate_account_custom); + linphone_account_creator_requests_cbs_set_is_account_activated_cb(cbs, linphone_account_creator_is_account_activated_custom); + linphone_account_creator_requests_cbs_set_link_account_cb(cbs, linphone_account_creator_link_phone_number_with_account_custom); + linphone_account_creator_requests_cbs_set_activate_alias_cb(cbs, linphone_account_creator_activate_phone_number_link_custom); + linphone_account_creator_requests_cbs_set_is_alias_used_cb(cbs, linphone_account_creator_is_phone_number_used_custom); + linphone_account_creator_requests_cbs_set_is_account_linked_cb(cbs, linphone_account_creator_is_account_linked_custom); + linphone_account_creator_requests_cbs_set_recover_account_cb(cbs, linphone_account_creator_recover_phone_account_custom); + linphone_account_creator_requests_cbs_set_update_account_cb(cbs, linphone_account_creator_update_password_custom); + linphone_core_set_account_creator_request_engine_cbs(lc, cbs); +} + +static LinphoneAccountCreator * _linphone_account_creator_new(LinphoneCore *lc, const char * url) { + init_account_creator_request_cbs(lc); + LinphoneAccountCreator *creator = linphone_account_creator_new(lc, url); + return creator; +} + /////////// LOCAL TESTS /////////// ////// USERNAME ////// static void local_username_too_short(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, ""); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, ""); BC_ASSERT_EQUAL( linphone_account_creator_set_username(creator, ""), @@ -41,7 +67,7 @@ static void local_username_too_short(void) { static void local_username_too_long(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, ""); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, ""); BC_ASSERT_EQUAL( linphone_account_creator_set_username(creator, "usernametoolongforyou"), @@ -55,7 +81,7 @@ static void local_username_too_long(void) { static void local_username_invalid_character(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, ""); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, ""); BC_ASSERT_EQUAL( linphone_account_creator_set_username(creator, "use!"), @@ -69,10 +95,10 @@ static void local_username_invalid_character(void) { static void local_username_ok(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, ""); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, ""); BC_ASSERT_EQUAL( - linphone_account_creator_set_username(creator, "user"), + linphone_account_creator_set_username(creator, "XXXTESTuser_1"), LinphoneUsernameOk, LinphoneUsernameCheck, "%i"); @@ -85,7 +111,7 @@ static void local_username_ok(void) { static void local_password_too_short(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, ""); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, ""); BC_ASSERT_EQUAL( linphone_account_creator_set_password(creator, ""), @@ -99,7 +125,7 @@ static void local_password_too_short(void) { static void local_password_too_long(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, ""); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, ""); BC_ASSERT_EQUAL( linphone_account_creator_set_password(creator, "passwordtoolong"), @@ -113,7 +139,7 @@ static void local_password_too_long(void) { static void local_password_ok(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, ""); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, ""); BC_ASSERT_EQUAL( linphone_account_creator_set_password(creator, "pass"), @@ -129,7 +155,7 @@ static void local_password_ok(void) { static void local_email_malformed(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, ""); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, ""); BC_ASSERT_EQUAL( linphone_account_creator_set_email(creator, "test.linphone.org"), @@ -167,7 +193,7 @@ static void local_email_malformed(void) { static void local_email_invalid_character(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, ""); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, ""); BC_ASSERT_EQUAL( linphone_account_creator_set_email(creator, "test@linphone.org$"), @@ -181,7 +207,7 @@ static void local_email_invalid_character(void) { static void local_email_ok(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, ""); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, ""); BC_ASSERT_EQUAL( linphone_account_creator_set_email(creator, "test@linphone.org"), @@ -209,7 +235,7 @@ static void local_email_ok(void) { static void local_phone_number_too_short(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, ""); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, ""); BC_ASSERT_EQUAL( linphone_account_creator_set_phone_number(creator, "0123", "33")&LinphonePhoneNumberTooShort, @@ -223,7 +249,7 @@ static void local_phone_number_too_short(void) { static void local_phone_number_too_long(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, ""); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, ""); BC_ASSERT_EQUAL( linphone_account_creator_set_phone_number(creator, "01234567891011", "33")&LinphonePhoneNumberTooLong, @@ -237,7 +263,7 @@ static void local_phone_number_too_long(void) { static void local_phone_number_invalid(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, ""); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, ""); BC_ASSERT_EQUAL( linphone_account_creator_set_phone_number(creator, NULL, "33")&LinphonePhoneNumberInvalid, @@ -251,7 +277,7 @@ static void local_phone_number_invalid(void) { static void local_country_code_invalid(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, ""); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, ""); BC_ASSERT_EQUAL( linphone_account_creator_set_phone_number(creator, "0123", "")&LinphonePhoneNumberCountryCodeInvalid, @@ -265,10 +291,10 @@ static void local_country_code_invalid(void) { static void local_phone_number_ok(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, ""); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, ""); BC_ASSERT_EQUAL( - linphone_account_creator_set_phone_number(creator, "0123456789", "33")&LinphonePhoneNumberOk, + linphone_account_creator_set_phone_number(creator, "000555455", "1")&LinphonePhoneNumberOk, LinphonePhoneNumberOk, LinphonePhoneNumberCheck, "%i"); @@ -294,11 +320,11 @@ static void account_creator_set_cb_done(LinphoneAccountCreatorResponseCbs *cbs) BC_ASSERT_TRUE(stats->cb_done); } -/*static void account_creator_reset_cb_done(LinphoneAccountCreatorCbs *cbs) { - LinphoneAccountCreatorStats *stats = (LinphoneAccountCreatorStats*) linphone_account_creator_cbs_get_user_data(cbs); +static void account_creator_reset_cb_done(LinphoneAccountCreatorResponseCbs *cbs) { + LinphoneAccountCreatorStats *stats = (LinphoneAccountCreatorStats*) linphone_account_creator_responses_cbs_get_user_data(cbs); stats->cb_done = 0; BC_ASSERT_FALSE(stats->cb_done); -}*/ +} static void account_creator_cb(LinphoneAccountCreator *creator, LinphoneRequestStatus status, const char* resp) { LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); @@ -312,10 +338,170 @@ static void account_creator_cb(LinphoneAccountCreator *creator, LinphoneRequestS account_creator_set_cb_done(cbs); } +static void _get_activation_code_cb(LinphoneXmlRpcRequest *request) { + LinphoneAccountCreator *creator = (LinphoneAccountCreator *)linphone_xml_rpc_request_get_user_data(request); + LinphoneRequestStatus status = LinphoneRequestFailed; + const char* resp = linphone_xml_rpc_request_get_string_response(request); + if (linphone_xml_rpc_request_get_status(request) == LinphoneXmlRpcStatusOk) { + if (strstr(resp, "ERROR_") == resp) { + status = LinphoneRequestFailed; + } else { + status = LinphoneRequestOk; + set_string(&creator->activation_code, resp, FALSE); + } + } + account_creator_cb(creator, status, resp); +} + +LinphoneRequestStatus get_activation_code_account_cb(LinphoneAccountCreator *creator) { + LinphoneXmlRpcRequest *request; + if ((!creator->username && !creator->phone_number) || !creator->password) { + return LinphoneRequestMissingArguments; + } + + request = linphone_xml_rpc_request_new_with_args("get_confirmation_key", LinphoneXmlRpcArgString, + LinphoneXmlRpcArgString, creator->username ? creator->username : creator->phone_number, + LinphoneXmlRpcArgString, creator->password, + LinphoneXmlRpcArgString, linphone_proxy_config_get_domain(creator->proxy_cfg), + LinphoneXmlRpcArgNone); + + linphone_xml_rpc_request_set_user_data(request, creator); + linphone_xml_rpc_request_cbs_set_response(linphone_xml_rpc_request_get_callbacks(request), _get_activation_code_cb); + linphone_xml_rpc_session_send_request(creator->xmlrpc_session, request); + linphone_xml_rpc_request_unref(request); + + return LinphoneRequestOk; +} + +static void _delete_account_cb(LinphoneXmlRpcRequest *request) { + LinphoneAccountCreator *creator = (LinphoneAccountCreator *)linphone_xml_rpc_request_get_user_data(request); + LinphoneRequestStatus status = LinphoneRequestFailed; + const char* resp = linphone_xml_rpc_request_get_string_response(request); + if (linphone_xml_rpc_request_get_status(request) == LinphoneXmlRpcStatusOk) { + // We want to delete account from table but it's not an error if it doesn't exist or password doesn't match + if (strstr(resp, "ERROR_ACCOUNT_DOESNT_EXIST") == resp + || strstr(resp, "ERROR_PASSWORD_DOESNT_MATCH") == resp) { + status = LinphoneRequestOk; + } else if (strstr(resp, "ERROR_") == resp) { + status = LinphoneRequestFailed; + } else { + status = LinphoneRequestOk; + } + } + account_creator_cb(creator, status, resp); +} + +LinphoneRequestStatus delete_account_cb(LinphoneAccountCreator *creator) { + LinphoneXmlRpcRequest *request; + if ((!creator->username && !creator->phone_number) || !creator->password) { + return LinphoneRequestMissingArguments; + } + + request = linphone_xml_rpc_request_new_with_args("delete_account", LinphoneXmlRpcArgString, + LinphoneXmlRpcArgString, creator->username ? creator->username : creator->phone_number, + LinphoneXmlRpcArgString, creator->password, + LinphoneXmlRpcArgString, linphone_proxy_config_get_domain(creator->proxy_cfg), + LinphoneXmlRpcArgNone); + + linphone_xml_rpc_request_set_user_data(request, creator); + linphone_xml_rpc_request_cbs_set_response(linphone_xml_rpc_request_get_callbacks(request), _delete_account_cb); + linphone_xml_rpc_session_send_request(creator->xmlrpc_session, request); + linphone_xml_rpc_request_unref(request); + + return LinphoneRequestOk; +} + +static void get_activation_code(LinphoneAccountCreator *creator, int *cb_done) { + linphone_account_creator_requests_cbs_set_user_data( + linphone_account_creator_get_requests_cbs(creator), + (void*)LinphoneRequestOk); + + BC_ASSERT_EQUAL( + get_activation_code_account_cb(creator), + LinphoneRequestOk, + LinphoneRequestStatus, + "%i"); + + wait_for_until(creator->core, NULL, cb_done, 1, TIMEOUT_REQUEST); +} + +static void server_delete_account_test(void) { + LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); + LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); + + linphone_account_creator_responses_cbs_set_user_data(cbs, stats); + linphone_account_creator_requests_cbs_set_user_data( + linphone_account_creator_get_requests_cbs(creator), + (void*)LinphoneRequestOk); + linphone_account_creator_set_email(creator, "user_2@linphone.org"); + linphone_account_creator_set_password(creator, "password"); + linphone_account_creator_set_phone_number(creator, "000555455","1"); + + BC_ASSERT_EQUAL( + delete_account_cb(creator), + LinphoneRequestOk, + LinphoneRequestStatus, + "%i"); + + wait_for_until(marie->lc, NULL, &stats->cb_done, 1, TIMEOUT_REQUEST); + + linphone_account_creator_unref(creator); + + // First attempt with the first password + creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); + cbs = linphone_account_creator_get_responses_cbs(creator); + + linphone_account_creator_responses_cbs_set_user_data(cbs, stats); + account_creator_reset_cb_done(cbs); + linphone_account_creator_requests_cbs_set_user_data( + linphone_account_creator_get_requests_cbs(creator), + (void*)LinphoneRequestOk); + linphone_account_creator_set_username(creator, "XXXTESTuser_1"); + linphone_account_creator_set_email(creator, "user_1@linphone.org"); + linphone_account_creator_set_password(creator, "password"); + + BC_ASSERT_EQUAL( + delete_account_cb(creator), + LinphoneRequestOk, + LinphoneRequestStatus, + "%i"); + + wait_for_until(marie->lc, NULL, &stats->cb_done, 1, TIMEOUT_REQUEST); + + linphone_account_creator_unref(creator); + + // Second attempt with the second password + creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); + cbs = linphone_account_creator_get_responses_cbs(creator); + + linphone_account_creator_responses_cbs_set_user_data(cbs, stats); + account_creator_reset_cb_done(cbs); + linphone_account_creator_requests_cbs_set_user_data( + linphone_account_creator_get_requests_cbs(creator), + (void*)LinphoneRequestOk); + linphone_account_creator_set_username(creator, "XXXTESTuser_1"); + linphone_account_creator_set_email(creator, "user_1@linphone.org"); + linphone_account_creator_set_password(creator, "newpassword"); + + BC_ASSERT_EQUAL( + delete_account_cb(creator), + LinphoneRequestOk, + LinphoneRequestStatus, + "%i"); + + wait_for_until(marie->lc, NULL, &stats->cb_done, 1, TIMEOUT_REQUEST); + + ms_free(stats); + linphone_account_creator_unref(creator); + linphone_core_manager_destroy(marie); +} + /****************** Start Is Account Exist ************************/ static void server_account_doesnt_exist(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -341,15 +527,15 @@ static void server_account_doesnt_exist(void) { static void server_account_exist(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); linphone_account_creator_responses_cbs_set_user_data(cbs, stats); linphone_account_creator_requests_cbs_set_user_data( linphone_account_creator_get_requests_cbs(creator), - (void*)LinphoneRequestAccountNotExist); - linphone_account_creator_set_username(creator, "user_exist"); + (void*)LinphoneRequestAccountExist); + linphone_account_creator_set_username(creator, "XXXTESTuser_1"); linphone_account_creator_responses_cbs_set_is_account_exist_cb(cbs, account_creator_cb); BC_ASSERT_EQUAL( @@ -367,7 +553,7 @@ static void server_account_exist(void) { static void server_is_account_exist_cb_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); linphone_account_creator_set_username(creator, "user_exist"); @@ -383,7 +569,7 @@ static void server_is_account_exist_cb_missing(void) { static void server_is_account_exist_arg_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -406,9 +592,9 @@ static void server_is_account_exist_arg_missing(void) { /****************** End Is Account Exist ************************/ /****************** Start Create Account ************************/ -static void server_account_created_with_email(void) { //TODO synchro server +static void server_account_created_with_email(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -416,7 +602,7 @@ static void server_account_created_with_email(void) { //TODO synchro server linphone_account_creator_requests_cbs_set_user_data( linphone_account_creator_get_requests_cbs(creator), (void*)LinphoneRequestAccountCreated); - linphone_account_creator_set_username(creator, "user_1"); + linphone_account_creator_set_username(creator, "XXXTESTuser_1"); linphone_account_creator_set_email(creator, "user_1@linphone.org"); linphone_account_creator_set_password(creator, "password"); linphone_account_creator_responses_cbs_set_create_account_cb(cbs, account_creator_cb); @@ -436,7 +622,7 @@ static void server_account_created_with_email(void) { //TODO synchro server static void server_create_account_already_create_with_email(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -444,8 +630,8 @@ static void server_create_account_already_create_with_email(void) { linphone_account_creator_requests_cbs_set_user_data( linphone_account_creator_get_requests_cbs(creator), (void*)LinphoneRequestAccountExist); - linphone_account_creator_set_username(creator, "user_exist"); - linphone_account_creator_set_email(creator, "test@bc.com"); + linphone_account_creator_set_username(creator, "XXXTESTuser_1"); + linphone_account_creator_set_email(creator, "user_1@linphone.org"); linphone_account_creator_set_password(creator, "password"); linphone_account_creator_responses_cbs_set_create_account_cb(cbs, account_creator_cb); @@ -462,9 +648,9 @@ static void server_create_account_already_create_with_email(void) { linphone_core_manager_destroy(marie); } -static void server_account_created_with_phone_number(void) { //TODO synchro server +static void server_account_created_with_phone_number(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -472,9 +658,9 @@ static void server_account_created_with_phone_number(void) { //TODO synchro serv linphone_account_creator_requests_cbs_set_user_data( linphone_account_creator_get_requests_cbs(creator), (void*)LinphoneRequestAccountCreated); - linphone_account_creator_set_username(creator, "user_1"); - linphone_account_creator_set_email(creator, "user_1@linphone.org"); + linphone_account_creator_set_email(creator, "user_2@linphone.org"); linphone_account_creator_set_password(creator, "password"); + linphone_account_creator_set_phone_number(creator, "000555455","1"); linphone_account_creator_responses_cbs_set_create_account_cb(cbs, account_creator_cb); BC_ASSERT_EQUAL( @@ -492,7 +678,7 @@ static void server_account_created_with_phone_number(void) { //TODO synchro serv static void server_create_account_already_create_as_account_with_phone_number(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -500,9 +686,9 @@ static void server_create_account_already_create_as_account_with_phone_number(vo linphone_account_creator_requests_cbs_set_user_data( linphone_account_creator_get_requests_cbs(creator), (void*)LinphoneRequestAccountExist); - linphone_account_creator_set_username(creator, "user_exist"); - linphone_account_creator_set_email(creator, "test@bc.com"); - linphone_account_creator_set_phone_number(creator, "01234567","33"); + linphone_account_creator_set_email(creator, "user_2@linphone.org"); + linphone_account_creator_set_password(creator, "password"); + linphone_account_creator_set_phone_number(creator, "000555455","1"); linphone_account_creator_responses_cbs_set_create_account_cb(cbs, account_creator_cb); BC_ASSERT_EQUAL( @@ -520,7 +706,7 @@ static void server_create_account_already_create_as_account_with_phone_number(vo static void server_create_account_already_create_as_alias_with_phone_number(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -528,9 +714,10 @@ static void server_create_account_already_create_as_alias_with_phone_number(void linphone_account_creator_requests_cbs_set_user_data( linphone_account_creator_get_requests_cbs(creator), (void*)LinphoneRequestAccountExistWithAlias); - linphone_account_creator_set_username(creator, "user_exist"); - linphone_account_creator_set_email(creator, "test@bc.com"); - linphone_account_creator_set_phone_number(creator, "01234567","33"); + linphone_account_creator_set_username(creator, "XXXTESTuser_3"); + linphone_account_creator_set_email(creator, "user_2@linphone.org"); + linphone_account_creator_set_password(creator, "password"); + linphone_account_creator_set_phone_number(creator, "000555456","1"); linphone_account_creator_responses_cbs_set_create_account_cb(cbs, account_creator_cb); BC_ASSERT_EQUAL( @@ -548,7 +735,7 @@ static void server_create_account_already_create_as_alias_with_phone_number(void static void server_create_account_cb_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); linphone_account_creator_set_username(creator, "user_exist"); linphone_account_creator_set_email(creator, "user_1@linphone.org"); @@ -566,7 +753,7 @@ static void server_create_account_cb_missing(void) { static void server_create_account_with_email_arg_username_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -592,7 +779,7 @@ static void server_create_account_with_email_arg_username_missing(void) { static void server_create_account_with_email_arg_email_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -618,7 +805,7 @@ static void server_create_account_with_email_arg_email_missing(void) { static void server_create_account_with_email_arg_password_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -644,7 +831,7 @@ static void server_create_account_with_email_arg_password_missing(void) { static void server_create_account_with_phone_number_arg_username_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -670,7 +857,7 @@ static void server_create_account_with_phone_number_arg_username_missing(void) { static void server_create_account_with_phone_number_arg_phone_number_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -698,11 +885,11 @@ static void server_create_account_with_phone_number_arg_phone_number_missing(voi /****************** Start Is Account Activated ************************/ static void server_account_not_activated(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); - linphone_account_creator_set_username(creator, "user_exist"); + linphone_account_creator_set_username(creator, "XXXTESTuser_1"); linphone_account_creator_responses_cbs_set_user_data(cbs, stats); linphone_account_creator_requests_cbs_set_user_data( @@ -725,11 +912,11 @@ static void server_account_not_activated(void) { static void server_account_already_activated(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); - linphone_account_creator_set_username(creator, "u_activated"); + linphone_account_creator_set_username(creator, "XXXTESTuser_1"); linphone_account_creator_responses_cbs_set_user_data(cbs, stats); linphone_account_creator_requests_cbs_set_user_data( @@ -752,7 +939,7 @@ static void server_account_already_activated(void) { static void server_is_account_activated_cb_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); linphone_account_creator_set_username(creator, "user_exist"); @@ -768,7 +955,7 @@ static void server_is_account_activated_cb_missing(void) { static void server_is_account_activated_arg_username_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -791,17 +978,19 @@ static void server_is_account_activated_arg_username_missing(void) { /****************** End Is Account Activated ************************/ /****************** Start Activate Account ************************/ -static void server_activate_account_not_activated(void) { //TODO synchro server +static void server_activate_account_not_activated(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); - linphone_account_creator_set_username(creator, "user_1"); - linphone_account_creator_set_activation_code(creator, "58c93c745df56"); - linphone_account_creator_set_email(creator, "user_1@linphone.org"); - linphone_account_creator_responses_cbs_set_user_data(cbs, stats); + linphone_account_creator_set_username(creator, "XXXTESTuser_1"); + linphone_account_creator_set_email(creator, "user_1@linphone.org"); + linphone_account_creator_set_password(creator, "password"); + get_activation_code(creator, &stats->cb_done); + account_creator_reset_cb_done(creator->responses_cbs); + linphone_account_creator_requests_cbs_set_user_data( linphone_account_creator_get_requests_cbs(creator), (void*)LinphoneRequestAccountActivated); @@ -820,17 +1009,19 @@ static void server_activate_account_not_activated(void) { //TODO synchro server linphone_core_manager_destroy(marie); } -static void server_activate_account_already_activated(void) { //TODO synchro server +static void server_activate_account_already_activated(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); - linphone_account_creator_set_username(creator, "u_activated"); - linphone_account_creator_set_activation_code(creator, "1234"); - linphone_account_creator_set_email(creator, "test2@bc.com"); - linphone_account_creator_responses_cbs_set_user_data(cbs, stats); + linphone_account_creator_set_username(creator, "XXXTESTuser_1"); + linphone_account_creator_set_email(creator, "user_1@linphone.org"); + linphone_account_creator_set_password(creator, "password"); + get_activation_code(creator, &stats->cb_done); + account_creator_reset_cb_done(creator->responses_cbs); + linphone_account_creator_requests_cbs_set_user_data( linphone_account_creator_get_requests_cbs(creator), (void*)LinphoneRequestAccountAlreadyActivated); @@ -849,14 +1040,14 @@ static void server_activate_account_already_activated(void) { //TODO synchro ser linphone_core_manager_destroy(marie); } -static void server_activate_non_existent_account(void) { //TODO synchro server +static void server_activate_non_existent_account(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); linphone_account_creator_set_username(creator, "unknown_user"); - linphone_account_creator_set_activation_code(creator, "58c93c745df56"); + linphone_account_creator_set_activation_code(creator, "58c9"); linphone_account_creator_set_email(creator, "user_1@linphone.org"); linphone_account_creator_responses_cbs_set_user_data(cbs, stats); @@ -880,7 +1071,7 @@ static void server_activate_non_existent_account(void) { //TODO synchro server static void server_activate_account_cb_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); linphone_account_creator_set_username(creator, "user_exist"); @@ -896,7 +1087,7 @@ static void server_activate_account_cb_missing(void) { static void server_activate_account_with_email_activated_arg_username_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -922,7 +1113,7 @@ static void server_activate_account_with_email_activated_arg_username_missing(vo static void server_activate_account_with_email_activated_arg_activation_code_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -948,7 +1139,7 @@ static void server_activate_account_with_email_activated_arg_activation_code_mis static void server_activate_account_with_phone_number_activated_arg_username_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -974,7 +1165,7 @@ static void server_activate_account_with_phone_number_activated_arg_username_mis static void server_activate_account_with_phone_number_activated_arg_activation_code_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -1000,19 +1191,19 @@ static void server_activate_account_with_phone_number_activated_arg_activation_c /****************** End Activate Account ************************/ /****************** Start Link Account ************************/ -static void server_link_account_with_phone_number(void) { //TODO synchro server + phone number +static void server_link_account_with_phone_number(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); - linphone_account_creator_set_username(creator, "user_exist"); - linphone_account_creator_set_phone_number(creator, "012345678", "33"); + linphone_account_creator_set_username(creator, "XXXTESTuser_1"); + linphone_account_creator_set_phone_number(creator, "000555456", "1"); linphone_account_creator_responses_cbs_set_user_data(cbs, stats); linphone_account_creator_requests_cbs_set_user_data( linphone_account_creator_get_requests_cbs(creator), - (void*)LinphoneRequestAccountLinked); + (void*)LinphoneRequestOk); linphone_account_creator_responses_cbs_set_link_account_cb(cbs, account_creator_cb); BC_ASSERT_EQUAL( @@ -1028,9 +1219,9 @@ static void server_link_account_with_phone_number(void) { //TODO synchro server linphone_core_manager_destroy(marie); } -static void server_link_non_existent_account_with_phone_number(void) { //TODO synchro server + phone number +static void server_link_non_existent_account_with_phone_number(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -1058,7 +1249,7 @@ static void server_link_non_existent_account_with_phone_number(void) { //TODO sy static void server_link_account_cb_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); linphone_account_creator_set_username(creator, "user_exist"); linphone_account_creator_set_phone_number(creator, "0123456", "33"); @@ -1075,7 +1266,7 @@ static void server_link_account_cb_missing(void) { static void server_link_account_arg_username_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -1100,7 +1291,7 @@ static void server_link_account_arg_username_missing(void) { static void server_link_account_arg_phone_number_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -1125,13 +1316,13 @@ static void server_link_account_arg_phone_number_missing(void) { /****************** End Link Account ************************/ /****************** Start Activate Alias ************************/ -static void server_activate_phone_number_for_non_existent_account(void) { //TODO synchro server + phone number +static void server_activate_phone_number_for_non_existent_account(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); - linphone_account_creator_set_username(creator, "user_exist"); + linphone_account_creator_set_username(creator, "unknown_user"); linphone_account_creator_set_phone_number(creator, "012345678", "33"); linphone_account_creator_set_activation_code(creator, "12345679"); linphone_account_creator_set_password(creator, "password"); @@ -1139,7 +1330,7 @@ static void server_activate_phone_number_for_non_existent_account(void) { //TODO linphone_account_creator_responses_cbs_set_user_data(cbs, stats); linphone_account_creator_requests_cbs_set_user_data( linphone_account_creator_get_requests_cbs(creator), - (void*)LinphoneRequestAccountNotLinked); + (void*)LinphoneRequestAccountNotActivated); linphone_account_creator_responses_cbs_set_activate_alias_cb(cbs, account_creator_cb); BC_ASSERT_EQUAL( @@ -1155,19 +1346,23 @@ static void server_activate_phone_number_for_non_existent_account(void) { //TODO linphone_core_manager_destroy(marie); } -static void server_activate_phone_number_for_account(void) { //TODO synchro server + phone number +static void server_activate_phone_number_for_account(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); - linphone_account_creator_set_username(creator, "unknown_user"); - linphone_account_creator_set_phone_number(creator, "012345678", "33"); - linphone_account_creator_responses_cbs_set_user_data(cbs, stats); + linphone_account_creator_set_username(creator, "XXXTESTuser_1"); + linphone_account_creator_set_phone_number(creator, "000555456", "1"); + linphone_account_creator_set_password(creator, "password"); + linphone_account_creator_set_email(creator, "user_1@linphone.org"); + get_activation_code(creator, &stats->cb_done); + account_creator_reset_cb_done(creator->responses_cbs); + linphone_account_creator_requests_cbs_set_user_data( linphone_account_creator_get_requests_cbs(creator), - (void*)LinphoneRequestAccountNotLinked); + (void*)LinphoneRequestAccountActivated); linphone_account_creator_responses_cbs_set_activate_alias_cb(cbs, account_creator_cb); BC_ASSERT_EQUAL( @@ -1185,7 +1380,7 @@ static void server_activate_phone_number_for_account(void) { //TODO synchro serv static void server_activate_alias_cb_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); linphone_account_creator_set_username(creator, "user_exist"); linphone_account_creator_set_phone_number(creator, "012345678", "33"); @@ -1204,7 +1399,7 @@ static void server_activate_alias_cb_missing(void) { static void server_activate_alias_arg_username_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -1231,7 +1426,7 @@ static void server_activate_alias_arg_username_missing(void) { static void server_activate_alias_arg_activation_code_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -1258,7 +1453,7 @@ static void server_activate_alias_arg_activation_code_missing(void) { static void server_activate_alias_arg_password_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -1285,7 +1480,7 @@ static void server_activate_alias_arg_password_missing(void) { static void server_activate_alias_arg_phone_number_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -1312,18 +1507,18 @@ static void server_activate_alias_arg_phone_number_missing(void) { /****************** End Activate Alias ************************/ /****************** Start Is Alias Used ************************/ -static void server_phone_number_is_used_as_alias(void) { //TODO synchro server + phone number +static void server_phone_number_is_used_as_alias(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); - linphone_account_creator_set_phone_number(creator, "012345678", "33"); + linphone_account_creator_set_phone_number(creator, "000555456", "1"); linphone_account_creator_responses_cbs_set_user_data(cbs, stats); linphone_account_creator_requests_cbs_set_user_data( linphone_account_creator_get_requests_cbs(creator), - (void*)LinphoneRequestAccountNotLinked); + (void*)LinphoneRequestAliasExist); linphone_account_creator_responses_cbs_set_is_alias_used_cb(cbs, account_creator_cb); BC_ASSERT_EQUAL( @@ -1339,18 +1534,18 @@ static void server_phone_number_is_used_as_alias(void) { //TODO synchro server + linphone_core_manager_destroy(marie); } -static void server_phone_number_is_used_as_account(void) { //TODO synchro server + phone number +static void server_phone_number_is_used_as_account(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); - linphone_account_creator_set_phone_number(creator, "012345678", "33"); + linphone_account_creator_set_phone_number(creator, "000555455", "1"); linphone_account_creator_responses_cbs_set_user_data(cbs, stats); linphone_account_creator_requests_cbs_set_user_data( linphone_account_creator_get_requests_cbs(creator), - (void*)LinphoneRequestAccountNotLinked); + (void*)LinphoneRequestAliasIsAccount); linphone_account_creator_responses_cbs_set_is_alias_used_cb(cbs, account_creator_cb); BC_ASSERT_EQUAL( @@ -1366,9 +1561,9 @@ static void server_phone_number_is_used_as_account(void) { //TODO synchro server linphone_core_manager_destroy(marie); } -static void server_phone_number_not_used(void) { //TODO synchro server + phone number +static void server_phone_number_not_used(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -1377,7 +1572,7 @@ static void server_phone_number_not_used(void) { //TODO synchro server + phone n linphone_account_creator_responses_cbs_set_user_data(cbs, stats); linphone_account_creator_requests_cbs_set_user_data( linphone_account_creator_get_requests_cbs(creator), - (void*)LinphoneRequestAccountNotLinked); + (void*)LinphoneRequestAliasNotExist); linphone_account_creator_responses_cbs_set_is_alias_used_cb(cbs, account_creator_cb); BC_ASSERT_EQUAL( @@ -1395,7 +1590,7 @@ static void server_phone_number_not_used(void) { //TODO synchro server + phone n static void server_is_alias_used_cb_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); linphone_account_creator_set_phone_number(creator, "012345678", "33"); @@ -1411,7 +1606,7 @@ static void server_is_alias_used_cb_missing(void) { static void server_is_alias_used_arg_phone_number_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -1434,18 +1629,18 @@ static void server_is_alias_used_arg_phone_number_missing(void) { /****************** End Is Alias Used ************************/ /****************** Start Is Account Linked ************************/ -static void server_account_link_with_phone_number(void) { //TODO synchro server + phone number +static void server_account_link_with_phone_number(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); - linphone_account_creator_set_username(creator, "user_exist"); + linphone_account_creator_set_username(creator, "XXXTESTuser_1"); linphone_account_creator_responses_cbs_set_user_data(cbs, stats); linphone_account_creator_requests_cbs_set_user_data( linphone_account_creator_get_requests_cbs(creator), - (void*)LinphoneRequestAccountNotLinked); + (void*)LinphoneRequestAccountLinked); linphone_account_creator_responses_cbs_set_is_account_linked_cb(cbs, account_creator_cb); BC_ASSERT_EQUAL( @@ -1461,13 +1656,13 @@ static void server_account_link_with_phone_number(void) { //TODO synchro server linphone_core_manager_destroy(marie); } -static void server_account_not_link_with_phone_number(void) { //TODO synchro server + phone number +static void server_account_not_link_with_phone_number(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); - linphone_account_creator_set_username(creator, "user_exist"); + linphone_account_creator_set_username(creator, "XXXTESTuser_1"); linphone_account_creator_responses_cbs_set_user_data(cbs, stats); linphone_account_creator_requests_cbs_set_user_data( @@ -1490,7 +1685,7 @@ static void server_account_not_link_with_phone_number(void) { //TODO synchro ser static void server_is_account_linked_cb_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); linphone_account_creator_set_username(creator, "user_exist"); @@ -1506,7 +1701,7 @@ static void server_is_account_linked_cb_missing(void) { static void server_is_account_linked_arg_username_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -1529,18 +1724,18 @@ static void server_is_account_linked_arg_username_missing(void) { /****************** End Is Account Linked ************************/ /****************** Start Recover Account ************************/ -static void server_recover_account_with_phone_number_used(void) { //TODO synchro server + phone number +static void server_recover_account_with_phone_number_used(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); - linphone_account_creator_set_phone_number(creator, "012345678", "33"); + linphone_account_creator_set_phone_number(creator, "000555456", "1"); linphone_account_creator_responses_cbs_set_user_data(cbs, stats); linphone_account_creator_requests_cbs_set_user_data( linphone_account_creator_get_requests_cbs(creator), - (void*)LinphoneRequestAccountNotLinked); + (void*)LinphoneRequestOk); linphone_account_creator_responses_cbs_set_recover_account_cb(cbs, account_creator_cb); BC_ASSERT_EQUAL( @@ -1556,9 +1751,9 @@ static void server_recover_account_with_phone_number_used(void) { //TODO synchro linphone_core_manager_destroy(marie); } -static void server_recover_account_with_phone_number_not_used(void) { //TODO synchro server + phone number +static void server_recover_account_with_phone_number_not_used(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -1567,7 +1762,7 @@ static void server_recover_account_with_phone_number_not_used(void) { //TODO syn linphone_account_creator_responses_cbs_set_user_data(cbs, stats); linphone_account_creator_requests_cbs_set_user_data( linphone_account_creator_get_requests_cbs(creator), - (void*)LinphoneRequestAccountNotLinked); + (void*)LinphoneRequestAccountNotExist); linphone_account_creator_responses_cbs_set_recover_account_cb(cbs, account_creator_cb); BC_ASSERT_EQUAL( @@ -1585,7 +1780,7 @@ static void server_recover_account_with_phone_number_not_used(void) { //TODO syn static void server_recover_account_with_phone_number_cb_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); linphone_account_creator_set_phone_number(creator, "0123456", "33"); @@ -1601,7 +1796,7 @@ static void server_recover_account_with_phone_number_cb_missing(void) { static void server_recover_account_with_phone_number_arg_phone_number_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -1624,21 +1819,20 @@ static void server_recover_account_with_phone_number_arg_phone_number_missing(vo /****************** End Recover Account ************************/ /****************** Start Update Account ************************/ -static void server_update_account_password_with_wrong_password(void) { //TODO synchro server +static void server_update_account_password_with_wrong_password(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); - linphone_account_creator_set_username(creator, "user_exist"); - linphone_account_creator_set_phone_number(creator, "0123456", "33"); - linphone_account_creator_set_password(creator, "password"); + linphone_account_creator_set_username(creator, "XXXTESTuser_1"); + linphone_account_creator_set_password(creator, "pssword"); linphone_account_creator_set_user_data(creator, "newpassword"); linphone_account_creator_responses_cbs_set_user_data(cbs, stats); linphone_account_creator_requests_cbs_set_user_data( linphone_account_creator_get_requests_cbs(creator), - (void*)LinphoneRequestAccountNotLinked); + (void*)LinphoneRequestAccountNotExist); linphone_account_creator_responses_cbs_set_update_account_cb(cbs, account_creator_cb); BC_ASSERT_EQUAL( @@ -1654,21 +1848,20 @@ static void server_update_account_password_with_wrong_password(void) { //TODO sy linphone_core_manager_destroy(marie); } -static void server_update_account_password_with_correct_password(void) { //TODO synchro server +static void server_update_account_password_with_correct_password(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); - linphone_account_creator_set_username(creator, "user_exist"); - linphone_account_creator_set_phone_number(creator, "0123456", "33"); + linphone_account_creator_set_username(creator, "XXXTESTuser_1"); linphone_account_creator_set_password(creator, "password"); linphone_account_creator_set_user_data(creator, "newpassword"); linphone_account_creator_responses_cbs_set_user_data(cbs, stats); linphone_account_creator_requests_cbs_set_user_data( linphone_account_creator_get_requests_cbs(creator), - (void*)LinphoneRequestAccountNotLinked); + (void*)LinphoneRequestOk); linphone_account_creator_responses_cbs_set_update_account_cb(cbs, account_creator_cb); BC_ASSERT_EQUAL( @@ -1684,21 +1877,20 @@ static void server_update_account_password_with_correct_password(void) { //TODO linphone_core_manager_destroy(marie); } -static void server_update_account_password_for_non_existent_account(void) { //TODO synchro server +static void server_update_account_password_for_non_existent_account(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); - linphone_account_creator_set_username(creator, "user_exist"); - linphone_account_creator_set_phone_number(creator, "0123456", "33"); + linphone_account_creator_set_username(creator, "unknown_user"); linphone_account_creator_set_password(creator, "password"); linphone_account_creator_set_user_data(creator, "newpassword"); linphone_account_creator_responses_cbs_set_user_data(cbs, stats); linphone_account_creator_requests_cbs_set_user_data( linphone_account_creator_get_requests_cbs(creator), - (void*)LinphoneRequestAccountNotLinked); + (void*)LinphoneRequestErrorServer); linphone_account_creator_responses_cbs_set_update_account_cb(cbs, account_creator_cb); BC_ASSERT_EQUAL( @@ -1716,7 +1908,7 @@ static void server_update_account_password_for_non_existent_account(void) { //TO static void server_update_account_password_cb_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); linphone_account_creator_set_username(creator, "user_exist"); linphone_account_creator_set_phone_number(creator, "0123456", "33"); @@ -1735,7 +1927,7 @@ static void server_update_account_password_cb_missing(void) { static void server_update_account_password_arg_username_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -1762,7 +1954,7 @@ static void server_update_account_password_arg_username_missing(void) { static void server_update_account_password_arg_phone_number_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -1788,7 +1980,7 @@ static void server_update_account_password_arg_phone_number_missing(void) { static void server_update_account_password_arg_password_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -1815,7 +2007,7 @@ static void server_update_account_password_arg_password_missing(void) { static void server_update_account_password_arg_new_password_missing(void) { LinphoneCoreManager *marie = linphone_core_manager_new2("account_creator_rc", 0); - LinphoneAccountCreator *creator = linphone_account_creator_new(marie->lc, XMLRPC_URL); + LinphoneAccountCreator *creator = _linphone_account_creator_new(marie->lc, XMLRPC_URL); LinphoneAccountCreatorResponseCbs *cbs = linphone_account_creator_get_responses_cbs(creator); LinphoneAccountCreatorStats *stats = new_linphone_account_creator_stats(); @@ -1902,15 +2094,6 @@ test_t account_creator_tests[] = { "Local - Phone number ok", local_phone_number_ok, "Local"), - - TEST_ONE_TAG( - "Server - Account doesn\'t exist", - server_account_doesnt_exist, - "Server"), - TEST_ONE_TAG( - "Server - Account exist", - server_account_exist, - "Server"), TEST_ONE_TAG( "Local - Is account exist callback missing", server_is_account_exist_cb_missing, @@ -1919,26 +2102,6 @@ test_t account_creator_tests[] = { "Local - Is account exist arguments missing", server_is_account_exist_arg_missing, "Local"), - TEST_ONE_TAG( - "Server - Account created with email", - server_account_created_with_email, - "Server"),//TODO synchro server - TEST_ONE_TAG( - "Server - Account already create with email", - server_create_account_already_create_with_email, - "Server"), - TEST_ONE_TAG( - "Server - Account created with phone number", - server_account_created_with_phone_number, - "Server"),//TODO synchro server - TEST_ONE_TAG( - "Server - Account already created with phone number as account", - server_create_account_already_create_as_account_with_phone_number, - "Server"), - TEST_ONE_TAG( - "Server - Account already created with phone number as alias", - server_create_account_already_create_as_alias_with_phone_number, - "Server"), TEST_ONE_TAG( "Local - Create Account callback missing", server_create_account_cb_missing, @@ -1963,14 +2126,6 @@ test_t account_creator_tests[] = { "Local - Create Account with phone number arguments phone number missing", server_create_account_with_phone_number_arg_phone_number_missing, "Local"), - TEST_ONE_TAG( - "Server - Account not activated", - server_account_not_activated, - "Server"), - TEST_ONE_TAG( - "Server - Account already activated", - server_account_already_activated, - "Server"), TEST_ONE_TAG( "Local - Is account activated callbacks missing", server_is_account_activated_cb_missing, @@ -1979,18 +2134,6 @@ test_t account_creator_tests[] = { "Local - Is account activated arguments username missing", server_is_account_activated_arg_username_missing, "Local"), - TEST_ONE_TAG( - "Server - Activate account", - server_activate_account_not_activated, - "Server"), //TODO synchro server - TEST_ONE_TAG( - "Server - Activate account already activated", - server_activate_account_already_activated, - "Server"), - TEST_ONE_TAG( - "Server - Activate a non existent account", - server_activate_non_existent_account, - "Server"), TEST_ONE_TAG( "Local - Activate account callbacks missing", server_activate_account_cb_missing, @@ -2011,18 +2154,6 @@ test_t account_creator_tests[] = { "Local - Activate account with phone number arguments activation code missing", server_activate_account_with_phone_number_activated_arg_activation_code_missing, "Local"), - TEST_ONE_TAG( - "Server - Link account with phone number", - server_link_account_with_phone_number, - "Server"), //TODO synchro server + phone number - TEST_ONE_TAG( - "Server - Link a non existent account with phone number", - server_link_non_existent_account_with_phone_number, - "Server"), //TODO synchro server + phone number - TEST_ONE_TAG( - "Server - Link a non existent account with phone number", - server_link_non_existent_account_with_phone_number, - "Server"), //TODO synchro server + phone number TEST_ONE_TAG( "Local - Link account callbacks missing", server_link_account_cb_missing, @@ -2035,14 +2166,6 @@ test_t account_creator_tests[] = { "Local - Link account arguments phone number missing", server_link_account_arg_phone_number_missing, "Local"), - TEST_ONE_TAG( - "Server - Activate phone number for an account", - server_activate_phone_number_for_account, - "Server"),//TODO synchro server + phone number - TEST_ONE_TAG( - "Server - Activate phone number for a non existent account", - server_activate_phone_number_for_non_existent_account, - "Server"),//TODO synchro server + phone number TEST_ONE_TAG( "Local - Activate alias callbacks missing", server_activate_alias_cb_missing, @@ -2067,30 +2190,10 @@ test_t account_creator_tests[] = { "Local - Is alias used callbacks missing", server_is_alias_used_cb_missing, "Local"), - TEST_ONE_TAG( - "Server - Phone number is used as alias", - server_phone_number_is_used_as_alias, - "Server"),//TODO synchro server + phone number - TEST_ONE_TAG( - "Server - Phone number is used as account", - server_phone_number_is_used_as_account, - "Server"),//TODO synchro server + phone number - TEST_ONE_TAG( - "Server - Phone number not used", - server_phone_number_not_used, - "Server"),//TODO synchro server + phone number TEST_ONE_TAG( "Local - Is alias used arguments phone number missing", server_is_alias_used_arg_phone_number_missing, "Local"), - TEST_ONE_TAG( - "Server - Account link with phone number", - server_account_link_with_phone_number, - "Server"),//TODO synchro server + phone number - TEST_ONE_TAG( - "Server - Account not link with phone number", - server_account_not_link_with_phone_number, - "Server"),//TODO synchro server + phone number TEST_ONE_TAG( "Local - Is account link callbacks missing", server_is_account_linked_cb_missing, @@ -2099,14 +2202,6 @@ test_t account_creator_tests[] = { "Local - Is account link arguments username missing", server_is_account_linked_arg_username_missing, "Local"), - TEST_ONE_TAG( - "Server - Recover account with phone number used", - server_recover_account_with_phone_number_used, - "Server"),//TODO synchro server + phone number - TEST_ONE_TAG( - "Server - Recover account with phone number not used", - server_recover_account_with_phone_number_not_used, - "Server"),//TODO synchro server + phone number TEST_ONE_TAG( "Local - Recover account with phone number callbacks missing", server_recover_account_with_phone_number_cb_missing, @@ -2115,18 +2210,6 @@ test_t account_creator_tests[] = { "Local - Recover account with phone number arguments phone number missing", server_recover_account_with_phone_number_arg_phone_number_missing, "Local"), - TEST_ONE_TAG( - "Server - Update account password with wrong password ", - server_update_account_password_with_wrong_password, - "Server"),//TODO synchro server - TEST_ONE_TAG( - "Server - Update account password with correct password ", - server_update_account_password_with_correct_password, - "Server"),//TODO synchro server - TEST_ONE_TAG( - "Server - Update account password for a non existent account ", - server_update_account_password_for_non_existent_account, - "Server"),//TODO synchro server TEST_ONE_TAG( "Local - Update account password callbacks missing", server_update_account_password_cb_missing, @@ -2147,6 +2230,115 @@ test_t account_creator_tests[] = { "Local - Update account password arguments new password missing", server_update_account_password_arg_new_password_missing, "Local"), + /* These tests must be carried in a specific order */ + TEST_ONE_TAG( + "Server - Delete accounts test", + server_delete_account_test, + "Server"), + TEST_ONE_TAG( + "Server - Account doesn\'t exist", + server_account_doesnt_exist, + "Server"), + TEST_ONE_TAG( + "Server - Activate a non existent account", + server_activate_non_existent_account, + "Server"), + TEST_ONE_TAG( + "Server - Activate phone number for a non existent account", + server_activate_phone_number_for_non_existent_account, + "Server"), + TEST_ONE_TAG( + "Server - Phone number not used", + server_phone_number_not_used, + "Server"), + TEST_ONE_TAG( + "Server - Update account password for a non existent account", + server_update_account_password_for_non_existent_account, + "Server"), + TEST_ONE_TAG( + "Server - Recover account with phone number not used", + server_recover_account_with_phone_number_not_used, + "Server"), + TEST_ONE_TAG( + "Server - Link a non existent account with phone number", + server_link_non_existent_account_with_phone_number, + "Server"), + TEST_ONE_TAG( + "Server - Account created with email", + server_account_created_with_email, + "Server"), + TEST_ONE_TAG( + "Server - Account exist", + server_account_exist, + "Server"), + TEST_ONE_TAG( + "Server - Account already create with email", + server_create_account_already_create_with_email, + "Server"), + TEST_ONE_TAG( + "Server - Account created with phone number", + server_account_created_with_phone_number, + "Server"), + TEST_ONE_TAG( + "Server - Account not activated", + server_account_not_activated, + "Server"), + TEST_ONE_TAG( + "Server - Account already created with phone number as account", + server_create_account_already_create_as_account_with_phone_number, + "Server"), + TEST_ONE_TAG( + "Server - Phone number is used as account", + server_phone_number_is_used_as_account, + "Server"), + TEST_ONE_TAG( + "Server - Account not link with phone number", + server_account_not_link_with_phone_number, + "Server"), + TEST_ONE_TAG( + "Server - Activate account", + server_activate_account_not_activated, + "Server"), + TEST_ONE_TAG( + "Server - Account already activated", + server_account_already_activated, + "Server"), + TEST_ONE_TAG( + "Server - Activate account already activated", + server_activate_account_already_activated, + "Server"), + TEST_ONE_TAG( + "Server - Link account with phone number", + server_link_account_with_phone_number, + "Server"), + TEST_ONE_TAG( + "Server - Activate phone number for an account", + server_activate_phone_number_for_account, + "Server"), + TEST_ONE_TAG( + "Server - Account already created with phone number as alias", + server_create_account_already_create_as_alias_with_phone_number, + "Server"), + TEST_ONE_TAG( + "Server - Phone number is used as alias", + server_phone_number_is_used_as_alias, + "Server"), + TEST_ONE_TAG( + "Server - Account link with phone number", + server_account_link_with_phone_number, + "Server"), + TEST_ONE_TAG( + "Server - Update account password with wrong password", + server_update_account_password_with_wrong_password, + "Server"), + TEST_ONE_TAG( + "Server - Update account password with correct password", + server_update_account_password_with_correct_password, + "Server"), + TEST_ONE_TAG( + "Server - Recover account with phone number used", + server_recover_account_with_phone_number_used, + "Server"), }; test_suite_t account_creator_test_suite = { diff --git a/tester/rcfiles/account_creator_rc b/tester/rcfiles/account_creator_rc index 5946e5b27..443827462 100644 --- a/tester/rcfiles/account_creator_rc +++ b/tester/rcfiles/account_creator_rc @@ -1,11 +1,10 @@ [assistant] domain=sip.accounttest.org -password_max_length=8 +password_max_length=12 password_min_length=3 -username_length=4 username_max_length=14 username_min_length=3 -username_regex=^[a-z0-9_.\-]*$ +username_regex=^[A-Za-z0-9_.\-]*$ xmlrpc_url=https://sip2.linphone.org:446/wizard.php [proxy_default_values]