Changeset 7bee5af

Timestamp:

2006-12-24T21:47:18Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

ed5df81

Parents:

c227706

Message:

Add tests for set_url(). Fixed a bug where the default port wasn't
set when socks5 was used.

Files:

• lib/url.c (modified) (1 diff)
• set.h (modified) (2 diffs)
• tests/check_util.c (modified) (3 diffs)

lib/url.c

@@ -100 +100 @@
                 else if( url->proto == PROTO_HTTPS )
                         url->port = 443;
-                else if( url->proto == PROTO_SOCKS4 || url->proto == PROTO_SOCKS4 )
+                else if( url->proto == PROTO_SOCKS4 || url->proto == PROTO_SOCKS5 )
                         url->port = 1080;
         }

set.h

@@ -23 +23 @@
   Suite 330, Boston, MA  02111-1307  USA
 */
+
+#ifndef __SET_H__
+#define __SET_H__
 
 /* This used to be specific to irc_t structures, but it's more generic now
@@ -88 +91 @@
 char *set_eval_ops( set_t *set, char *value );
 char *set_eval_charset( set_t *set, char *value );
+
+#endif /* __SET_H__ */

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;
 }