From 65373beb0fe05e51b4d1caf7949862fff70f40a4 Mon Sep 17 00:00:00 2001 From: Wei Lee Date: Sat, 6 Apr 2024 20:02:01 +0800 Subject: [PATCH] test: rewrite test case for better failure message --- tests/data/attachment-file/attachment01.txt | 2 +- tests/test_render_mail.py | 8 ++++---- tests/utils.py | 13 +++++-------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tests/data/attachment-file/attachment01.txt b/tests/data/attachment-file/attachment01.txt index d51a6d2..a9d8773 100644 --- a/tests/data/attachment-file/attachment01.txt +++ b/tests/data/attachment-file/attachment01.txt @@ -1,3 +1,3 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. -Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris. Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget, consequat quis, neque. Aliquam faucibus, elit ut dictum aliquet, felis nisl adipiscing sapien, sed malesuada diam lacus eget erat. Cras mollis scelerisque nunc. Nullam arcu. Aliquam consequat. Curabitur augue lorem, dapibus quis, laoreet et, pretium ac, nisi. Aenean magna nisl, mollis quis, molestie eu, feugiat in, orci. In hac habitasse platea dictumst. +Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris. Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget, consequat quis, neque. Aliquam faucibus, elit ut dictum aliquet, felis nisl adipiscing sapien, sed malesuada diam lacus eget erat. Cras mollis scelerisque nunc. Nullam arcu. Aliquam consequat. Curabitur augue lorem, dapibus quis, laoreet et, pretium ac, nisi. Aenean magna nisl, mollis quis, molestie eu, feugiat in, orci. In hac habitasse platea dictumst. \ No newline at end of file diff --git a/tests/test_render_mail.py b/tests/test_render_mail.py index a9a6c5e..36016b7 100644 --- a/tests/test_render_mail.py +++ b/tests/test_render_mail.py @@ -41,7 +41,7 @@ def test_rendered_mail_no_separator(all_mails_base_no_separator): assert result.exit_code == 0 assert len(all_mails_base_no_separator) == len(all_mails_target) - assert compare_rendered_mail_all( + compare_rendered_mail_all( all_mails_target, base_prefix=path_pre_rendered_mails_no_separator, target_prefix=path_mails_to_send_no_separator, @@ -68,7 +68,7 @@ def test_rendered_mail_no_separator_and_csv(all_mails_base_no_separatorr_and_csv assert result.exit_code == 0 assert len(all_mails_base_no_separatorr_and_csv) == len(all_mails_target) - assert compare_rendered_mail_all( + compare_rendered_mail_all( all_mails_target, base_prefix=path_pre_rendered_mails_no_separator_and_csv, target_prefix=path_mails_to_send_no_separator_and_csv, @@ -95,7 +95,7 @@ def test_rendered_mail_with_separator_dash(all_mails_base_with_separator): assert result.exit_code == 0 assert len(all_mails_base_with_separator) == len(all_mails_target) - assert compare_rendered_mail_all( + compare_rendered_mail_all( all_mails_target, base_prefix=path_pre_rendered_mails_with_separator, target_prefix=path_mails_to_send_with_separator, @@ -126,7 +126,7 @@ def test_rendered_mail_with_separator_dash_and_csv( assert result.exit_code == 0 assert len(all_mails_base_with_separator_and_csv) == len(all_mails_target) - assert compare_rendered_mail_all( + compare_rendered_mail_all( all_mails_target, base_prefix=path_pre_rendered_mails_with_separator_and_csv, target_prefix=path_mails_to_send_with_separator_and_csv, diff --git a/tests/utils.py b/tests/utils.py index 4599a6d..1cab13c 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,4 +1,3 @@ -import filecmp import json import os import pickle @@ -26,16 +25,14 @@ def compare_rendered_mail_all( targets, base_prefix="./data", target_prefix="../examples" ): for mail_name in targets: - if not compare_rendered_mail( + compare_rendered_mail( "/".join((base_prefix, mail_name)), "/".join((target_prefix, mail_name)) - ): - return False - - return True + ) -def compare_rendered_mail(base, target): - return filecmp.cmp(base, target, shallow=False) +def compare_rendered_mail(base: str, target: str) -> None: + with open(base) as base_file, open(target) as target_file: + assert base_file.read().strip() == target_file.read().strip() def get_mail_config():