diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 9 | ||||
| -rw-r--r-- | tests/check.c | 7 | ||||
| -rw-r--r-- | tests/check_crypting.c | 47 | ||||
| -rw-r--r-- | tests/check_user.c | 6 | ||||
| -rw-r--r-- | tests/check_util.c | 9 |
5 files changed, 22 insertions, 56 deletions
diff --git a/tests/Makefile b/tests/Makefile index 1bcf8f72..7cbf4303 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,4 +1,7 @@ -include ../Makefile.settings +ifdef SRCDIR +SRCDIR := $(SRCDIR)tests/ +endif LFLAGS +=-lcheck @@ -10,14 +13,14 @@ clean: 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 @echo '*' Linking $@ @$(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS) -%.o: %.c +%.o: $(SRCDIR)%.c @echo '*' Compiling $< @$(CC) -c $(CFLAGS) $< -o $@ diff --git a/tests/check.c b/tests/check.c index 874acdd2..9a3043a7 100644 --- a/tests/check.c +++ b/tests/check.c @@ -2,6 +2,7 @@ #include <glib.h> #include <gmodule.h> #include <check.h> +#include <locale.h> #include "bitlbee.h" #include "testsuite.h" @@ -59,9 +60,6 @@ Suite *help_suite(void); /* From check_user.c */ Suite *user_suite(void); -/* From check_crypting.c */ -Suite *crypting_suite(void); - /* From check_set.c */ Suite *set_suite(void); @@ -94,6 +92,8 @@ int main (int argc, char **argv) g_option_context_free(pc); log_init(); + b_main_init(); + setlocale(LC_CTYPE, ""); if (verbose) { log_link( LOGLVL_ERROR, LOGOUTPUT_CONSOLE ); @@ -114,7 +114,6 @@ int main (int argc, char **argv) srunner_add_suite(sr, irc_suite()); 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()); srunner_add_suite(sr, jabber_util_suite()); diff --git a/tests/check_crypting.c b/tests/check_crypting.c deleted file mode 100644 index b8e5e1e0..00000000 --- a/tests/check_crypting.c +++ /dev/null @@ -1,47 +0,0 @@ -#include <stdlib.h> -#include <glib.h> -#include <gmodule.h> -#include <check.h> -#include <string.h> -#include "bitlbee.h" -#include "crypting.h" -#include "testsuite.h" - -START_TEST(test_check_pass_valid) - fail_unless (checkpass ("foo", "acbd18db4cc2f85cedef654fccc4a4d8") == 0); - fail_unless (checkpass ("invalidpass", "acbd18db4cc2f85cedef654fccc4a4d8") == -1); - -END_TEST - -START_TEST(test_hashpass) - fail_unless (strcmp(hashpass("foo"), "acbd18db4cc2f85cedef654fccc4a4d8") == 0); -END_TEST - -START_TEST(test_obfucrypt) - char *raw = obfucrypt("some line", "bla"); - fail_unless(strcmp(raw, "\xd5\xdb\xce\xc7\x8c\xcd\xcb\xda\xc6") == 0); -END_TEST - -START_TEST(test_deobfucrypt) - char *raw = deobfucrypt("\xd5\xdb\xce\xc7\x8c\xcd\xcb\xda\xc6", "bla"); - fail_unless(strcmp(raw, "some line") == 0); -END_TEST - -START_TEST(test_obfucrypt_bidirectional) - char *plain = g_strdup("this is a line"); - char *raw = obfucrypt(plain, "foo"); - fail_unless(strcmp(plain, deobfucrypt(raw, "foo")) == 0); -END_TEST - -Suite *crypting_suite (void) -{ - Suite *s = suite_create("Crypting"); - TCase *tc_core = tcase_create("Core"); - suite_add_tcase (s, tc_core); - tcase_add_test (tc_core, test_check_pass_valid); - tcase_add_test (tc_core, test_hashpass); - tcase_add_test (tc_core, test_obfucrypt); - tcase_add_test (tc_core, test_deobfucrypt); - tcase_add_test (tc_core, test_obfucrypt_bidirectional); - return s; -} diff --git a/tests/check_user.c b/tests/check_user.c index 79248049..c4d8bf5f 100644 --- a/tests/check_user.c +++ b/tests/check_user.c @@ -4,9 +4,9 @@ #include <check.h> #include <string.h> #include "bitlbee.h" -#include "user.h" #include "testsuite.h" +#if 0 START_TEST(test_user_add) irc_t *irc = torture_irc(); user_t *user; @@ -58,12 +58,13 @@ START_TEST(test_user_rename) fail_unless(user_find(irc, "foo") == NULL); fail_if(user_find(irc, "bar") == NULL); END_TEST - +#endif Suite *user_suite (void) { Suite *s = suite_create("User"); 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); tcase_add_test (tc_core, test_user_add_exists); @@ -71,5 +72,6 @@ Suite *user_suite (void) tcase_add_test (tc_core, test_user_del_nonexistant); tcase_add_test (tc_core, test_user_del); tcase_add_test (tc_core, test_user_rename); +#endif return s; } diff --git a/tests/check_util.c b/tests/check_util.c index b00d645b..c323241e 100644 --- a/tests/check_util.c +++ b/tests/check_util.c @@ -160,6 +160,14 @@ START_TEST(test_word_wrap) } END_TEST +START_TEST(test_http_encode) + char s[80]; + + strcpy( s, "ee\xc3""\xab""ee!!..." ); + http_encode( s ); + fail_unless( strcmp( s, "ee%C3%ABee%21%21..." ) == 0 ); +END_TEST + Suite *util_suite (void) { Suite *s = suite_create("Util"); @@ -173,5 +181,6 @@ Suite *util_suite (void) tcase_add_test (tc_core, test_set_url_username); tcase_add_test (tc_core, test_set_url_username_pwd); tcase_add_test (tc_core, test_word_wrap); + tcase_add_test (tc_core, test_http_encode); return s; } |