Changeset ae3c4fa for tests

Timestamp:

2007-07-01T14:52:45Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

19a8088

Parents:

f7b44f2 (diff), 348c11b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from Jelmer (mainly unit testing things).

Location:

tests

Files:

• Makefile (modified) (1 diff)
• check.c (modified) (4 diffs)
• check_crypting.c (added)
• check_help.c (added)
• check_set.c (added)
• check_user.c (added)
• check_util.c (modified) (3 diffs)
• testsuite.h (modified) (1 diff)

tests/Makefile

@@ -13 +13 @@
 main_objs = account.o bitlbee.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 
 
-test_objs = check.o check_util.o check_nick.o check_md5.o check_irc.o
+test_objs = check.o check_util.o check_nick.o check_md5.o check_irc.o check_help.o check_user.o check_crypting.o check_set.o
 
 check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o ../lib/lib.o

tests/check.c

@@ -21 +21 @@
 }
 
+irc_t *torture_irc(void)
+{
+        irc_t *irc;
+        GIOChannel *ch1, *ch2;
+        if (!g_io_channel_pair(&ch1, &ch2))
+                return NULL;
+        irc = irc_new(g_io_channel_unix_get_fd(ch1));
+        return irc;
+}
+
 double gettime()
 {
@@ -40 +50 @@
 /* From check_irc.c */
 Suite *irc_suite(void);
+
+/* From check_help.c */
+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);
 
 int main (int argc, char **argv)
@@ -67 +89 @@
         if (verbose) {
                 log_link( LOGLVL_ERROR, LOGOUTPUT_CONSOLE );
+#ifdef DEBUG
                 log_link( LOGLVL_DEBUG, LOGOUTPUT_CONSOLE );
+#endif
                 log_link( LOGLVL_INFO, LOGOUTPUT_CONSOLE );
                 log_link( LOGLVL_WARNING, LOGOUTPUT_CONSOLE );
@@ -79 +103 @@
         srunner_add_suite(sr, md5_suite());
         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());
         if (no_fork)
                 srunner_set_fork_status(sr, CK_NOFORK);

tests/check_util.c

@@ -7 +7 @@
 #include "set.h"
 #include "misc.h"
+#include "url.h"
 
 START_TEST(test_strip_linefeed)
@@ -43 +44 @@
 END_TEST
 
+START_TEST(test_set_url_http)
+        url_t url;
+        
+        fail_if (0 == url_set(&url, "http://host/"));
+        fail_unless (!strcmp(url.host, "host"));
+        fail_unless (!strcmp(url.file, "/"));
+        fail_unless (!strcmp(url.user, ""));
+        fail_unless (!strcmp(url.pass, ""));
+        fail_unless (url.proto == PROTO_HTTP);
+        fail_unless (url.port == 80);
+END_TEST
+
+START_TEST(test_set_url_https)
+        url_t url;
+        
+        fail_if (0 == url_set(&url, "https://ahost/AimeeMann"));
+        fail_unless (!strcmp(url.host, "ahost"));
+        fail_unless (!strcmp(url.file, "/AimeeMann"));
+        fail_unless (!strcmp(url.user, ""));
+        fail_unless (!strcmp(url.pass, ""));
+        fail_unless (url.proto == PROTO_HTTPS);
+        fail_unless (url.port == 443);
+END_TEST
+
+START_TEST(test_set_url_port)
+        url_t url;
+        
+        fail_if (0 == url_set(&url, "https://ahost:200/Lost/In/Space"));
+        fail_unless (!strcmp(url.host, "ahost"));
+        fail_unless (!strcmp(url.file, "/Lost/In/Space"));
+        fail_unless (!strcmp(url.user, ""));
+        fail_unless (!strcmp(url.pass, ""));
+        fail_unless (url.proto == PROTO_HTTPS);
+        fail_unless (url.port == 200);
+END_TEST
+
+START_TEST(test_set_url_username)
+        url_t url;
+        
+        fail_if (0 == url_set(&url, "socks4://user@ahost/Space"));
+        fail_unless (!strcmp(url.host, "ahost"));
+        fail_unless (!strcmp(url.file, "/Space"));
+        fail_unless (!strcmp(url.user, "user"));
+        fail_unless (!strcmp(url.pass, ""));
+        fail_unless (url.proto == PROTO_SOCKS4);
+        fail_unless (url.port == 1080);
+END_TEST
+
+START_TEST(test_set_url_username_pwd)
+        url_t url;
+        
+        fail_if (0 == url_set(&url, "socks5://user:pass@ahost/"));
+        fail_unless (!strcmp(url.host, "ahost"));
+        fail_unless (!strcmp(url.file, "/"));
+        fail_unless (!strcmp(url.user, "user"));
+        fail_unless (!strcmp(url.pass, "pass"));
+        fail_unless (url.proto == PROTO_SOCKS5);
+        fail_unless (url.port == 1080);
+END_TEST
+
 Suite *util_suite (void)
 {
@@ -50 +111 @@
         tcase_add_test (tc_core, test_strip_linefeed);
         tcase_add_test (tc_core, test_strip_newlines);
+        tcase_add_test (tc_core, test_set_url_http);
+        tcase_add_test (tc_core, test_set_url_https);
+        tcase_add_test (tc_core, test_set_url_port);
+        tcase_add_test (tc_core, test_set_url_username);
+        tcase_add_test (tc_core, test_set_url_username_pwd);
         return s;
 }

tests/testsuite.h

@@ -2 +2 @@
 #define __BITLBEE_CHECK_H__ 
 
+#include "irc.h"
+
+irc_t *torture_irc(void);
 gboolean g_io_channel_pair(GIOChannel **ch1, GIOChannel **ch2);