From f90aaa6e6f9dfa16dd3d6b6c526857f987862c99 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 29 Oct 2009 15:31:23 +0100 Subject: port check-empathy-chatroom.c to GTest The tests have not been ported yet as they are currently disabled. --- tests/.gitignore | 1 + tests/Makefile.am | 7 +- tests/check-empathy-chatroom.c | 159 --------------------------------------- tests/check-libempathy.h | 1 - tests/check-main.c | 1 - tests/empathy-chatroom-test.c | 165 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 171 insertions(+), 163 deletions(-) delete mode 100644 tests/check-empathy-chatroom.c create mode 100644 tests/empathy-chatroom-test.c diff --git a/tests/.gitignore b/tests/.gitignore index febd6a8be..eda398504 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -4,4 +4,5 @@ empathy-utils-test empathy-irc-server-test empathy-irc-network-test empathy-irc-network-manager-test +empathy-chatroom-test test-report.xml diff --git a/tests/Makefile.am b/tests/Makefile.am index d0b7fd36d..50a6bbade 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -27,7 +27,8 @@ TEST_PROGS = \ empathy-utils-test \ empathy-irc-server-test \ empathy-irc-network-test \ - empathy-irc-network-manager-test + empathy-irc-network-manager-test \ + empathy-chatroom-test empathy_utils_test_SOURCES = empathy-utils-test.c \ test-helper.c test-helper.h @@ -45,6 +46,9 @@ empathy_irc_network_manager_test_SOURCES = empathy-irc-network-manager-test.c \ check-irc-helper.h check-irc-helper.c \ check-empathy-helpers.h check-empathy-helpers.c +empathy_chatroom_test_SOURCES = empathy-chatroom-test.c \ + test-helper.c test-helper.h + check_PROGRAMS = check-main $(TEST_PROGS) TESTS = check-main @@ -57,7 +61,6 @@ check_main_SOURCES = \ check-empathy-helpers.c \ check-irc-helper.h \ check-irc-helper.c \ - check-empathy-chatroom.c \ check-empathy-chatroom-manager.c check_c_sources = \ diff --git a/tests/check-empathy-chatroom.c b/tests/check-empathy-chatroom.c deleted file mode 100644 index 4d0b7e1ee..000000000 --- a/tests/check-empathy-chatroom.c +++ /dev/null @@ -1,159 +0,0 @@ -#include -#include -#include - -#include -#include "check-helpers.h" -#include "check-libempathy.h" -#include "check-empathy-helpers.h" - -#include - -#if 0 -static EmpathyChatroom * -create_chatroom (void) -{ - EmpathyAccount *account; - EmpathyChatroom *chatroom; - - account = get_test_account (); - chatroom = empathy_chatroom_new (account); - fail_if (chatroom == NULL); - - return chatroom; -} - -START_TEST (test_empathy_chatroom_new) -{ - EmpathyChatroom *chatroom; - gboolean auto_connect, favorite; - - chatroom = create_chatroom (); - fail_if (empathy_chatroom_get_auto_connect (chatroom)); - g_object_get (chatroom, - "auto_connect", &auto_connect, - "favorite", &favorite, - NULL); - fail_if (auto_connect); - fail_if (favorite); - - g_object_unref (empathy_chatroom_get_account (chatroom)); - g_object_unref (chatroom); -} -END_TEST - -START_TEST (test_favorite_and_auto_connect) -{ - /* auto connect implies favorite */ - EmpathyChatroom *chatroom; - gboolean auto_connect, favorite; - - chatroom = create_chatroom (); - - /* set auto_connect so favorite as a side effect */ - empathy_chatroom_set_auto_connect (chatroom, TRUE); - fail_if (!empathy_chatroom_get_auto_connect (chatroom)); - g_object_get (chatroom, - "auto_connect", &auto_connect, - "favorite", &favorite, - NULL); - fail_if (!auto_connect); - fail_if (!favorite); - - /* Remove auto_connect. Chatroom is still favorite */ - empathy_chatroom_set_auto_connect (chatroom, FALSE); - fail_if (empathy_chatroom_get_auto_connect (chatroom)); - g_object_get (chatroom, - "auto_connect", &auto_connect, - "favorite", &favorite, - NULL); - fail_if (auto_connect); - fail_if (!favorite); - - /* Remove favorite too now */ - g_object_set (chatroom, "favorite", FALSE, NULL); - fail_if (empathy_chatroom_get_auto_connect (chatroom)); - g_object_get (chatroom, - "auto_connect", &auto_connect, - "favorite", &favorite, - NULL); - fail_if (auto_connect); - fail_if (favorite); - - /* Just add favorite but not auto-connect */ - g_object_set (chatroom, "favorite", TRUE, NULL); - fail_if (empathy_chatroom_get_auto_connect (chatroom)); - g_object_get (chatroom, - "auto_connect", &auto_connect, - "favorite", &favorite, - NULL); - fail_if (auto_connect); - fail_if (!favorite); - - /* ... and re-add auto_connect */ - g_object_set (chatroom, "auto_connect", TRUE, NULL); - fail_if (!empathy_chatroom_get_auto_connect (chatroom)); - g_object_get (chatroom, - "auto_connect", &auto_connect, - "favorite", &favorite, - NULL); - fail_if (!auto_connect); - fail_if (!favorite); - - /* Remove favorite remove auto_connect too */ - g_object_set (chatroom, "favorite", FALSE, NULL); - fail_if (empathy_chatroom_get_auto_connect (chatroom)); - g_object_get (chatroom, - "auto_connect", &auto_connect, - "favorite", &favorite, - NULL); - fail_if (auto_connect); - fail_if (favorite); - - g_object_unref (empathy_chatroom_get_account (chatroom)); - g_object_unref (chatroom); -} -END_TEST - -static void -favorite_changed (EmpathyChatroom *chatroom, - GParamSpec *spec, - gboolean *changed) -{ - *changed = TRUE; -} - -START_TEST (test_change_favorite) -{ - EmpathyChatroom *chatroom; - gboolean changed = FALSE; - - chatroom = create_chatroom (); - - g_signal_connect (chatroom, "notify::favorite", G_CALLBACK (favorite_changed), - &changed); - - /* change favorite to TRUE */ - g_object_set (chatroom, "favorite", TRUE, NULL); - fail_if (!changed); - - changed = FALSE; - - /* change favorite to FALSE */ - g_object_set (chatroom, "favorite", FALSE, NULL); - fail_if (!changed); -} -END_TEST -#endif - -TCase * -make_empathy_chatroom_tcase (void) -{ - TCase *tc = tcase_create ("empathy-chatroom"); - /* - tcase_add_test (tc, test_empathy_chatroom_new); - tcase_add_test (tc, test_favorite_and_auto_connect); - tcase_add_test (tc, test_change_favorite); - */ - return tc; -} diff --git a/tests/check-libempathy.h b/tests/check-libempathy.h index bcb0be9e2..a892bf67c 100644 --- a/tests/check-libempathy.h +++ b/tests/check-libempathy.h @@ -1,7 +1,6 @@ #ifndef __CHECK_LIBEMPATHY__ #define __CHECK_LIBEMPATHY__ -TCase * make_empathy_chatroom_tcase (void); TCase * make_empathy_chatroom_manager_tcase (void); #endif /* #ifndef __CHECK_LIBEMPATHY__ */ diff --git a/tests/check-main.c b/tests/check-main.c index e8b2c1a8a..00bcf4380 100644 --- a/tests/check-main.c +++ b/tests/check-main.c @@ -16,7 +16,6 @@ make_libempathy_suite (void) { Suite *s = suite_create ("libempathy"); - suite_add_tcase (s, make_empathy_chatroom_tcase ()); suite_add_tcase (s, make_empathy_chatroom_manager_tcase ()); return s; diff --git a/tests/empathy-chatroom-test.c b/tests/empathy-chatroom-test.c new file mode 100644 index 000000000..77d0c29e9 --- /dev/null +++ b/tests/empathy-chatroom-test.c @@ -0,0 +1,165 @@ +#include +#include +#include + +#include "check-empathy-helpers.h" +#include "test-helper.h" + +#include + +#if 0 +static EmpathyChatroom * +create_chatroom (void) +{ + EmpathyAccount *account; + EmpathyChatroom *chatroom; + + account = get_test_account (); + chatroom = empathy_chatroom_new (account); + fail_if (chatroom == NULL); + + return chatroom; +} + +START_TEST (test_empathy_chatroom_new) +{ + EmpathyChatroom *chatroom; + gboolean auto_connect, favorite; + + chatroom = create_chatroom (); + fail_if (empathy_chatroom_get_auto_connect (chatroom)); + g_object_get (chatroom, + "auto_connect", &auto_connect, + "favorite", &favorite, + NULL); + fail_if (auto_connect); + fail_if (favorite); + + g_object_unref (empathy_chatroom_get_account (chatroom)); + g_object_unref (chatroom); +} +END_TEST + +START_TEST (test_favorite_and_auto_connect) +{ + /* auto connect implies favorite */ + EmpathyChatroom *chatroom; + gboolean auto_connect, favorite; + + chatroom = create_chatroom (); + + /* set auto_connect so favorite as a side effect */ + empathy_chatroom_set_auto_connect (chatroom, TRUE); + fail_if (!empathy_chatroom_get_auto_connect (chatroom)); + g_object_get (chatroom, + "auto_connect", &auto_connect, + "favorite", &favorite, + NULL); + fail_if (!auto_connect); + fail_if (!favorite); + + /* Remove auto_connect. Chatroom is still favorite */ + empathy_chatroom_set_auto_connect (chatroom, FALSE); + fail_if (empathy_chatroom_get_auto_connect (chatroom)); + g_object_get (chatroom, + "auto_connect", &auto_connect, + "favorite", &favorite, + NULL); + fail_if (auto_connect); + fail_if (!favorite); + + /* Remove favorite too now */ + g_object_set (chatroom, "favorite", FALSE, NULL); + fail_if (empathy_chatroom_get_auto_connect (chatroom)); + g_object_get (chatroom, + "auto_connect", &auto_connect, + "favorite", &favorite, + NULL); + fail_if (auto_connect); + fail_if (favorite); + + /* Just add favorite but not auto-connect */ + g_object_set (chatroom, "favorite", TRUE, NULL); + fail_if (empathy_chatroom_get_auto_connect (chatroom)); + g_object_get (chatroom, + "auto_connect", &auto_connect, + "favorite", &favorite, + NULL); + fail_if (auto_connect); + fail_if (!favorite); + + /* ... and re-add auto_connect */ + g_object_set (chatroom, "auto_connect", TRUE, NULL); + fail_if (!empathy_chatroom_get_auto_connect (chatroom)); + g_object_get (chatroom, + "auto_connect", &auto_connect, + "favorite", &favorite, + NULL); + fail_if (!auto_connect); + fail_if (!favorite); + + /* Remove favorite remove auto_connect too */ + g_object_set (chatroom, "favorite", FALSE, NULL); + fail_if (empathy_chatroom_get_auto_connect (chatroom)); + g_object_get (chatroom, + "auto_connect", &auto_connect, + "favorite", &favorite, + NULL); + fail_if (auto_connect); + fail_if (favorite); + + g_object_unref (empathy_chatroom_get_account (chatroom)); + g_object_unref (chatroom); +} +END_TEST + +static void +favorite_changed (EmpathyChatroom *chatroom, + GParamSpec *spec, + gboolean *changed) +{ + *changed = TRUE; +} + +START_TEST (test_change_favorite) +{ + EmpathyChatroom *chatroom; + gboolean changed = FALSE; + + chatroom = create_chatroom (); + + g_signal_connect (chatroom, "notify::favorite", G_CALLBACK (favorite_changed), + &changed); + + /* change favorite to TRUE */ + g_object_set (chatroom, "favorite", TRUE, NULL); + fail_if (!changed); + + changed = FALSE; + + /* change favorite to FALSE */ + g_object_set (chatroom, "favorite", FALSE, NULL); + fail_if (!changed); +} +END_TEST +#endif + +int +main (int argc, + char **argv) +{ + int result; + + test_init (argc, argv); + +#if 0 + g_test_add_func ("/chatroom/new", test_empathy_chatroom_new); + g_test_add_func ("/chatroom/favorite-and-auto-connect", + test_favorite_and_auto_connect); + g_test_add_func ("/chatroom/change-favorite", test_change_favorite); +#endif + + result = g_test_run (); + test_deinit (); + return result; +} -- cgit v1.2.3