X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=tests%2Fcheck_account-mgr.c;h=5d79976b53f7d2a09b8f417dd4adbaaebba78841;hp=b944b96b578e7377ef934be81b31888d792a8fa4;hb=596a74d8798410d738adef0ad9357aa6c6ade185;hpb=ea1d9b217b92d13d4af15914a0ccf3b58dc402ef

diff --git a/tests/check_account-mgr.c b/tests/check_account-mgr.c
index b944b96..5d79976 100644
--- a/tests/check_account-mgr.c
+++ b/tests/check_account-mgr.c
@@ -29,8 +29,12 @@
 
 #include <check.h>
 #include <string.h>
+#include <modest-defs.h>
 #include <modest-conf.h>
 #include <modest-account-mgr.h>
+#include <modest-utils.h>
+#include <gtk/gtk.h>
+#include <modest-init.h>
 
 /* ----------------------- Defines ---------------------- */
 
@@ -45,15 +49,13 @@ static ModestAccountMgr *account_mgr = NULL;
 static void
 fx_setup_default_account_mgr ()
 {
-	ModestConf *conf = NULL;
+	fail_unless (gtk_init_check (NULL, NULL));
 
-	g_type_init ();
+	fail_unless (g_setenv (MODEST_DIR_ENV, ".modesttest", TRUE));
+	fail_unless (g_setenv (MODEST_NAMESPACE_ENV, "/apps/modesttest", TRUE));
+	fail_unless (modest_init (0, NULL), "Failed running modest_init");
 
-	conf = modest_conf_new ();
-	fail_unless (MODEST_IS_CONF (conf), 
-		     "modest_conf_new failed");
-
-	account_mgr = modest_account_mgr_new (conf);
+	account_mgr = modest_runtime_get_account_mgr ();
 	fail_unless (MODEST_IS_ACCOUNT_MGR (account_mgr),
 		     "modest_account_mgr_new failed");
 
@@ -65,15 +67,10 @@ fx_setup_default_account_mgr ()
 						   TEST_MODEST_ACCOUNT_NAME);
 	if (modest_account_mgr_account_exists(account_mgr,
 					      TEST_MODEST_ACCOUNT_NAME,
-					      TRUE))
-		modest_account_mgr_remove_account (account_mgr,
-						   TEST_MODEST_ACCOUNT_NAME);
-}
-
-static void
-fx_teardown_default_account_mgr ()
-{
-	g_object_unref (account_mgr);
+					      TRUE)) {
+		modest_account_mgr_remove_server_account (account_mgr,
+							  TEST_MODEST_ACCOUNT_NAME);
+	}
 }
 
 /* ---------- add/exists/remove account tests  ---------- */
@@ -132,6 +129,19 @@ START_TEST (test_add_exists_remove_account_regular)
 	fail_unless (result,
 		     "modest_account_mgr_account_exists failed: " \
 		     "Account with name \"%s\" should exist.\n", name);
+
+	/* Test 2b */
+	gchar *account_name_from_recipient;
+	account_name_from_recipient = modest_utils_get_account_name_from_recipient ("user@email.com", NULL);
+	fail_unless (account_name_from_recipient != NULL,
+		     "modest_utils_get_account_name_from_recipient failed: "\
+		     "From user@email.com should match account");
+	
+	/* Test 2c */
+	account_name_from_recipient = modest_utils_get_account_name_from_recipient ("egg@egg.com", NULL);
+	fail_unless (account_name_from_recipient == NULL,
+		     "modest_utils_get_account_name_from_recipient failed: "\
+		     "From egg@egg.com shouldn't match account");
 	
 
 	/* Test 3 */
@@ -159,7 +169,7 @@ START_TEST (test_add_exists_remove_account_regular)
 							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",
+		     "name: %s\nhostname: %s\nusername: %s\npassword: %s\nproto: %d",
 		     name, hostname, username, password, proto);
 
 	g_free (hostname);
@@ -173,10 +183,10 @@ START_TEST (test_add_exists_remove_account_regular)
 		     "Server account with name \"%s\" should exist. Error: %s", name);
 
 	/* Test 6 */
-	result = modest_account_mgr_remove_account (account_mgr,
-						    name);
+	result = modest_account_mgr_remove_server_account (account_mgr,
+							   name);
 	fail_unless (result,
-		     "modest_account_mgr_remove_account failed:\nname: %s\nerror: %s",
+		     "modest_account_mgr_remove_server_account failed:\nname: %s\nerror: %s",
 		     name);
 
 
@@ -184,7 +194,7 @@ START_TEST (test_add_exists_remove_account_regular)
 	result = modest_account_mgr_account_exists (account_mgr,
 						    "a_name_that_does_not_exist",
 						    FALSE);
-	fail_unless (result,
+	fail_unless (!result,
 		     "modest_account_mgr_exists_account does not return " \
 		     "FALSE when passing an account that does not exist");
 
@@ -192,7 +202,7 @@ START_TEST (test_add_exists_remove_account_regular)
 	result = modest_account_mgr_account_exists (account_mgr,
 						    "a_name_that_does_not_exist",
 						    TRUE);
-	fail_unless (result,
+	fail_unless (!result,
 		     "modest_account_mgr_exists_account does not return " \
 		     "FALSE when passing a server account that does not exist");
 	
@@ -372,8 +382,7 @@ account_mgr_suite (void)
 	/* Tests case for "add/exists/remove account" */
 	tc = tcase_create ("add_exists_remove_account");
 	tcase_add_checked_fixture (tc, 
-				   fx_setup_default_account_mgr, 
-				   fx_teardown_default_account_mgr);
+				     fx_setup_default_account_mgr, NULL);
 	tcase_add_test (tc, test_add_exists_remove_account_regular);
 	tcase_add_test (tc, test_add_exists_remove_account_invalid);
 	suite_add_tcase (suite, tc);