2007-07-23 Murray Cumming <murrayc@murrayc.com>
[modest] / tests / check_account-mgr.c
index 25fc1cf..6c00667 100644 (file)
@@ -104,7 +104,7 @@ START_TEST (test_add_exists_remove_account_regular)
        gchar *hostname = NULL;
        gchar *username = NULL;
        gchar *password = NULL;
-       ModestProtocol proto;
+       ModestTransportStoreProtocol proto;
        gboolean result;
        
        name = g_strdup (TEST_MODEST_ACCOUNT_NAME);
@@ -114,11 +114,11 @@ START_TEST (test_add_exists_remove_account_regular)
        result = modest_account_mgr_add_account (account_mgr,
                                                 name,
                                                 store_account,
-                                                transport_account);
+                                                transport_account, TRUE);
        fail_unless (result,
                     "modest_account_mgr_add_account failed:\n" \
                     "name: %s\nstore: %s\ntransport: %s\n",
-                    name, store_account, transport_account);
+                    name, store_account, transport_account, TRUE);
        
        g_free (store_account);
        g_free (transport_account);
@@ -151,7 +151,9 @@ START_TEST (test_add_exists_remove_account_regular)
                                                        hostname,
                                                        username,
                                                        password,
-                                                       proto);
+                                                       proto,
+                                                       MODEST_PROTOCOL_SECURITY_NONE,
+                                                       MODEST_PROTOCOL_AUTH_NONE); 
        fail_unless (result,
                     "modest_account_mgr_add_server_account failed:\n" \
                     "name: %s\nhostname: %s\nusername: %s\npassword: %s\nproto: %s",
@@ -225,7 +227,7 @@ START_TEST (test_add_exists_remove_account_invalid)
        result = modest_account_mgr_add_account (NULL,
                                                 TEST_MODEST_ACCOUNT_NAME,
                                                 "store_account",
-                                                "transport_account");
+                                                "transport_account", TRUE);
        fail_unless (!result,
                     "modest_account_mgr_add_account does not return FALSE when" \
                     "passing a NULL ModestAccountMgr");
@@ -234,7 +236,7 @@ START_TEST (test_add_exists_remove_account_invalid)
        result = modest_account_mgr_add_account (account_mgr,
                                                 NULL,
                                                 "store_account",
-                                                "transport_account");
+                                                "transport_account", TRUE);
        fail_unless (!result,
                     "modest_account_mgr_add_account does not return FALSE when" \
                     "passing a NULL account name");
@@ -243,7 +245,7 @@ START_TEST (test_add_exists_remove_account_invalid)
        result = modest_account_mgr_add_account (account_mgr,
                                                 "ïnválid//accountñ//nÄméç",
                                                 "store_account",
-                                                "transport_account");
+                                                "transport_account", TRUE);
        fail_unless (!result,
                     "modest_account_mgr_add_account does not return FALSE when" \
                     "passing an invalid account name");
@@ -254,7 +256,9 @@ START_TEST (test_add_exists_remove_account_invalid)
                                                        "hostname",
                                                        "username",
                                                        "password",
-                                                       MODEST_PROTOCOL_STORE_IMAP);
+                                                       MODEST_PROTOCOL_STORE_IMAP,
+                                                      MODEST_PROTOCOL_SECURITY_NONE,
+                                                      MODEST_PROTOCOL_AUTH_NONE);
        fail_unless (!result,
                     "modest_account_mgr_add_server_account does not return " \
                     "FALSE when passing a NULL ModestAccountMgr");
@@ -265,7 +269,9 @@ START_TEST (test_add_exists_remove_account_invalid)
                                                        "hostname",
                                                        "username",
                                                        "password",
-                                                       MODEST_PROTOCOL_STORE_IMAP);
+                                                       MODEST_PROTOCOL_STORE_IMAP,
+                                                       MODEST_PROTOCOL_SECURITY_NONE,
+                                                       MODEST_PROTOCOL_AUTH_NONE); 
        fail_unless (!result,
                     "modest_account_mgr_add_server_account does not return " \
                     "FALSE when passing a NULL account name");
@@ -276,7 +282,9 @@ START_TEST (test_add_exists_remove_account_invalid)
                                                        "hostname", 
                                                        "username", 
                                                        "password", 
-                                                       MODEST_PROTOCOL_STORE_IMAP); 
+                                                       MODEST_PROTOCOL_STORE_IMAP,
+                                                       MODEST_PROTOCOL_SECURITY_NONE,
+                                                       MODEST_PROTOCOL_AUTH_NONE); 
        fail_unless (!result, 
                     "modest_account_mgr_add_server_account does not return " \
                     "FALSE when passing an invalid account name");