Merge remote-tracking branch 'chrisjrn/master'

[youtube-dl] / test / test_utils.py

diff --git a/test/test_utils.py b/test/test_utils.py
index e7c6d5b3d73342cf3b5544f287d358e32b9dde9d..4208ee653243562b53fc011329907d471e76b712 100644 (file)
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -22,19 +22,44 @@ class TestUtil(unittest.TestCase):
 
                self.assertEqual(sanitize_filename(u'123'), u'123')
 
-               self.assertEqual(u'abc-de', sanitize_filename(u'abc/de'))
+               self.assertEqual(u'abc_de', sanitize_filename(u'abc/de'))
                self.assertFalse(u'/' in sanitize_filename(u'abc/de///'))
 
-               self.assertEqual(u'abc-de', sanitize_filename(u'abc/<>\\*|de'))
+               self.assertEqual(u'abc_de', sanitize_filename(u'abc/<>\\*|de'))
                self.assertEqual(u'xxx', sanitize_filename(u'xxx/<>\\*|'))
                self.assertEqual(u'yes no', sanitize_filename(u'yes? no'))
                self.assertEqual(u'this - that', sanitize_filename(u'this: that'))
 
+               self.assertEqual(sanitize_filename(u'AT&T'), u'AT&T')
                self.assertEqual(sanitize_filename(u'ä'), u'ä')
                self.assertEqual(sanitize_filename(u'кириллица'), u'кириллица')
 
-               for forbidden in u'"\0\\/':
-                       self.assertTrue(forbidden not in sanitize_filename(forbidden))
+               forbidden = u'"\0\\/'
+               for fc in forbidden:
+                       for fbc in forbidden:
+                               self.assertTrue(fbc not in sanitize_filename(fc))
+
+       def test_sanitize_filename_restricted(self):
+               self.assertEqual(sanitize_filename(u'abc', restricted=True), u'abc')
+               self.assertEqual(sanitize_filename(u'abc_d-e', restricted=True), u'abc_d-e')
+
+               self.assertEqual(sanitize_filename(u'123', restricted=True), u'123')
+
+               self.assertEqual(u'abc_de', sanitize_filename(u'abc/de', restricted=True))
+               self.assertFalse(u'/' in sanitize_filename(u'abc/de///', restricted=True))
+
+               self.assertEqual(u'abc_de', sanitize_filename(u'abc/<>\\*|de', restricted=True))
+               self.assertEqual(u'xxx', sanitize_filename(u'xxx/<>\\*|', restricted=True))
+               self.assertEqual(u'yes_no', sanitize_filename(u'yes? no', restricted=True))
+               self.assertEqual(u'this_-_that', sanitize_filename(u'this: that', restricted=True))
+
+               self.assertEqual(sanitize_filename(u'aäb', restricted=True), u'a_b')
+               self.assertTrue(sanitize_filename(u'ö', restricted=True) != u'') # No empty filename
+
+               forbidden = u'"\0\\/&: \'\t\n'
+               for fc in forbidden:
+                       for fbc in forbidden:
+                               self.assertTrue(fbc not in sanitize_filename(fc, restricted=True))
 
        def test_ordered_set(self):
                self.assertEqual(orderedSet([1,1,2,3,4,4,5,6,7,3,5]), [1,2,3,4,5,6,7])