1 files changed, 53 insertions, 5 deletions
diff --git a/test/test_util.py b/test/test_util.py
index 9d5eb056..a989da65 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -1,6 +1,8 @@
 import unittest
+import logging
 
-from urllib3.util import get_host, make_headers, split_first
+from urllib3 import add_stderr_logger
+from urllib3.util import get_host, make_headers, split_first, parse_url, Url
 from urllib3.exceptions import LocationParseError
 
 
@@ -60,6 +62,42 @@ class TestUtil(unittest.TestCase):
         for location in invalid_host:
             self.assertRaises(LocationParseError, get_host, location)
 
+    def test_parse_url(self):
+        url_host_map = {
+            'http://google.com/mail': Url('http', host='google.com', path='/mail'),
+            'http://google.com/mail/': Url('http', host='google.com', path='/mail/'),
+            'google.com/mail': Url(host='google.com', path='/mail'),
+            'http://google.com/': Url('http', host='google.com', path='/'),
+            'http://google.com': Url('http', host='google.com'),
+            'http://google.com?foo': Url('http', host='google.com', path='', query='foo'),
+            '': Url(),
+            '/': Url(path='/'),
+            '?': Url(path='', query=''),
+            '#': Url(path='', fragment=''),
+            '#?/!google.com/?foo#bar': Url(path='', fragment='?/!google.com/?foo#bar'),
+            '/foo': Url(path='/foo'),
+            '/foo?bar=baz': Url(path='/foo', query='bar=baz'),
+            '/foo?bar=baz#banana?apple/orange': Url(path='/foo', query='bar=baz', fragment='banana?apple/orange'),
+        }
+        for url, expected_url in url_host_map.items():
+            returned_url = parse_url(url)
+            self.assertEquals(returned_url, expected_url)
+
+    def test_request_uri(self):
+        url_host_map = {
+            'http://google.com/mail': '/mail',
+            'http://google.com/mail/': '/mail/',
+            'http://google.com/': '/',
+            'http://google.com': '/',
+            '': '/',
+            '/': '/',
+            '?': '/?',
+            '#': '/',
+            '/foo?bar=baz': '/foo?bar=baz',
+        }
+        for url, expected_request_uri in url_host_map.items():
+            returned_url = parse_url(url)
+            self.assertEquals(returned_url.request_uri, expected_request_uri)
 
     def test_make_headers(self):
         self.assertEqual(
@@ -93,10 +131,20 @@ class TestUtil(unittest.TestCase):
 
     def test_split_first(self):
         test_cases = {
-            ('abcd', 'b'): ('a', 'cd'),
-            ('abcd', 'cb'): ('a', 'cd'),
-            ('abcd', ''): ('abcd', ''),
+            ('abcd', 'b'): ('a', 'cd', 'b'),
+            ('abcd', 'cb'): ('a', 'cd', 'b'),
+            ('abcd', ''): ('abcd', '', None),
+            ('abcd', 'a'): ('', 'bcd', 'a'),
+            ('abcd', 'ab'): ('', 'bcd', 'a'),
         }
-        for input, expected in test_cases.iteritems():
+        for input, expected in test_cases.items():
             output = split_first(*input)
             self.assertEqual(output, expected)
+
+    def test_add_stderr_logger(self):
+        handler = add_stderr_logger(level=logging.INFO) # Don't actually print debug
+        logger = logging.getLogger('urllib3')
+        self.assertTrue(handler in logger.handlers)
+
+        logger.debug('Testing add_stderr_logger')
+        logger.removeHandler(handler)