From 27c5cd5076fd6b6b76d9b3485118b0fb5bdb9bef Mon Sep 17 00:00:00 2001 From: DasMoorhuhn Date: Fri, 8 Dec 2023 01:14:01 +0100 Subject: [PATCH] more test stuff --- tests/helpers/folder_helper.py | 11 +++++++++++ tests/test_file_handle.py | 31 +++++++++---------------------- tests/test_scan_dir.py | 1 + 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/tests/helpers/folder_helper.py b/tests/helpers/folder_helper.py index 0581a29..7cd8521 100644 --- a/tests/helpers/folder_helper.py +++ b/tests/helpers/folder_helper.py @@ -3,6 +3,9 @@ import shutil from pathlib import Path TEST_FOLDER = ".test_folder" +TEST_IMAGES = "tests/test_files" +TEST_TEMP_FOLDER = os.path.join(TEST_FOLDER, 'Temp') +TEST_IMAGE_FOLDER = os.path.join(TEST_FOLDER, 'Images') def create_file(file): @@ -17,3 +20,11 @@ def create_folders(): delete_folder() os.makedirs(os.path.join(TEST_FOLDER, '001', '001')) os.makedirs(os.path.join(TEST_FOLDER, '002', '001')) + + +def copy_test_images(): + delete_folder() + os.makedirs(TEST_TEMP_FOLDER) + os.makedirs(TEST_IMAGE_FOLDER) + shutil.copy(src=os.path.join(TEST_IMAGES, 'test_image_001.JPG'), dst=TEST_TEMP_FOLDER) + shutil.copy(src=os.path.join(TEST_IMAGES, 'test_image_002.JPG'), dst=TEST_TEMP_FOLDER) diff --git a/tests/test_file_handle.py b/tests/test_file_handle.py index aa09186..07a54f4 100644 --- a/tests/test_file_handle.py +++ b/tests/test_file_handle.py @@ -1,38 +1,25 @@ import unittest -import shutil -import os - from unittest.mock import Mock +from helpers.folder_helper import TEST_FOLDER +from helpers.folder_helper import TEST_IMAGE_FOLDER +from helpers.folder_helper import delete_folder +from helpers.folder_helper import copy_test_images + from src.file_handler import sort_pictures from src.scan_folder import recursive_scan_folder from src.meta_data_handler import get_meta_data -TEST_IMAGES = "tests/test_files" -TEST_FOLDER = ".test_folder" - - -def delete_test_folder(): - shutil.rmtree(TEST_FOLDER, ignore_errors=True) - - -def copy_test_images(): - delete_test_folder() - os.makedirs(os.path.join(TEST_FOLDER, 'Temp')) - os.makedirs(os.path.join(TEST_FOLDER, 'Images')) - shutil.copy(src=os.path.join(TEST_IMAGES, 'test_image_001.JPG'), dst=os.path.join(TEST_FOLDER, 'Temp')) - shutil.copy(src=os.path.join(TEST_IMAGES, 'test_image_002.JPG'), dst=os.path.join(TEST_FOLDER, 'Temp')) - class TestFileHandler(unittest.TestCase): def test_file_handler(self): copy_test_images() files = recursive_scan_folder(TEST_FOLDER) exif_data = get_meta_data(files) - sort_pictures(images=exif_data, logger=Mock(), dst=os.path.join(TEST_FOLDER, 'Images')) + sort_pictures(images=exif_data, logger=Mock(), dst=TEST_IMAGE_FOLDER) sorted_pictures = recursive_scan_folder(TEST_FOLDER) - delete_test_folder() + delete_folder() assert len(sorted_pictures) == 2 - assert sorted_pictures == ['.test_folder/Images/SONY/2023/10/25/test_image_002.JPG', - '.test_folder/Images/SONY/2023/10/28/test_image_001.JPG'] + assert "".join(picture for picture in sorted_pictures if '2023/10/25/test_image_002.JPG' in picture) != "" + assert "".join(picture for picture in sorted_pictures if '2023/10/28/test_image_001.JPG' in picture) != "" diff --git a/tests/test_scan_dir.py b/tests/test_scan_dir.py index e24a512..295ed17 100644 --- a/tests/test_scan_dir.py +++ b/tests/test_scan_dir.py @@ -4,6 +4,7 @@ from helpers.folder_helper import delete_folder from helpers.folder_helper import create_folders from helpers.folder_helper import create_file from helpers.folder_helper import TEST_FOLDER + from src.scan_folder import scan_folder from src.scan_folder import recursive_scan_folder