diff options
author | akira <akira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-10 09:34:49 +0000 |
---|---|---|
committer | akira <akira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-10 09:34:49 +0000 |
commit | 3da03397ce1dca2eaf21149dcdc88a212b6afdc2 (patch) | |
tree | f0221b0fc3f567ef4e5cc2684f4d1a652f806f53 /test/uri | |
parent | 0bedb3e5b1e80b5fdac2086f9b0c54df56f7313b (diff) | |
download | ruby-3da03397ce1dca2eaf21149dcdc88a212b6afdc2.tar.gz |
* lib/uri/common.rb (URI::Parser): new class.
* lib/uri/mailto.rb, lib/uri/generic.rb: follow the above change.
* test/uri/test_parser.rb: added tests for URI::Parser.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19282 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/uri')
-rw-r--r-- | test/uri/test_generic.rb | 101 | ||||
-rw-r--r-- | test/uri/test_parser.rb | 41 |
2 files changed, 71 insertions, 71 deletions
diff --git a/test/uri/test_generic.rb b/test/uri/test_generic.rb index 6661b4a5d2..e8024c8bf2 100644 --- a/test/uri/test_generic.rb +++ b/test/uri/test_generic.rb @@ -39,6 +39,17 @@ class URI::TestGeneric < Test::Unit::TestCase ] ary = uri_to_ary(url) assert_equal(exp, ary) + # 1' + url = URI.parse('ftp://ftp.is.co.za/%2Frfc/rfc1808.txt') + assert_kind_of(URI::FTP, url) + + exp = [ + 'ftp', + nil, 'ftp.is.co.za', URI::FTP.default_port, + '/rfc/rfc1808.txt', nil, + ] + ary = uri_to_ary(url) + assert_equal(exp, ary) # 2 url = URI.parse('gopher://spinaltap.micro.umn.edu/00/Weather/California/Los%20Angeles') @@ -230,7 +241,7 @@ class URI::TestGeneric < Test::Unit::TestCase assert_equal('', url.to_s) end - def test_rfc2396_examples + def test_rfc3986_examples # http://a/b/c/d;p?q # g:h = g:h url = @base_url.merge('g:h') @@ -306,11 +317,11 @@ class URI::TestGeneric < Test::Unit::TestCase assert_equal('g?y', url.to_s) # http://a/b/c/d;p?q -# #s = (current document)#s +# #s = http://a/b/c/d;p?q#s url = @base_url.merge('#s') assert_kind_of(URI::HTTP, url) - assert_equal(@base_url.to_s + '#s', url.to_s) - url = @base_url.route_to(@base_url.to_s + '#s') + assert_equal('http://a/b/c/d;p?q#s', url.to_s) + url = @base_url.route_to('http://a/b/c/d;p?q#s') assert_kind_of(URI::Generic, url) assert_equal('#s', url.to_s) @@ -448,18 +459,18 @@ class URI::TestGeneric < Test::Unit::TestCase url = @base_url.merge('/./g') assert_kind_of(URI::HTTP, url) assert_equal('http://a/g', url.to_s) - url = @base_url.route_to('http://a/./g') - assert_kind_of(URI::Generic, url) - assert_equal('/./g', url.to_s) +# url = @base_url.route_to('http://a/./g') +# assert_kind_of(URI::Generic, url) +# assert_equal('/./g', url.to_s) # http://a/b/c/d;p?q -# /../g = http://a/../g +# /../g = http://a/g url = @base_url.merge('/../g') assert_kind_of(URI::HTTP, url) assert_equal('http://a/g', url.to_s) - url = @base_url.route_to('http://a/../g') - assert_kind_of(URI::Generic, url) - assert_equal('/../g', url.to_s) +# url = @base_url.route_to('http://a/../g') +# assert_kind_of(URI::Generic, url) +# assert_equal('/../g', url.to_s) # http://a/b/c/d;p?q # g. = http://a/b/c/g. @@ -502,20 +513,20 @@ class URI::TestGeneric < Test::Unit::TestCase url = @base_url.merge('../../../g') assert_kind_of(URI::HTTP, url) assert_equal('http://a/g', url.to_s) - url = @base_url.route_to('http://a/../g') + url = @base_url.route_to('http://a/g') assert_kind_of(URI::Generic, url) - assert('../../../g' != url.to_s) # ok? yes, it confuses you - assert_equal('/../g', url.to_s) # and it is clearly + assert('../../../g' != url.to_s) # ok? yes, it confuses you + assert_equal('../../g', url.to_s) # and it is clearly # http://a/b/c/d;p?q -# ../../../../g = http://a/../../g +# ../../../../g = http://a/g url = @base_url.merge('../../../../g') assert_kind_of(URI::HTTP, url) assert_equal('http://a/g', url.to_s) - url = @base_url.route_to('http://a/../../g') + url = @base_url.route_to('http://a/g') assert_kind_of(URI::Generic, url) assert('../../../../g' != url.to_s) # ok? yes, it confuses you - assert_equal('/../../g', url.to_s) # and it is clearly + assert_equal('../../g', url.to_s) # and it is clearly # http://a/b/c/d;p?q # ./../g = http://a/b/g @@ -644,9 +655,10 @@ class URI::TestGeneric < Test::Unit::TestCase assert_equal(URI.parse('http://foo/hoge'), URI.join('http://foo', 'bar/baz', '/hoge')) end + # ruby-dev:16728 def test_set_component uri = URI.parse('http://foo:bar@baz') - assert_equal('oof', uri.user = 'oof', "[ruby-dev:16728]") + assert_equal('oof', uri.user = 'oof') assert_equal('http://oof:bar@baz', uri.to_s) assert_equal('rab', uri.password = 'rab') assert_equal('http://oof:rab@baz', uri.to_s) @@ -683,57 +695,4 @@ class URI::TestGeneric < Test::Unit::TestCase assert_raises(URI::InvalidURIError) { uri.path = 'bar' } assert_raises(URI::InvalidURIError) { uri.query = 'bar' } end - - def m(s) - @base_url.merge(s).to_s -end - - def test_rfc3986_examples - assert_equal("g:h", m("g:h")) - assert_equal("http://a/b/c/g", m("g")) - assert_equal("http://a/b/c/g", m("./g")) - assert_equal("http://a/b/c/g/", m("g/")) - assert_equal("http://a/g", m("/g")) - assert_equal("http://g", m("//g")) - assert_equal("http://a/b/c/d;p?y", m("?y")) - assert_equal("http://a/b/c/g?y", m("g?y")) - assert_equal("http://a/b/c/d;p?q#s", m("#s")) - assert_equal("http://a/b/c/g#s", m("g#s")) - assert_equal("http://a/b/c/g?y#s", m("g?y#s")) - assert_equal("http://a/b/c/;x", m(";x")) - assert_equal("http://a/b/c/g;x", m("g;x")) - assert_equal("http://a/b/c/g;x?y#s", m("g;x?y#s")) - assert_equal("http://a/b/c/d;p?q", m("")) - assert_equal("http://a/b/c/", m(".")) - assert_equal("http://a/b/c/", m("./")) - assert_equal("http://a/b/", m("..")) - assert_equal("http://a/b/", m("../")) - assert_equal("http://a/b/g", m("../g")) - assert_equal("http://a/", m("../..")) - assert_equal("http://a/", m("../../")) - assert_equal("http://a/g", m("../../g")) - assert_equal("http://a/g", m("../../../g")) - assert_equal("http://a/g", m("../../../../g")) - - assert_equal("http://a/g", m("/./g")) - assert_equal("http://a/g", m("/../g")) - assert_equal("http://a/b/c/g.", m("g.")) - assert_equal("http://a/b/c/.g", m(".g")) - assert_equal("http://a/b/c/g..", m("g..")) - assert_equal("http://a/b/c/..g", m("..g")) - - assert_equal("http://a/b/g", m("./../g")) - assert_equal("http://a/b/c/g/", m("./g/.")) - assert_equal("http://a/b/c/g/h", m("g/./h")) - assert_equal("http://a/b/c/h", m("g/../h")) - assert_equal("http://a/b/c/g;x=1/y", m("g;x=1/./y")) - assert_equal("http://a/b/c/y", m("g;x=1/../y")) - - assert_equal("http://a/b/c/g?y/./x", m("g?y/./x")) - assert_equal("http://a/b/c/g?y/../x", m("g?y/../x")) - assert_equal("http://a/b/c/g#s/./x", m("g#s/./x")) - assert_equal("http://a/b/c/g#s/../x", m("g#s/../x")) - - assert_equal("http:g", m("http:g")) - end end diff --git a/test/uri/test_parser.rb b/test/uri/test_parser.rb new file mode 100644 index 0000000000..adf8a1292c --- /dev/null +++ b/test/uri/test_parser.rb @@ -0,0 +1,41 @@ +require 'test/unit' +require 'uri' + +class URI::TestParser < Test::Unit::TestCase + def uri_to_ary(uri) + uri.class.component.collect {|c| uri.send(c)} + end + + def test_compare + url = 'http://a/b/c/d;p?q' + u0 = URI.parse(url) + u1 = URI.parse(url) + p = URI::Parser.new + u2 = p.parse(url) + u3 = p.parse(url) + + assert(u0 == u1) + assert(u0.eql?(u1)) + assert(!u0.equal?(u1)) + + assert(u1 == u2) + assert(!u1.eql?(u2)) + assert(!u1.equal?(u2)) + + assert(u2 == u3) + assert(u2.eql?(u3)) + assert(!u2.equal?(u3)) + end + + def test_parse + escaped = URI::REGEXP::PATTERN::ESCAPED + hex = URI::REGEXP::PATTERN::HEX + p1 = URI::Parser.new(:ESCAPED => "(?:#{escaped}|%u[#{hex}]{4})") + u1 = p1.parse('http://a/b/%uABCD') + assert_equal(['http', nil, 'a', URI::HTTP.default_port, '/b/%uABCD', nil, nil], + uri_to_ary(u1)) + u1.path = '/%uDCBA' + assert_equal(['http', nil, 'a', URI::HTTP.default_port, '/%uDCBA', nil, nil], + uri_to_ary(u1)) + end +end |