From 9df54c16107f734ecd34201a4e86d66b439c6e17 Mon Sep 17 00:00:00 2001 From: Laurent Monin Date: Tue, 5 Mar 2019 11:03:23 +0100 Subject: [PATCH] Introduce _assertFile()/_assertNoFile() and reduce redundancy a bit more --- test/test_filesystem.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/test/test_filesystem.py b/test/test_filesystem.py index ef6306146..ae45848c7 100644 --- a/test/test_filesystem.py +++ b/test/test_filesystem.py @@ -72,12 +72,18 @@ class TestFileSystem(PicardTestCase): return files + def _assertFile(self, path): + self.assertTrue(os.path.isfile(path)) + + def _assertNoFile(self, path): + self.assertFalse(os.path.isfile(path)) + 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'])) + self._assertFile(files['new_img']) + self._assertNoFile(files['old_img']) def test_move_additional_files_source_unicode(self): files = self._prepare_files(src_rel_path='música') @@ -103,8 +109,8 @@ class TestFileSystem(PicardTestCase): self._move_additional_files(files) - self.assertFalse(os.path.isfile(files['new_hidden_img'])) - self.assertTrue(os.path.isfile(files['old_hidden_img'])) + self._assertNoFile(files['new_hidden_img']) + self._assertFile(files['old_hidden_img']) def test_move_additional_files_hidden_pattern(self): files = self._prepare_files() @@ -113,5 +119,5 @@ class TestFileSystem(PicardTestCase): self._move_additional_files(files) - self.assertTrue(os.path.isfile(files['new_hidden_img'])) - self.assertFalse(os.path.isfile(files['old_hidden_img'])) + self._assertFile(files['new_hidden_img']) + self._assertNoFile(files['old_hidden_img'])