From 16bffd69f665367d59f764d2b7c2f2fc3fc57a57 Mon Sep 17 00:00:00 2001 From: MrS0m30n3 Date: Wed, 5 Jul 2017 00:50:48 +0300 Subject: [PATCH] Refactor 'test_parsers.py' --- tests/test_parsers.py | 205 ++++++++++-------------------------------- 1 file changed, 47 insertions(+), 158 deletions(-) diff --git a/tests/test_parsers.py b/tests/test_parsers.py index 21d19fa..0c98c6c 100644 --- a/tests/test_parsers.py +++ b/tests/test_parsers.py @@ -23,68 +23,30 @@ class TestParse(unittest.TestCase): """Test case for OptionsParser parse method.""" + def setUp(self): + # Create the options_dict based on the OptionHolder + # items inside the OptionsParser object + self.options_dict = {item.name:item.default_value for item in OptionsParser()._ydl_options} + + # Add extra options used by the OptionsParser.parse method + self.options_dict["save_path"] = "/home/user/Workplace/test/youtube" + self.options_dict["cmd_args"] = "" + self.options_dict["output_format"] = 1 # Title + self.options_dict["second_video_format"] = "0" + self.options_dict["min_filesize_unit"] = "" + self.options_dict["max_filesize_unit"] = "" + + def check_options_parse(self, expected_options): + options_parser = OptionsParser() + + self.assertItemsEqual(options_parser.parse(self.options_dict), expected_options) + def test_parse_to_audio_requirement_bug(self): """Test case for the 'to_audio' requirement.""" - options_dict = { # Extracted from youtube-dlG settings.json - 'keep_video': False, - 'opts_win_size': (640, 490), - 'open_dl_dir': False, - 'second_video_format': '0', - 'native_hls': False, - 'write_subs': False, - 'workers_number': 3, - 'max_downloads': 0, - 'max_filesize': 0, - 'youtube_dl_debug': False, - 'shutdown': False, - 'selected_format': 'mp3', - 'write_all_subs': False, - 'enable_log': True, - 'embed_thumbnail': True, - 'audio_quality': '9', - 'subs_lang': 'en', - 'audio_format': 'mp3', - 'restrict_filenames': False, - 'min_filesize_unit': '', - 'selected_audio_formats': ['mp3', 'm4a', 'vorbis'], - 'selected_video_formats': ['webm', 'mp4'], - 'save_path': '/home/user/Workplace/test/youtube', - 'output_template': '%(uploader)s/%(title)s.%(ext)s', - 'show_completion_popup': True, - 'locale_name': 'en_US', - 'to_audio': False, - 'confirm_deletion': True, - 'min_filesize': 0, - 'save_path_dirs': ['/home/user/Downloads', '/home/user/Desktop', '/home/user/Videos', '/home/user/Music', '/home/user/Workplace/test/youtube'], - 'sudo_password': '', - 'video_password': '', - 'output_format': 1, - 'embed_subs': False, - 'write_auto_subs': False, - 'video_format': '0', - 'confirm_exit': False, - 'referer': '', - 'proxy': '', - 'add_metadata': False, - 'ignore_errors': False, - 'log_time': True, - 'password': '', - 'playlist_end': 0, - 'write_description': False, - 'retries': 10, - 'cmd_args': '', - 'write_thumbnail': False, - 'playlist_start': 1, - 'nomtime': False, - 'write_info': False, - 'username': '', - 'main_win_size': (930, 560), - 'user_agent': '', - 'max_filesize_unit': '', - 'ignore_config': False, - 'youtubedl_path': '/home/user/.config/youtube-dlg' - } + self.options_dict["audio_quality"] = "9" + self.options_dict["audio_format"] = "mp3" + self.options_dict["embed_thumbnail"] = True expected_cmd_list = ["--newline", "-x", @@ -96,15 +58,13 @@ class TestParse(unittest.TestCase): "-o", "/home/user/Workplace/test/youtube/%(title)s.%(ext)s"] - options_parser = OptionsParser() - - self.assertItemsEqual(options_parser.parse(options_dict), expected_cmd_list) + self.check_options_parse(expected_cmd_list) # Setting 'to_audio' to True should return the same results # since the '-x' flag is already set on audio extraction - options_dict["to_audio"] = True + self.options_dict["to_audio"] = True - self.assertItemsEqual(options_parser.parse(options_dict), expected_cmd_list) + self.check_options_parse(expected_cmd_list) def test_parse_cmd_args_with_quotes(self): """Test the youtube-dl cmd line args parsing when quotes are presented. @@ -113,78 +73,10 @@ class TestParse(unittest.TestCase): """ - options_dict = { - "keep_video": False, - "opts_win_size": (640, 490), - "open_dl_dir": False, - "second_video_format": "0", - "native_hls": False, - "write_subs": False, - "sudo_password": "", - "workers_number": 3, - "max_filesize": 0, - "youtube_dl_debug": False, - "shutdown": False, - "selected_format": "mp4", - "write_all_subs": False, - "enable_log": True, - "embed_thumbnail": False, - "audio_quality": "5", - "main_win_size": (930, 560), - "restrict_filenames": False, - "min_filesize_unit": "", - "video_password": "", - "selected_audio_formats": [ - "mp3", - "m4a", - "vorbis" - ], - "selected_video_formats": [ - "webm", - "mp4" - ], - "save_path": "/home/user/Workplace/test/youtube", - "output_template": "%(uploader)s/%(title)s.%(ext)s", - "show_completion_popup": True, - "locale_name": "en_US", - "to_audio": False, - "confirm_deletion": True, - "min_filesize": 0, - "save_path_dirs": [ - "/home/user/Downloads", - "/home/user/Desktop", - "/home/user/Videos", - "/home/user/Music", - "/home/user/Workplace/test/youtube" - ], - "audio_format": "", - "max_downloads": 0, - "output_format": 1, - "embed_subs": False, - "write_auto_subs": False, - "video_format": "mp4", - "confirm_exit": False, - "referer": "", - "proxy": "", - "add_metadata": False, - "ignore_errors": False, - "log_time": True, - "password": "", - "playlist_end": 0, - "write_description": False, - "retries": 10, - "cmd_args": "--recode-video mkv --postprocessor-args \"-codec copy -report\"", - "write_thumbnail": False, - "playlist_start": 1, - "nomtime": False, - "write_info": False, - "username": "", - "subs_lang": "en", - "user_agent": "", - "max_filesize_unit": "", - "ignore_config": False, - "youtubedl_path": "/home/user/.config/youtube-dlg" - } + self.options_dict["video_format"] = "mp4" + + # Test with three quoted 'cmd_args' + self.options_dict["cmd_args"] = "--recode-video mkv --postprocessor-args \"-codec copy -report\"" expected_cmd_list = ["--newline", "-f", @@ -196,27 +88,11 @@ class TestParse(unittest.TestCase): "--postprocessor-args", "-codec copy -report"] - options_parser = OptionsParser() - - self.assertItemsEqual(options_parser.parse(options_dict), expected_cmd_list) - - - # Test the example presented in issue #54 - options_dict["cmd_args"] = "-f \"(mp4)[width<1300]\"" - options_dict["video_format"] = "0" # Set video format to 'default' - - expected_cmd_list = ["--newline", - "-o", - "/home/user/Workplace/test/youtube/%(title)s.%(ext)s", - "-f", - "(mp4)[width<1300]"] - - self.assertItemsEqual(options_parser.parse(options_dict), expected_cmd_list) + self.check_options_parse(expected_cmd_list) # Test with two quoted 'cmd_args' - options_dict["cmd_args"] = "--postprocessor-args \"-y -report\"" - options_dict["video_format"] = "mp4" # Set video format back to 'mp4' + self.options_dict["cmd_args"] = "--postprocessor-args \"-y -report\"" expected_cmd_list = ["--newline", "-f", @@ -226,11 +102,11 @@ class TestParse(unittest.TestCase): "--postprocessor-args", "-y -report"] - self.assertItemsEqual(options_parser.parse(options_dict), expected_cmd_list) + self.check_options_parse(expected_cmd_list) - # Test with single quoted 'cmd_arg' followed by other cmd line args - options_dict["cmd_args"] = "--postprocessor-args \"-y\" -v" + # Test with one quoted 'cmd_arg' followed by other cmd line args + self.options_dict["cmd_args"] = "--postprocessor-args \"-y\" -v" expected_cmd_list = ["--newline", "-f", @@ -241,7 +117,20 @@ class TestParse(unittest.TestCase): "-y", "-v"] - self.assertItemsEqual(options_parser.parse(options_dict), expected_cmd_list) + self.check_options_parse(expected_cmd_list) + + + # Test the example presented in issue #54 + self.options_dict["cmd_args"] = "-f \"(mp4)[width<1300]\"" + self.options_dict["video_format"] = "0" # Set video format to 'default' + + expected_cmd_list = ["--newline", + "-o", + "/home/user/Workplace/test/youtube/%(title)s.%(ext)s", + "-f", + "(mp4)[width<1300]"] + + self.check_options_parse(expected_cmd_list) def main():