From 92238129fad0cae26cdb99a79582a7b095c5f62e Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 5 Aug 2022 21:32:04 +0900 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E3=83=AD=E3=82=B0=E3=83=A1?= =?UTF-8?q?=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E7=94=9F=E6=88=90=E3=83=A6?= =?UTF-8?q?=E3=83=BC=E3=83=86=E3=82=A3=E3=83=AA=E3=83=86=E3=82=A3=E9=96=A2?= =?UTF-8?q?=E6=95=B0=E8=BF=BD=E5=8A=A0=EF=BC=88=E4=BB=96=E3=83=96=E3=83=A9?= =?UTF-8?q?=E3=83=B3=E3=83=81=E3=81=8B=E3=82=89Cherry-Pick=E3=81=97?= =?UTF-8?q?=E3=81=9F=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/crm-datafetch/tests/test_utils/log_message.py | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 ecs/crm-datafetch/tests/test_utils/log_message.py diff --git a/ecs/crm-datafetch/tests/test_utils/log_message.py b/ecs/crm-datafetch/tests/test_utils/log_message.py new file mode 100644 index 00000000..25ce6e11 --- /dev/null +++ b/ecs/crm-datafetch/tests/test_utils/log_message.py @@ -0,0 +1,7 @@ +"""ログメッセージに関連するテストヘルパー""" + +import logging + + +def generate_log_message_tuple(logger_name='root', log_level=logging.INFO, log_message=''): + return (logger_name, log_level, log_message) From 30641dafe7d0969f345daf599d29b3473f27a399 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Tue, 16 Aug 2022 10:13:44 +0900 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E3=82=AA=E3=83=96=E3=82=B8?= =?UTF-8?q?=E3=82=A7=E3=82=AF=E3=83=88=E6=83=85=E5=A0=B1=E5=BD=A2=E5=BC=8F?= =?UTF-8?q?=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E5=87=A6=E7=90=86=E3=81=AE?= =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tests/test_check_object_info_process.py | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 ecs/crm-datafetch/tests/test_check_object_info_process.py diff --git a/ecs/crm-datafetch/tests/test_check_object_info_process.py b/ecs/crm-datafetch/tests/test_check_object_info_process.py new file mode 100644 index 00000000..a5bc41ec --- /dev/null +++ b/ecs/crm-datafetch/tests/test_check_object_info_process.py @@ -0,0 +1,90 @@ +from unittest.mock import MagicMock, patch + +import pytest +from src.check_object_info_process import check_object_info_process +from src.config.objects import TargetObject +from src.error.exceptions import InvalidConfigException +from src.system_var.constants import CHK_JP_NAME +from src.util.execute_datetime import ExecuteDateTime + +from .test_utils.log_message import generate_log_message_tuple + + +class TestPrepareDataFetchProcess: + + def test_run_process_success(self, caplog): + """ + Cases: + オブジェクト情報形式チェック処理が正常終了し、期待通りの結果が返ること + Arranges: + - チェック対象のdictオブジェクトを宣言する + Expects: + - チェック後のオブジェクト情報コレクションクラスのインスタンスが返却される + - オブジェクト情報形式チェック処理の仕様に沿った正常系ログが出力されること(デバッグログは除く) + """ + # Arrange + target_objects_dict = { + 'object_name': 'Account', + 'columns': [ + 'Id', + 'Name' + ] + } + + execute_datetime = ExecuteDateTime() + + # Act + actual_fetch_target_objects = check_object_info_process(target_objects_dict, execute_datetime) + + # Assert + + # 返り値の期待値チェック + assert isinstance(actual_fetch_target_objects, TargetObject), 'CRM取得オブジェクトクラスのインスタンスが返却される' + + # ログの確認 + assert generate_log_message_tuple(log_message='I-CHK-01 オブジェクト情報形式チェック処理を開始します') in caplog.record_tuples + assert generate_log_message_tuple(log_message='I-CHK-02 オブジェクト情報形式チェック処理を終了します') in caplog.record_tuples + + def test_call_depended_modules(self): + """ + Cases: + オブジェクト情報形式チェック処理内で依存しているモジュールが正しく呼ばれていること + Arranges: + - オブジェクト情報形式チェック処理の依存モジュールをモック化する + Expects: + - 依存しているモジュールが正しく呼ばれている + """ + + # Arrange + mock_target_object_init = MagicMock(return_value=None) + # Act + with patch('src.config.objects.TargetObject.__init__', mock_target_object_init): + check_object_info_process({}, {}) + + # Assert + assert mock_target_object_init.called is True + + def test_raise_check_object_info(self): + """ + Cases: + オブジェクト形式チェック処理でエラーが発生した場合、検査例外が発生すること + Arranges: + - オブジェクト形式チェック処理で例外が発生するようにする + Expects: + - 例外が発生する + - 形式チェックが失敗したエラーが返却される + """ + + # Arrange + mock_target_object_init = MagicMock(side_effect=Exception('形式チェックエラー')) + # Act + with patch('src.config.objects.TargetObject.__init__', mock_target_object_init): + with pytest.raises(InvalidConfigException) as e: + check_object_info_process({}, {}) + + # Assert + + assert mock_target_object_init.called is True + assert e.value.error_id == 'E-CHK-01' + assert e.value.func_name == CHK_JP_NAME + assert e.value.args[0] == f'オブジェクト情報形式チェック処理が失敗しました　エラー内容：[形式チェックエラー]' From 770148950ae4823af825bac6ca6bcc54394acc2b Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Tue, 16 Aug 2022 10:19:48 +0900 Subject: [PATCH 3/5] =?UTF-8?q?refactor:=20=E3=83=86=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=82=AF=E3=83=A9=E3=82=B9=E5=90=8D=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/crm-datafetch/tests/test_check_object_info_process.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecs/crm-datafetch/tests/test_check_object_info_process.py b/ecs/crm-datafetch/tests/test_check_object_info_process.py index a5bc41ec..2e938504 100644 --- a/ecs/crm-datafetch/tests/test_check_object_info_process.py +++ b/ecs/crm-datafetch/tests/test_check_object_info_process.py @@ -10,7 +10,7 @@ from src.util.execute_datetime import ExecuteDateTime from .test_utils.log_message import generate_log_message_tuple -class TestPrepareDataFetchProcess: +class TestCheckObjectInfoProcess: def test_run_process_success(self, caplog): """ From d0066a719b6be0834726c03fe329fb38bf299836 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Wed, 17 Aug 2022 13:11:43 +0900 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E6=8C=87=E6=91=98=E5=AF=BE=E5=BF=9C=20https://nds-tyo.backlog.?= =?UTF-8?q?com/git/NEWDWH2021/newsdwh2021/pullRequests/66#comment-1321955?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/crm-datafetch/tests/test_check_object_info_process.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ecs/crm-datafetch/tests/test_check_object_info_process.py b/ecs/crm-datafetch/tests/test_check_object_info_process.py index 2e938504..46125bc4 100644 --- a/ecs/crm-datafetch/tests/test_check_object_info_process.py +++ b/ecs/crm-datafetch/tests/test_check_object_info_process.py @@ -40,6 +40,12 @@ class TestCheckObjectInfoProcess: # 返り値の期待値チェック assert isinstance(actual_fetch_target_objects, TargetObject), 'CRM取得オブジェクトクラスのインスタンスが返却される' + assert actual_fetch_target_objects.object_name == 'Account' + assert actual_fetch_target_objects.columns == ['Id', 'Name'] + assert actual_fetch_target_objects.is_skip is False + assert actual_fetch_target_objects.is_update_last_fetch_datetime is True + assert actual_fetch_target_objects.datetime_column == 'SystemModstamp' + assert actual_fetch_target_objects.upload_file_name == f'CRM_Account_{execute_datetime.format_date()}' # ログの確認 assert generate_log_message_tuple(log_message='I-CHK-01 オブジェクト情報形式チェック処理を開始します') in caplog.record_tuples From b9ca2c3a43414b2829aa4b1da419ad52f715d3f9 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Wed, 17 Aug 2022 16:08:26 +0900 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E3=82=A2=E3=82=B5=E3=83=BC=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=81=AE=E4=B8=8D=E8=B6=B3=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/crm-datafetch/tests/test_check_object_info_process.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ecs/crm-datafetch/tests/test_check_object_info_process.py b/ecs/crm-datafetch/tests/test_check_object_info_process.py index 46125bc4..ebc8a917 100644 --- a/ecs/crm-datafetch/tests/test_check_object_info_process.py +++ b/ecs/crm-datafetch/tests/test_check_object_info_process.py @@ -46,6 +46,7 @@ class TestCheckObjectInfoProcess: assert actual_fetch_target_objects.is_update_last_fetch_datetime is True assert actual_fetch_target_objects.datetime_column == 'SystemModstamp' assert actual_fetch_target_objects.upload_file_name == f'CRM_Account_{execute_datetime.format_date()}' + assert actual_fetch_target_objects.last_fetch_datetime_file_name == 'Account.json' # ログの確認 assert generate_log_message_tuple(log_message='I-CHK-01 オブジェクト情報形式チェック処理を開始します') in caplog.record_tuples