From 0bbc61d386b254716456d8ba1b2d63f394f106f3 Mon Sep 17 00:00:00 2001 From: artus Date: Sun, 18 Nov 2018 21:56:58 +0100 Subject: [PATCH] starts refactoring tests --- photograb/test/test_utils.py | 41 +++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/photograb/test/test_utils.py b/photograb/test/test_utils.py index 8786203..a69b011 100644 --- a/photograb/test/test_utils.py +++ b/photograb/test/test_utils.py @@ -3,36 +3,39 @@ import os import unittest from pathlib import Path -from ..utils import Content, get_content, copy_files, move_files +from ..store import Content, Store, Backup class TestContent(unittest.TestCase): _test_files = set(("test1", "test2", "test3")) + test_folder = Path("./sandbox/") + test_subdir = test_folder / "subdir" - def _get_test_files_paths(self): - for f in self._test_files: + @classmethod + def _get_test_files_paths(cls): + for f in cls._test_files: if f == "test1": - yield self.test_subdir / f + yield cls.test_subdir / f else: - yield self.test_folder / f + yield cls.test_folder / f - def setUp(self): - self.test_folder = Path("./sandbox/") - if not self.test_folder.exists(): - os.mkdir(self.test_folder) - self.test_subdir = self.test_folder / "subdir" - if not self.test_subdir.exists(): - os.mkdir(self.test_subdir) - for path in self._get_test_files_paths(): + @classmethod + def setUpClass(cls): + if not cls.test_folder.exists(): + os.mkdir(cls.test_folder) + if not cls.test_subdir.exists(): + os.mkdir(cls.test_subdir) + for path in cls._get_test_files_paths(): # Create an empty file open(path, 'w').close() - def tearDown(self): - for path in self._get_test_files_paths(): + @classmethod + def tearDownClass(cls): + for path in cls._get_test_files_paths(): os.remove(path) - self.test_subdir.rmdir() - self.test_folder.rmdir() + cls.test_subdir.rmdir() + cls.test_folder.rmdir() def test_content_difference(self): first = Content(((1, 0), (2, 0), (3, 0), (4, 0))) @@ -41,11 +44,11 @@ class TestContent(unittest.TestCase): self.assertEqual(result, Content(((2, 0), (4, 0)))) def test_get_content_without_exclude(self): - content = get_content(self.test_folder, exclude=None) + content = Store(self.test_folder).read_content(exclude=None) self.assertEqual(set(content.keys()), self._test_files) def test_get_content_with_exclude(self): - content = get_content(self.test_folder, exclude="subdir") + content = Store(self.test_folder).read_content(exclude="subdir") self.assertEqual(set(content.keys()), set(("test2", "test3")))