* modest-tny-account-store.[ch]:

[modest] / tests / check_account-mgr.c

diff --git a/tests/check_account-mgr.c b/tests/check_account-mgr.c
index c745acc..dd4e6e1 100644 (file)
--- a/tests/check_account-mgr.c
+++ b/tests/check_account-mgr.c
@@ -31,6 +31,7 @@
 #include <string.h>
 #include <modest-conf.h>
 #include <modest-account-mgr.h>
+#include <modest-protocol-info.h>
 
 /* ----------------------- Defines ---------------------- */
 
@@ -45,17 +46,33 @@ static ModestAccountMgr *account_mgr = NULL;
 static void
 fx_setup_default_account_mgr ()
 {
-  ModestConf *conf = NULL;
-
-  g_type_init ();
-
-  conf = modest_conf_new ();
-  fail_unless (MODEST_IS_CONF (conf), 
-              "modest_conf_new failed");
-
-  account_mgr = modest_account_mgr_new (conf);
-  fail_unless (MODEST_IS_ACCOUNT_MGR (account_mgr),
-              "modest_account_mgr_new failed");
+       ModestConf *conf = NULL;
+
+       g_type_init ();
+
+       conf = modest_conf_new ();
+       fail_unless (MODEST_IS_CONF (conf), 
+                    "modest_conf_new failed");
+
+       account_mgr = modest_account_mgr_new (conf);
+       fail_unless (MODEST_IS_ACCOUNT_MGR (account_mgr),
+                    "modest_account_mgr_new failed");
+
+       /* cleanup old garbage (from previous runs)*/
+       if (modest_account_mgr_account_exists(account_mgr,
+                                             TEST_MODEST_ACCOUNT_NAME,
+                                             FALSE, NULL))
+               modest_account_mgr_remove_account (account_mgr,
+                                                  TEST_MODEST_ACCOUNT_NAME,
+                                                  FALSE,
+                                                  NULL);
+       if (modest_account_mgr_account_exists(account_mgr,
+                                             TEST_MODEST_ACCOUNT_NAME,
+                                             TRUE, NULL))
+               modest_account_mgr_remove_account (account_mgr,
+                                                  TEST_MODEST_ACCOUNT_NAME,
+                                                  TRUE,
+                                                  NULL);
 }
 
 static void
@@ -89,12 +106,11 @@ START_TEST (test_add_exists_remove_account_regular)
        gchar *hostname = NULL;
        gchar *username = NULL;
        gchar *password = NULL;
-       gchar *proto = NULL;
+       ModestProtocol proto;
        GError *error = NULL;
        gboolean result;
-
+       
        name = g_strdup (TEST_MODEST_ACCOUNT_NAME);
-
        /* Test 1 */
        store_account = g_strdup ("imap://me@myserver");
        transport_account = g_strdup ("local-smtp");
@@ -132,11 +148,12 @@ START_TEST (test_add_exists_remove_account_regular)
                     "modest_account_mgr_remove_account failed:\nname: %s\nerror: %s",
                     name,  error ? error->message : "");
 
+
        /* Test 4 */
        hostname = g_strdup ("myhostname.mydomain.com");
        username = g_strdup ("myusername");
        password = g_strdup ("mypassword");
-       proto = g_strdup ("smtp");
+       proto = MODEST_PROTOCOL_TRANSPORT_SMTP;
        result = modest_account_mgr_add_server_account (account_mgr,
                                                        name,
                                                        hostname,
@@ -151,8 +168,7 @@ 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,
@@ -257,7 +273,7 @@ START_TEST (test_add_exists_remove_account_invalid)
                                                        "hostname",
                                                        "username",
                                                        "password",
-                                                       "proto");
+                                                       MODEST_PROTOCOL_STORE_IMAP);
        fail_unless (!result,
                     "modest_account_mgr_add_server_account does not return " \
                     "FALSE when passing a NULL ModestAccountMgr");
@@ -268,7 +284,7 @@ START_TEST (test_add_exists_remove_account_invalid)
                                                        "hostname",
                                                        "username",
                                                        "password",
-                                                       "proto");
+                                                       MODEST_PROTOCOL_STORE_IMAP);
        fail_unless (!result,
                     "modest_account_mgr_add_server_account does not return " \
                     "FALSE when passing a NULL account name");
@@ -279,7 +295,7 @@ START_TEST (test_add_exists_remove_account_invalid)
                                                        "hostname", 
                                                        "username", 
                                                        "password", 
-                                                       "proto"); 
+                                                       MODEST_PROTOCOL_STORE_IMAP); 
        fail_unless (!result, 
                     "modest_account_mgr_add_server_account does not return " \
                     "FALSE when passing an invalid account name");