Changeset 3963fdd

Timestamp:

2010-07-29T07:19:57Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b40e60d

Parents:

3b3c50d9

Message:

"Fix up" unittests enough to at least compile. Never touched these during
the ui-fix works.

Location:

tests

Files:

• Makefile (modified) (1 diff)
• check.c (modified) (2 diffs)
• check_crypting.c (deleted)
• check_user.c (modified) (4 diffs)

tests/Makefile

@@ -14 +14 @@
 distclean: clean
 
-main_objs = account.o bitlbee.o chat.o conf.o crypting.o help.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o storage_xml.o storage_text.o user.o
+main_objs = bitlbee.o conf.o dcc.o help.o ipc.o irc.o irc_channel.o irc_commands.o irc_im.o irc_send.o irc_user.o irc_util.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o storage_xml.o
 
-test_objs = check.o check_util.o check_nick.o check_md5.o check_arc.o check_irc.o check_help.o check_user.o check_crypting.o check_set.o check_jabber_sasl.o check_jabber_util.o
+test_objs = check.o check_util.o check_nick.o check_md5.o check_arc.o check_irc.o check_help.o check_user.o check_set.o check_jabber_sasl.o check_jabber_util.o
 
 check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o ../lib/lib.o

tests/check.c

@@ -60 +60 @@
 Suite *user_suite(void);
 
-/* From check_crypting.c */
-Suite *crypting_suite(void);
-
 /* From check_set.c */
 Suite *set_suite(void);
@@ -115 +112 @@
         srunner_add_suite(sr, help_suite());
         srunner_add_suite(sr, user_suite());
-        srunner_add_suite(sr, crypting_suite());
         srunner_add_suite(sr, set_suite());
         srunner_add_suite(sr, jabber_sasl_suite());

tests/check_user.c

@@ -5 +5 @@
 #include <string.h>
 #include "bitlbee.h"
-#include "user.h"
 #include "testsuite.h"
 
+#if 0
 START_TEST(test_user_add)
         irc_t *irc = torture_irc();
@@ -59 +59 @@
         fail_if(user_find(irc, "bar") == NULL);
 END_TEST
-
+#endif
 Suite *user_suite (void)
 {
@@ -65 +65 @@
         TCase *tc_core = tcase_create("Core");
         suite_add_tcase (s, tc_core);
+#if 0
         tcase_add_test (tc_core, test_user_add);
         tcase_add_test (tc_core, test_user_add_invalid);
@@ -72 +73 @@
         tcase_add_test (tc_core, test_user_del);
         tcase_add_test (tc_core, test_user_rename);
+#endif
         return s;
 }