X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=tests%2Fcheck_account-mgr.c;h=b944b96b578e7377ef934be81b31888d792a8fa4;hp=ffb052df0be8f4adae35b1e03e06fa0c67ea98ab;hb=cb68944c4c0c8e36453b07926bca8ebee668aa7b;hpb=1acc7e369b8bba314daf3027023a001a1c733a7b diff --git a/tests/check_account-mgr.c b/tests/check_account-mgr.c index ffb052d..b944b96 100644 --- a/tests/check_account-mgr.c +++ b/tests/check_account-mgr.c @@ -60,18 +60,14 @@ fx_setup_default_account_mgr () /* cleanup old garbage (from previous runs)*/ if (modest_account_mgr_account_exists(account_mgr, TEST_MODEST_ACCOUNT_NAME, - FALSE, NULL)) + FALSE)) modest_account_mgr_remove_account (account_mgr, - TEST_MODEST_ACCOUNT_NAME, - FALSE, - NULL); + TEST_MODEST_ACCOUNT_NAME); if (modest_account_mgr_account_exists(account_mgr, TEST_MODEST_ACCOUNT_NAME, - TRUE, NULL)) + TRUE)) modest_account_mgr_remove_account (account_mgr, - TEST_MODEST_ACCOUNT_NAME, - TRUE, - NULL); + TEST_MODEST_ACCOUNT_NAME); } static void @@ -105,8 +101,8 @@ START_TEST (test_add_exists_remove_account_regular) gchar *hostname = NULL; gchar *username = NULL; gchar *password = NULL; - gchar *proto = NULL; - GError *error = NULL; + gint portnum; + ModestProtocolType proto; gboolean result; name = g_strdup (TEST_MODEST_ACCOUNT_NAME); @@ -115,14 +111,16 @@ START_TEST (test_add_exists_remove_account_regular) transport_account = g_strdup ("local-smtp"); result = modest_account_mgr_add_account (account_mgr, name, + "test display name", + "user fullname", + "user@email.com", + MODEST_ACCOUNT_RETRIEVE_HEADERS_ONLY, store_account, - transport_account, - &error); - fail_unless (result && !error, + transport_account, TRUE); + fail_unless (result, "modest_account_mgr_add_account failed:\n" \ - "name: %s\nstore: %s\ntransport: %s\nerror: %s", - name, store_account, transport_account, - error ? error->message : ""); + "name: %s\nstore: %s\ntransport: %s\n", + name, store_account, transport_account, TRUE); g_free (store_account); g_free (transport_account); @@ -130,35 +128,35 @@ START_TEST (test_add_exists_remove_account_regular) /* Test 2 */ result = modest_account_mgr_account_exists (account_mgr, name, - FALSE, - &error); - fail_unless (result && !error, + FALSE); + fail_unless (result, "modest_account_mgr_account_exists failed: " \ - "Account with name \"%s\" should exist. Error: %s", - name, error ? error->message : ""); + "Account with name \"%s\" should exist.\n", name); /* Test 3 */ result = modest_account_mgr_remove_account (account_mgr, - name, - FALSE, - &error); - fail_unless (result && !error, + name); + fail_unless (result, "modest_account_mgr_remove_account failed:\nname: %s\nerror: %s", - name, error ? error->message : ""); + name); /* Test 4 */ hostname = g_strdup ("myhostname.mydomain.com"); username = g_strdup ("myusername"); password = g_strdup ("mypassword"); - proto = g_strdup ("smtp"); + proto = MODEST_PROTOCOLS_TRANSPORT_SMTP; + portnum = 25; result = modest_account_mgr_add_server_account (account_mgr, name, hostname, + portnum, username, password, - proto); + proto, + MODEST_PROTOCOLS_CONNECTION_NONE, + MODEST_PROTOCOLS_AUTH_NONE); fail_unless (result, "modest_account_mgr_add_server_account failed:\n" \ "name: %s\nhostname: %s\nusername: %s\npassword: %s\nproto: %s", @@ -167,47 +165,37 @@ START_TEST (test_add_exists_remove_account_regular) g_free (hostname); g_free (username); g_free (password); - g_free (proto); /* Test 5 */ - result = modest_account_mgr_account_exists (account_mgr, - name, - TRUE, - &error); - fail_unless (result && !error, + result = modest_account_mgr_account_exists (account_mgr,name,TRUE); + fail_unless (result, "modest_account_mgr_account_exists failed: " \ - "Server account with name \"%s\" should exist. Error: %s", - name, error ? error->message : ""); - + "Server account with name \"%s\" should exist. Error: %s", name); /* Test 6 */ result = modest_account_mgr_remove_account (account_mgr, - name, - TRUE, - &error); - fail_unless (result && !error, + name); + fail_unless (result, "modest_account_mgr_remove_account failed:\nname: %s\nerror: %s", - name, error ? error->message : ""); + name); /* Test 7 */ result = modest_account_mgr_account_exists (account_mgr, "a_name_that_does_not_exist", - FALSE, - NULL); - fail_unless (!result, + FALSE); + fail_unless (result, "modest_account_mgr_exists_account does not return " \ "FALSE when passing an account that does not exist"); /* Test 8 */ result = modest_account_mgr_account_exists (account_mgr, "a_name_that_does_not_exist", - TRUE, - NULL); - fail_unless (!result, + TRUE); + fail_unless (result, "modest_account_mgr_exists_account does not return " \ "FALSE when passing a server account that does not exist"); - + g_free (name); } END_TEST @@ -225,7 +213,7 @@ END_TEST * - Test 5: Create server account with NULL name * - Test 6: Create server account with invalid name string * - Test 7: Remove a non-existing account - * - Test 8: Remove a non-existing server account + * - Test 8: Remove a non-existing server account (REMOVED) * - Test 9: Remove with NULL acount manager * - Test 10: Remove with NULL name * - Test 11: Check if an account exists with NULL account_mgr @@ -240,9 +228,12 @@ START_TEST (test_add_exists_remove_account_invalid) /* Test 1 */ result = modest_account_mgr_add_account (NULL, TEST_MODEST_ACCOUNT_NAME, + "test display name", + "user fullname", + "user@email.com", + MODEST_ACCOUNT_RETRIEVE_HEADERS_ONLY, "store_account", - "transport_account", - NULL); + "transport_account", TRUE); fail_unless (!result, "modest_account_mgr_add_account does not return FALSE when" \ "passing a NULL ModestAccountMgr"); @@ -250,9 +241,12 @@ START_TEST (test_add_exists_remove_account_invalid) /* Test 2 */ result = modest_account_mgr_add_account (account_mgr, NULL, + "test display name", + "user fullname", + "user@email.com", + MODEST_ACCOUNT_RETRIEVE_HEADERS_ONLY, "store_account", - "transport_account", - NULL); + "transport_account", TRUE); fail_unless (!result, "modest_account_mgr_add_account does not return FALSE when" \ "passing a NULL account name"); @@ -260,9 +254,12 @@ START_TEST (test_add_exists_remove_account_invalid) /* Test 3*/ result = modest_account_mgr_add_account (account_mgr, "ïnválid//accountñ//nÄméç", + "test display name", + "user fullname", + "user@email.com", + MODEST_ACCOUNT_RETRIEVE_HEADERS_ONLY, "store_account", - "transport_account", - NULL); + "transport_account", TRUE); fail_unless (!result, "modest_account_mgr_add_account does not return FALSE when" \ "passing an invalid account name"); @@ -271,9 +268,12 @@ START_TEST (test_add_exists_remove_account_invalid) result = modest_account_mgr_add_server_account (NULL, TEST_MODEST_ACCOUNT_NAME, "hostname", + 143, "username", "password", - "proto"); + MODEST_PROTOCOLS_STORE_IMAP, + MODEST_PROTOCOLS_CONNECTION_NONE, + MODEST_PROTOCOLS_AUTH_NONE); fail_unless (!result, "modest_account_mgr_add_server_account does not return " \ "FALSE when passing a NULL ModestAccountMgr"); @@ -282,9 +282,12 @@ START_TEST (test_add_exists_remove_account_invalid) result = modest_account_mgr_add_server_account (account_mgr, NULL, "hostname", + 143, "username", "password", - "proto"); + MODEST_PROTOCOLS_STORE_IMAP, + MODEST_PROTOCOLS_CONNECTION_NONE, + MODEST_PROTOCOLS_AUTH_NONE); fail_unless (!result, "modest_account_mgr_add_server_account does not return " \ "FALSE when passing a NULL account name"); @@ -293,44 +296,32 @@ START_TEST (test_add_exists_remove_account_invalid) result = modest_account_mgr_add_server_account (account_mgr, "ïnválid//accountñ//nÄméç", "hostname", + 143, "username", "password", - "proto"); + MODEST_PROTOCOLS_STORE_IMAP, + MODEST_PROTOCOLS_CONNECTION_NONE, + MODEST_PROTOCOLS_AUTH_NONE); fail_unless (!result, "modest_account_mgr_add_server_account does not return " \ "FALSE when passing an invalid account name"); /* Test 7 */ result = modest_account_mgr_remove_account (account_mgr, - "a_name_that_does_not_exist", - FALSE, - NULL); + "a_name_that_does_not_exist"); fail_unless (!result, "modest_account_mgr_remove_acccount does not return FALSE " \ "when trying to remove an account that does not exist"); - /* Test 8 */ - result = modest_account_mgr_remove_account (account_mgr, - "a_name_that_does_not_exist", - TRUE, - NULL); - fail_unless (!result, - "modest_account_mgr_remove_acccount does not return FALSE " \ - "when trying to remove a server account that does not exist"); - /* Test 9 */ result = modest_account_mgr_remove_account (NULL, - TEST_MODEST_ACCOUNT_NAME, - FALSE, - NULL); + TEST_MODEST_ACCOUNT_NAME); fail_unless (!result, "modest_account_mgr_remove_acccount does not return " \ "FALSE when passing a NULL ModestAccountMgr"); /* Test 10 */ result = modest_account_mgr_remove_account (account_mgr, - NULL, - FALSE, NULL); fail_unless (!result, "modest_account_mgr_remove_acccount does not return " \ @@ -339,8 +330,7 @@ START_TEST (test_add_exists_remove_account_invalid) /* Test 11 */ result = modest_account_mgr_account_exists (NULL, TEST_MODEST_ACCOUNT_NAME, - TRUE, - NULL); + TRUE); fail_unless (!result, "modest_account_mgr_exists_account does not return " \ "FALSE when passing a NULL ModestAccountMgr"); @@ -348,8 +338,7 @@ START_TEST (test_add_exists_remove_account_invalid) /* Test 12 */ result = modest_account_mgr_account_exists (NULL, TEST_MODEST_ACCOUNT_NAME, - FALSE, - NULL); + FALSE); fail_unless (!result, "modest_account_mgr_exists_account does not return " \ "FALSE when passing a NULL ModestAccountMgr"); @@ -357,8 +346,7 @@ START_TEST (test_add_exists_remove_account_invalid) /* Test 13 */ result = modest_account_mgr_account_exists (account_mgr, NULL, - FALSE, - NULL); + FALSE); fail_unless (!result, "modest_account_mgr_exists_acccount does not return " \ "FALSE when passing a NULL account name"); @@ -366,8 +354,7 @@ START_TEST (test_add_exists_remove_account_invalid) /* Test 14 */ result = modest_account_mgr_account_exists (account_mgr, NULL, - TRUE, - NULL); + TRUE); fail_unless (!result, "modest_account_mgr_exists_account does not return " \ "FALSE when passing a NULL server account name");