From 3930a08057743d6e3e87c93801f22c33397399c4 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Mon, 15 Jan 2007 10:51:46 +0000 Subject: [PATCH] * update for ModestProtocolInfo stuff, and yes, checks pass pmo-trunk-r627 --- tests/Makefile.am | 3 +-- tests/check_account-mgr.c | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 2c54691..48d9d23 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -43,8 +43,7 @@ objects=\ ${top_srcdir}/src/modest-account-mgr.o \ ${top_srcdir}/src/modest-tny-platform-factory.o \ ${top_srcdir}/src/modest-conf.o \ - ${top_srcdir}/src/modest-protocol-mgr.o \ - ${top_srcdir}/src/modest-proto.o \ + ${top_srcdir}/src/modest-protocol-info.o \ ${top_srcdir}/src/modest-formatter.o \ ${top_srcdir}/src/modest-presets.o \ ${top_srcdir}/src/modest-pair.o \ diff --git a/tests/check_account-mgr.c b/tests/check_account-mgr.c index ffb052d..dd4e6e1 100644 --- a/tests/check_account-mgr.c +++ b/tests/check_account-mgr.c @@ -31,6 +31,7 @@ #include #include #include +#include /* ----------------------- Defines ---------------------- */ @@ -105,7 +106,7 @@ 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; @@ -152,7 +153,7 @@ START_TEST (test_add_exists_remove_account_regular) 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, @@ -167,7 +168,6 @@ 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, @@ -273,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"); @@ -284,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"); @@ -295,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"); -- 1.7.9.5