Merge tag 'upstream/2013.12.04'

[youtubedl] / test / test_utils.py

diff --git a/test/test_utils.py b/test/test_utils.py
index ff2e9885bdba233699edd69457aed91de35c8708..e9e590e749f131a0950c79bcf4fee1e9fb9004c2 100644 (file)
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -1,14 +1,15 @@
 #!/usr/bin/env python
 #!/usr/bin/env python

+# coding: utf-8

 
 

-# Various small unit tests
-
+# Allow direct execution
+import os

 import sys
 import unittest
 import sys
 import unittest

-import xml.etree.ElementTree
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))

 
 

-# Allow direct execution
-import os
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+# Various small unit tests
+import xml.etree.ElementTree

 
 #from youtube_dl.utils import htmlentity_transform
 from youtube_dl.utils import (
 
 #from youtube_dl.utils import htmlentity_transform
 from youtube_dl.utils import (


@@ -20,6 +21,11 @@ from youtube_dl.utils import (
     unified_strdate,
     find_xpath_attr,
     get_meta_content,
     unified_strdate,
     find_xpath_attr,
     get_meta_content,

+    xpath_with_ns,
+    smuggle_url,
+    unsmuggle_url,
+    shell_quote,
+    encodeFilename,

 )
 
 if sys.version_info < (3, 0):
 )
 
 if sys.version_info < (3, 0):


@@ -141,5 +147,35 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(get_meta('description'), u'foo & bar')
         self.assertEqual(get_meta('author'), 'Plato')
 
         self.assertEqual(get_meta('description'), u'foo & bar')
         self.assertEqual(get_meta('author'), 'Plato')
 

+    def test_xpath_with_ns(self):
+        testxml = u'''<root xmlns:media="http://example.com/">
+            <media:song>
+                <media:author>The Author</media:author>
+                <url>http://server.com/download.mp3</url>
+            </media:song>
+        </root>'''
+        doc = xml.etree.ElementTree.fromstring(testxml)
+        find = lambda p: doc.find(xpath_with_ns(p, {'media': 'http://example.com/'}))
+        self.assertTrue(find('media:song') is not None)
+        self.assertEqual(find('media:song/media:author').text, u'The Author')
+        self.assertEqual(find('media:song/url').text, u'http://server.com/download.mp3')
+
+    def test_smuggle_url(self):
+        data = {u"ö": u"ö", u"abc": [3]}
+        url = 'https://foo.bar/baz?x=y#a'
+        smug_url = smuggle_url(url, data)
+        unsmug_url, unsmug_data = unsmuggle_url(smug_url)
+        self.assertEqual(url, unsmug_url)
+        self.assertEqual(data, unsmug_data)
+
+        res_url, res_data = unsmuggle_url(url)
+        self.assertEqual(res_url, url)
+        self.assertEqual(res_data, None)
+
+    def test_shell_quote(self):
+        args = ['ffmpeg', '-i', encodeFilename(u'ñ€ß\'.mp4')]
+        self.assertEqual(shell_quote(args), u"""ffmpeg -i 'ñ€ß'"'"'.mp4'""")
+
+

 if __name__ == '__main__':
     unittest.main()
 if __name__ == '__main__':
     unittest.main()