Merged revisions 80908 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r80908 | senthil.kumaran | 2010-05-07 09:37:29 +0530 (Fri, 07 May 2010) | 3 lines Testsuite for RFC3986 based parsing scenario. Related Issue1462525. ........
This commit is contained in:
parent
2f9134b11d
commit
cdf48a8ec2
|
@ -6,7 +6,7 @@ import urlparse
|
||||||
|
|
||||||
RFC1808_BASE = "http://a/b/c/d;p?q#f"
|
RFC1808_BASE = "http://a/b/c/d;p?q#f"
|
||||||
RFC2396_BASE = "http://a/b/c/d;p?q"
|
RFC2396_BASE = "http://a/b/c/d;p?q"
|
||||||
RFC3986_BASE = "http://a/b/c/d;p?q"
|
RFC3986_BASE = 'http://a/b/c/d;p?q'
|
||||||
|
|
||||||
# A list of test cases. Each test case is a a two-tuple that contains
|
# A list of test cases. Each test case is a a two-tuple that contains
|
||||||
# a string with the query and a dictionary with the expected result.
|
# a string with the query and a dictionary with the expected result.
|
||||||
|
@ -231,13 +231,60 @@ class UrlParseTestCase(unittest.TestCase):
|
||||||
self.checkJoin(RFC2396_BASE, 'g#s/./x', 'http://a/b/c/g#s/./x')
|
self.checkJoin(RFC2396_BASE, 'g#s/./x', 'http://a/b/c/g#s/./x')
|
||||||
self.checkJoin(RFC2396_BASE, 'g#s/../x', 'http://a/b/c/g#s/../x')
|
self.checkJoin(RFC2396_BASE, 'g#s/../x', 'http://a/b/c/g#s/../x')
|
||||||
|
|
||||||
#The following scenarios have been updated in RFC3986
|
|
||||||
#self.checkJoin(RFC2396_BASE, '?y', 'http://a/b/c/?y')
|
|
||||||
#self.checkJoin(RFC2396_BASE, ';x', 'http://a/b/c/;x')
|
|
||||||
|
|
||||||
def test_RFC3986(self):
|
def test_RFC3986(self):
|
||||||
|
# Test cases from RFC3986
|
||||||
self.checkJoin(RFC3986_BASE, '?y','http://a/b/c/d;p?y')
|
self.checkJoin(RFC3986_BASE, '?y','http://a/b/c/d;p?y')
|
||||||
self.checkJoin(RFC2396_BASE, ';x', 'http://a/b/c/;x')
|
self.checkJoin(RFC2396_BASE, ';x', 'http://a/b/c/;x')
|
||||||
|
self.checkJoin(RFC3986_BASE, 'g:h','g:h')
|
||||||
|
self.checkJoin(RFC3986_BASE, 'g','http://a/b/c/g')
|
||||||
|
self.checkJoin(RFC3986_BASE, './g','http://a/b/c/g')
|
||||||
|
self.checkJoin(RFC3986_BASE, 'g/','http://a/b/c/g/')
|
||||||
|
self.checkJoin(RFC3986_BASE, '/g','http://a/g')
|
||||||
|
self.checkJoin(RFC3986_BASE, '//g','http://g')
|
||||||
|
self.checkJoin(RFC3986_BASE, '?y','http://a/b/c/d;p?y')
|
||||||
|
self.checkJoin(RFC3986_BASE, 'g?y','http://a/b/c/g?y')
|
||||||
|
self.checkJoin(RFC3986_BASE, '#s','http://a/b/c/d;p?q#s')
|
||||||
|
self.checkJoin(RFC3986_BASE, 'g#s','http://a/b/c/g#s')
|
||||||
|
self.checkJoin(RFC3986_BASE, 'g?y#s','http://a/b/c/g?y#s')
|
||||||
|
self.checkJoin(RFC3986_BASE, ';x','http://a/b/c/;x')
|
||||||
|
self.checkJoin(RFC3986_BASE, 'g;x','http://a/b/c/g;x')
|
||||||
|
self.checkJoin(RFC3986_BASE, 'g;x?y#s','http://a/b/c/g;x?y#s')
|
||||||
|
self.checkJoin(RFC3986_BASE, '','http://a/b/c/d;p?q')
|
||||||
|
self.checkJoin(RFC3986_BASE, '.','http://a/b/c/')
|
||||||
|
self.checkJoin(RFC3986_BASE, './','http://a/b/c/')
|
||||||
|
self.checkJoin(RFC3986_BASE, '..','http://a/b/')
|
||||||
|
self.checkJoin(RFC3986_BASE, '../','http://a/b/')
|
||||||
|
self.checkJoin(RFC3986_BASE, '../g','http://a/b/g')
|
||||||
|
self.checkJoin(RFC3986_BASE, '../..','http://a/')
|
||||||
|
self.checkJoin(RFC3986_BASE, '../../','http://a/')
|
||||||
|
self.checkJoin(RFC3986_BASE, '../../g','http://a/g')
|
||||||
|
|
||||||
|
#Abnormal Examples
|
||||||
|
|
||||||
|
# The 'abnormal scenarios' are incompatible with RFC2986 parsing
|
||||||
|
# Tests are here for reference.
|
||||||
|
|
||||||
|
#self.checkJoin(RFC3986_BASE, '../../../g','http://a/g')
|
||||||
|
#self.checkJoin(RFC3986_BASE, '../../../../g','http://a/g')
|
||||||
|
#self.checkJoin(RFC3986_BASE, '/./g','http://a/g')
|
||||||
|
#self.checkJoin(RFC3986_BASE, '/../g','http://a/g')
|
||||||
|
|
||||||
|
self.checkJoin(RFC3986_BASE, 'g.','http://a/b/c/g.')
|
||||||
|
self.checkJoin(RFC3986_BASE, '.g','http://a/b/c/.g')
|
||||||
|
self.checkJoin(RFC3986_BASE, 'g..','http://a/b/c/g..')
|
||||||
|
self.checkJoin(RFC3986_BASE, '..g','http://a/b/c/..g')
|
||||||
|
self.checkJoin(RFC3986_BASE, './../g','http://a/b/g')
|
||||||
|
self.checkJoin(RFC3986_BASE, './g/.','http://a/b/c/g/')
|
||||||
|
self.checkJoin(RFC3986_BASE, 'g/./h','http://a/b/c/g/h')
|
||||||
|
self.checkJoin(RFC3986_BASE, 'g/../h','http://a/b/c/h')
|
||||||
|
self.checkJoin(RFC3986_BASE, 'g;x=1/./y','http://a/b/c/g;x=1/y')
|
||||||
|
self.checkJoin(RFC3986_BASE, 'g;x=1/../y','http://a/b/c/y')
|
||||||
|
self.checkJoin(RFC3986_BASE, 'g?y/./x','http://a/b/c/g?y/./x')
|
||||||
|
self.checkJoin(RFC3986_BASE, 'g?y/../x','http://a/b/c/g?y/../x')
|
||||||
|
self.checkJoin(RFC3986_BASE, 'g#s/./x','http://a/b/c/g#s/./x')
|
||||||
|
self.checkJoin(RFC3986_BASE, 'g#s/../x','http://a/b/c/g#s/../x')
|
||||||
|
#self.checkJoin(RFC3986_BASE, 'http:g','http:g') # strict parser
|
||||||
|
self.checkJoin(RFC3986_BASE, 'http:g','http://a/b/c/g') #relaxed parser
|
||||||
|
|
||||||
def test_urldefrag(self):
|
def test_urldefrag(self):
|
||||||
for url, defrag, frag in [
|
for url, defrag, frag in [
|
||||||
|
|
Loading…
Reference in New Issue