Skip to content
Snippets Groups Projects
Commit 2fd043be authored by Tristan Matthews's avatar Tristan Matthews Committed by Rafaël Carré
Browse files

* 6360: updated API calls in tests, but they're not building yet

(cherry picked from commit 548f6f0f)
parent a8f5ea9e
No related branches found
No related tags found
No related merge requests found
...@@ -27,6 +27,7 @@ else ...@@ -27,6 +27,7 @@ else
fi fi
AC_PROG_CC AC_PROG_CC
AM_PROG_CC_C_O dnl for per target flags, i.e. test_program_CFLAGS
AC_PROG_INSTALL AC_PROG_INSTALL
AC_HEADER_STDC AC_HEADER_STDC
LT_INIT LT_INIT
......
...@@ -288,7 +288,7 @@ int account_list_get_sip_account_number (void) ...@@ -288,7 +288,7 @@ int account_list_get_sip_account_number (void)
for (i=0; i<size ; i++) { for (i=0; i<size ; i++) {
current = account_list_get_nth (i); current = account_list_get_nth (i);
if (strcmp (g_hash_table_lookup (current->properties, ACCOUNT_TYPE), "SIP") == 0) if (current && strcmp (g_hash_table_lookup (current->properties, ACCOUNT_TYPE), "SIP") == 0)
n++; n++;
} }
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <check.h> #include <check.h>
#include <stdlib.h> #include <stdlib.h>
#include "../src/contacts/addressbook/eds.h"
#include "../src/contacts/addressbook.h" #include "../src/contacts/addressbook.h"
......
...@@ -33,7 +33,8 @@ ...@@ -33,7 +33,8 @@
START_TEST (test_dbus_connect) START_TEST (test_dbus_connect)
{ {
fail_unless (dbus_connect () == TRUE, "dbus_connect () returns FALSE"); GError *error = NULL;
fail_unless (dbus_connect (&error) == TRUE, "dbus_connect () returns FALSE");
} }
END_TEST END_TEST
......
...@@ -171,20 +171,6 @@ START_TEST (test_get_current_account) ...@@ -171,20 +171,6 @@ START_TEST (test_get_current_account)
} }
END_TEST END_TEST
START_TEST (test_current_account_has_mailbox)
{
account_t *test = create_test_account ("test");
account_list_init ();
account_list_add (test);
fail_unless (account_list_current_account_has_mailbox () == FALSE, "current account has a default mailbox");
g_hash_table_replace (test->properties, ACCOUNT_MAILBOX, "888");
fail_unless (account_list_current_account_has_mailbox () == TRUE, "current account has not no voicemail number");
}
END_TEST
Suite * Suite *
global_suite (void) global_suite (void)
{ {
...@@ -197,7 +183,6 @@ global_suite (void) ...@@ -197,7 +183,6 @@ global_suite (void)
tcase_add_test (tc_cases, test_get_by_id); tcase_add_test (tc_cases, test_get_by_id);
tcase_add_test (tc_cases, test_get_account_position); tcase_add_test (tc_cases, test_get_account_position);
tcase_add_test (tc_cases, test_get_current_account); tcase_add_test (tc_cases, test_get_current_account);
tcase_add_test (tc_cases, test_current_account_has_mailbox);
suite_add_tcase (s, tc_cases); suite_add_tcase (s, tc_cases);
return s; return s;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment