From 48206692dee4c2b9390b16ac76cb4e6734333565 Mon Sep 17 00:00:00 2001 From: Laurent Monin Date: Tue, 5 Mar 2019 10:23:51 +0100 Subject: [PATCH] Reduce code redundancy, introducing _move_additional_files(files) --- test/test_filesystem.py | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/test/test_filesystem.py b/test/test_filesystem.py index a9533a9bd..f2080322b 100644 --- a/test/test_filesystem.py +++ b/test/test_filesystem.py @@ -75,42 +75,36 @@ class TestFileSystem(PicardTestCase): return files - def test_move_additional_files_source_unicode(self): - files = self._prepare_files(src_rel_path='música') - + def _move_additional_files(self, files): f = picard.formats.open_(files['old_mp3']) f._move_additional_files(files['old_mp3'], files['new_mp3']) self.assertTrue(os.path.isfile(files['new_img'])) self.assertFalse(os.path.isfile(files['old_img'])) + def test_move_additional_files_source_unicode(self): + files = self._prepare_files(src_rel_path='música') + + self._move_additional_files(files) + def test_move_additional_files_target_unicode(self): files = self._prepare_files(tgt_rel_path='música') - f = picard.formats.open_(files['old_mp3']) - f._move_additional_files(files['old_mp3'], files['new_mp3']) - - self.assertTrue(os.path.isfile(files['new_img'])) - self.assertFalse(os.path.isfile(files['old_img'])) + self._move_additional_files(files) def test_move_additional_files_duplicate_patterns(self): files = self._prepare_files() config.setting['move_additional_files_pattern'] = 'cover.jpg *.jpg' - f = picard.formats.open_(files['old_mp3']) - f._move_additional_files(files['old_mp3'], files['new_mp3']) - - self.assertTrue(os.path.isfile(files['new_img'])) - self.assertFalse(os.path.isfile(files['old_img'])) + self._move_additional_files(files) def test_move_additional_files_hidden_nopattern(self): files = self._prepare_files() config.setting['move_additional_files_pattern'] = '*.jpg' - f = picard.formats.open_(files['old_mp3']) - f._move_additional_files(files['old_mp3'], files['new_mp3']) + self._move_additional_files(files) self.assertFalse(os.path.isfile(files['new_hidden_img'])) self.assertTrue(os.path.isfile(files['old_hidden_img'])) @@ -120,8 +114,7 @@ class TestFileSystem(PicardTestCase): config.setting['move_additional_files_pattern'] = '*.jpg .*.jpg' - f = picard.formats.open_(files['old_mp3']) - f._move_additional_files(files['old_mp3'], files['new_mp3']) + self._move_additional_files(files) self.assertTrue(os.path.isfile(files['new_hidden_img'])) self.assertFalse(os.path.isfile(files['old_hidden_img']))