mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-16 00:30:21 +02:00
Code Activity

rename string->uri and uri->string.

Browse source 
* module/web/uri.scm (string->uri, uri->string): Rename from parse-uri
  and unparse-uri.

* test-suite/tests/web-uri.test:
* module/web/http.scm: All callers changed.
This commit is contained in:
Andy Wingo 2010-12-31 12:44:11 -05:00
parent b3f9444892
commit 8745c33afb
3 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

36
test-suite/tests/web-uri.test
View file

@ -107,25 +107,25 @@
(build-uri 'http #:userinfo "foo")))
(with-test-prefix "parse-uri"
(with-test-prefix "string->uri"
(pass-if "ftp:"
(uri=? (parse-uri "ftp:")
(uri=? (string->uri "ftp:")
#:scheme 'ftp
#:path ""))
(pass-if "ftp:foo"
(uri=? (parse-uri "ftp:foo")
(uri=? (string->uri "ftp:foo")
#:scheme 'ftp
#:path "foo"))
(pass-if "ftp://foo/bar"
(uri=? (parse-uri "ftp://foo/bar")
(uri=? (string->uri "ftp://foo/bar")
#:scheme 'ftp
#:host "foo"
#:path "/bar"))
(pass-if "ftp://foo@bar:22/baz"
(uri=? (parse-uri "ftp://foo@bar:22/baz")
(uri=? (string->uri "ftp://foo@bar:22/baz")
#:scheme 'ftp
#:userinfo "foo"
#:host "bar"
@ -133,49 +133,49 @@
#:path "/baz"))
(pass-if "http://bad.host.1"
(not (parse-uri "http://bad.host.1")))
(not (string->uri "http://bad.host.1")))
(pass-if "http://foo:"
(uri=? (parse-uri "http://foo:")
(uri=? (string->uri "http://foo:")
#:scheme 'http #:host "foo" #:path ""))
(pass-if "http://foo:/"
(uri=? (parse-uri "http://foo:/")
(uri=? (string->uri "http://foo:/")
#:scheme 'http #:host "foo" #:path "/"))
(pass-if "http://foo:not-a-port"
(not (parse-uri "http://foo:not-a-port")))
(not (string->uri "http://foo:not-a-port")))
(pass-if "http://:10"
(not (parse-uri "http://:10")))
(not (string->uri "http://:10")))
(pass-if "http://foo@"
(not (parse-uri "http://foo@"))))
(not (string->uri "http://foo@"))))
(with-test-prefix "unparse-uri"
(with-test-prefix "uri->string"
(pass-if "ftp:"
(equal? "ftp:"
(unparse-uri (parse-uri "ftp:"))))
(uri->string (string->uri "ftp:"))))
(pass-if "ftp:foo"
(equal? "ftp:foo"
(unparse-uri (parse-uri "ftp:foo"))))
(uri->string (string->uri "ftp:foo"))))
(pass-if "ftp://foo/bar"
(equal? "ftp://foo/bar"
(unparse-uri (parse-uri "ftp://foo/bar"))))
(uri->string (string->uri "ftp://foo/bar"))))
(pass-if "ftp://foo@bar:22/baz"
(equal? "ftp://foo@bar:22/baz"
(unparse-uri (parse-uri "ftp://foo@bar:22/baz"))))
(uri->string (string->uri "ftp://foo@bar:22/baz"))))
(pass-if "http://foo:"
(equal? "http://foo"
(unparse-uri (parse-uri "http://foo:"))))
(uri->string (string->uri "http://foo:"))))
(pass-if "http://foo:/"
(equal? "http://foo/"
(unparse-uri (parse-uri "http://foo:/")))))
(uri->string (string->uri "http://foo:/")))))
(with-test-prefix "decode"
(pass-if (equal? "foo bar" (uri-decode "foo%20bar"))))