From 3bb6165927c277c3af73d5ef1ffb6ce9ea663d10 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Thu, 27 Dec 2012 05:31:36 +0100 Subject: Allow ampersand right after ? in youtube URLs (Closes #602) --- test/test_all_urls.py | 27 +++++++++++++++++++++++++++ test/test_youtube_playlist_ids.py | 22 ---------------------- 2 files changed, 27 insertions(+), 22 deletions(-) create mode 100644 test/test_all_urls.py delete mode 100644 test/test_youtube_playlist_ids.py (limited to 'test') diff --git a/test/test_all_urls.py b/test/test_all_urls.py new file mode 100644 index 000000000..06de8e7b8 --- /dev/null +++ b/test/test_all_urls.py @@ -0,0 +1,27 @@ +#!/usr/bin/env python + +import sys +import unittest + +# Allow direct execution +import os +sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + +from youtube_dl.InfoExtractors import YoutubeIE, YoutubePlaylistIE + +class TestAllURLsMatching(unittest.TestCase): + def test_youtube_playlist_matching(self): + self.assertTrue(YoutubePlaylistIE().suitable(u'ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')) + self.assertTrue(YoutubePlaylistIE().suitable(u'PL63F0C78739B09958')) + self.assertFalse(YoutubePlaylistIE().suitable(u'PLtS2H6bU1M')) + + def test_youtube_matching(self): + self.assertTrue(YoutubeIE().suitable(u'PLtS2H6bU1M')) + + def test_youtube_extract(self): + self.assertEqual(YoutubeIE()._extract_id('http://www.youtube.com/watch?&v=BaW_jenozKc'), 'BaW_jenozKc') + self.assertEqual(YoutubeIE()._extract_id('https://www.youtube.com/watch?&v=BaW_jenozKc'), 'BaW_jenozKc') + self.assertEqual(YoutubeIE()._extract_id('https://www.youtube.com/watch?feature=player_embedded&v=BaW_jenozKc'), 'BaW_jenozKc') + +if __name__ == '__main__': + unittest.main() diff --git a/test/test_youtube_playlist_ids.py b/test/test_youtube_playlist_ids.py deleted file mode 100644 index 2eeb3216c..000000000 --- a/test/test_youtube_playlist_ids.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env python - -import sys -import unittest - -# Allow direct execution -import os -sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) - -from youtube_dl.InfoExtractors import YoutubeIE, YoutubePlaylistIE - -class TestYoutubePlaylistMatching(unittest.TestCase): - def test_playlist_matching(self): - self.assertTrue(YoutubePlaylistIE().suitable(u'ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')) - self.assertTrue(YoutubePlaylistIE().suitable(u'PL63F0C78739B09958')) - self.assertFalse(YoutubePlaylistIE().suitable(u'PLtS2H6bU1M')) - - def test_youtube_matching(self): - self.assertTrue(YoutubeIE().suitable(u'PLtS2H6bU1M')) - -if __name__ == '__main__': - unittest.main() -- cgit v1.2.3