Merge branch 'ping-viki-shows'

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

index 032d3656ae21ec733a11d946e52693ebd560af16..e13e11b59f7f427e8c082f003c650268895ef6f3 100644 (file)
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -40,7 +40,6 @@ from youtube_dl.utils import (
      read_batch_urls,
      sanitize_filename,
      sanitize_path,
-    sanitize_url_path_consecutive_slashes,
      prepend_extension,
      replace_extension,
      shell_quote,
@@ -176,26 +175,6 @@ class TestUtil(unittest.TestCase):
          self.assertEqual(sanitize_path('./abc'), 'abc')
          self.assertEqual(sanitize_path('./../abc'), '..\\abc')
  
-    def test_sanitize_url_path_consecutive_slashes(self):
-        self.assertEqual(
-            sanitize_url_path_consecutive_slashes('http://hostname/foo//bar/filename.html'),
-            'http://hostname/foo/bar/filename.html')
-        self.assertEqual(
-            sanitize_url_path_consecutive_slashes('http://hostname//foo/bar/filename.html'),
-            'http://hostname/foo/bar/filename.html')
-        self.assertEqual(
-            sanitize_url_path_consecutive_slashes('http://hostname//'),
-            'http://hostname/')
-        self.assertEqual(
-            sanitize_url_path_consecutive_slashes('http://hostname/foo/bar/filename.html'),
-            'http://hostname/foo/bar/filename.html')
-        self.assertEqual(
-            sanitize_url_path_consecutive_slashes('http://hostname/'),
-            'http://hostname/')
-        self.assertEqual(
-            sanitize_url_path_consecutive_slashes('http://hostname/abc//'),
-            'http://hostname/abc/')
-
      def test_prepend_extension(self):
          self.assertEqual(prepend_extension('abc.ext', 'temp'), 'abc.temp.ext')
          self.assertEqual(prepend_extension('abc.ext', 'temp', 'ext'), 'abc.temp.ext')
@@ -621,7 +600,7 @@ ffmpeg version 2.4.4 Copyright (c) 2000-2014 the FFmpeg ...'''), '2.4.4')
                  <div xml:lang="en">
                      <p begin="0" end="1">The following line contains Chinese characters and special symbols</p>
                      <p begin="1" end="2">第二行<br/>♪♪</p>
-                    <p begin="2" end="3"><span>Third<br/>Line</span></p>
+                    <p begin="2" dur="1"><span>Third<br/>Line</span></p>
                  </div>
              </body>
              </tt>'''
@@ -642,6 +621,21 @@ Line
  '''
          self.assertEqual(dfxp2srt(dfxp_data), srt_data)
  
+        dfxp_data_no_default_namespace = '''<?xml version="1.0" encoding="UTF-8"?>
+            <tt xml:lang="en" xmlns:tts="http://www.w3.org/ns/ttml#parameter">
+            <body>
+                <div xml:lang="en">
+                    <p begin="0" end="1">The first line</p>
+                </div>
+            </body>
+            </tt>'''
+        srt_data = '''1
+00:00:00,000 --> 00:00:01,000
+The first line
+
+'''
+        self.assertEqual(dfxp2srt(dfxp_data_no_default_namespace), srt_data)
+
  
  if __name__ == '__main__':
      unittest.main()