Merge pull request #4076 from ghedo/direct_type

[youtube-dl] / test / test_utils.py
diff --git a/test/test_utils.py b/test/test_utils.py

index 3efbed29dd34de570f2db4e6eb4954ec2f4b9c6e..e59547784578e8ed7eef6b88c571629c44ccec43 100644 (file)
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -20,9 +20,9 @@ from youtube_dl.utils import (
      encodeFilename,
      find_xpath_attr,
      fix_xml_ampersands,
-    get_meta_content,
      orderedSet,
-    PagedList,
+    OnDemandPagedList,
+    InAdvancePagedList,
      parse_duration,
      read_batch_urls,
      sanitize_filename,
@@ -43,6 +43,8 @@ from youtube_dl.utils import (
      limit_length,
      escape_rfc3986,
      escape_url,
+    js_to_json,
+    get_filesystem_encoding,
  )
  
  
@@ -137,6 +139,7 @@ class TestUtil(unittest.TestCase):
          self.assertEqual(unified_strdate('Dec 14, 2012'), '20121214')
          self.assertEqual(unified_strdate('2012/10/11 01:56:38 +0000'), '20121011')
          self.assertEqual(unified_strdate('1968-12-10'), '19681210')
+        self.assertEqual(unified_strdate('28/01/2014 21:00:00 +0100'), '20140128')
  
      def test_find_xpath_attr(self):
          testxml = '''<root>
@@ -151,17 +154,6 @@ class TestUtil(unittest.TestCase):
          self.assertEqual(find_xpath_attr(doc, './/node', 'x', 'a'), doc[1])
          self.assertEqual(find_xpath_attr(doc, './/node', 'y', 'c'), doc[2])
  
-    def test_meta_parser(self):
-        testhtml = '''
-        <head>
-            <meta name="description" content="foo &amp; bar">
-            <meta content='Plato' name='author'/>
-        </head>
-        '''
-        get_meta = lambda name: get_meta_content(name, testhtml)
-        self.assertEqual(get_meta('description'), 'foo & bar')
-        self.assertEqual(get_meta('author'), 'Plato')
-
      def test_xpath_with_ns(self):
          testxml = '''<root xmlns:media="http://example.com/">
              <media:song>
@@ -246,10 +238,14 @@ class TestUtil(unittest.TestCase):
                  for i in range(firstid, upto):
                      yield i
  
-            pl = PagedList(get_page, pagesize)
+            pl = OnDemandPagedList(get_page, pagesize)
              got = pl.getslice(*sliceargs)
              self.assertEqual(got, expected)
  
+            iapl = InAdvancePagedList(get_page, size // pagesize + 1, pagesize)
+            got = iapl.getslice(*sliceargs)
+            self.assertEqual(got, expected)
+
          testPL(5, 2, (), [0, 1, 2, 3, 4])
          testPL(5, 2, (1,), [1, 2, 3, 4])
          testPL(5, 2, (2,), [2, 3, 4])
@@ -279,6 +275,7 @@ class TestUtil(unittest.TestCase):
          self.assertEqual(parse_iso8601('2014-03-23T23:04:26+0100'), 1395612266)
          self.assertEqual(parse_iso8601('2014-03-23T22:04:26+0000'), 1395612266)
          self.assertEqual(parse_iso8601('2014-03-23T22:04:26Z'), 1395612266)
+        self.assertEqual(parse_iso8601('2014-03-23T22:04:26.1234Z'), 1395612266)
  
      def test_strip_jsonp(self):
          stripped = strip_jsonp('cb ([ {"id":"532cb",\n\n\n"x":\n3}\n]\n);')
@@ -325,5 +322,28 @@ class TestUtil(unittest.TestCase):
          )
          self.assertEqual(escape_url('http://vimeo.com/56015672#at=0'), 'http://vimeo.com/56015672#at=0')
  
+    def test_js_to_json_realworld(self):
+        inp = '''{
+            'clip':{'provider':'pseudo'}
+        }'''
+        self.assertEqual(js_to_json(inp), '''{
+            "clip":{"provider":"pseudo"}
+        }''')
+        json.loads(js_to_json(inp))
+
+        inp = '''{
+            'playlist':[{'controls':{'all':null}}]
+        }'''
+        self.assertEqual(js_to_json(inp), '''{
+            "playlist":[{"controls":{"all":null}}]
+        }''')
+
+    def test_js_to_json_edgecases(self):
+        on = js_to_json("{abc_def:'1\\'\\\\2\\\\\\'3\"4'}")
+        self.assertEqual(json.loads(on), {"abc_def": "1'\\2\\'3\"4"})
+
+        on = js_to_json('{"abc": true}')
+        self.assertEqual(json.loads(on), {'abc': True})
+
  if __name__ == '__main__':
      unittest.main()