From fb57750b603ae7a8e932441b6739d063776e7e0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Tue, 25 Apr 2023 17:05:47 +0900 Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=91=98=E4=BA=8B=E9=A0=85=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com_sp_field/com_sp_field_delete.csv | 5 ++++- .../com_sp_field/test_com_sp_field_mapper.py | 12 ------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/com_sp_field_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/com_sp_field_delete.csv index c6d1489b..350bb655 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/com_sp_field_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/com_sp_field_delete.csv @@ -1,3 +1,6 @@ "511","01","994301","00","B","0003","1","20161113","20161114","1","20170401","@","","","" "511","01","995783","00","C","0003","2","20161113","20161114","1","20170221","1","20140810","","" -"511","01","997906","00","B","0032","","","","","","","","","" +"511","01","997906","00","B","0032","2","","","","","","","","" +"511","01","997906","99","B","0032","2","","","","","","","","" +"511","01","994301","99","B","0003","1","","","","","","","","" +"511","01","995783","99","C","0003","","","","","","","","","" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/test_com_sp_field_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/test_com_sp_field_mapper.py index 986ee7e7..44798884 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/test_com_sp_field_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/test_com_sp_field_mapper.py @@ -84,10 +84,6 @@ class TestComSpFieldMapper: assert len(sp_field_data) == 1, '1件取得できていること' actual_data_list.append(sp_field_data[0]) - # primary_keys = [f"'{primary_key['dcf_pcf_dr_cd', 'specialst_cd']}'" for primary_key in expect_data_list] - # actual_select_sql = f"SELECT * FROM src05.com_sp_field WHERE alma_cd IN ({','.join(primary_keys)})" - # actual_data_list = self.db.execute_select(actual_select_sql) - # 期待値検査 ignore_columns = ['regist_ymd', 'sys_update_date', 'sys_regist_date'] assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) @@ -155,10 +151,6 @@ class TestComSpFieldMapper: assert len(sp_field_data) == 1, '1件取得できていること' actual_data_list.append(sp_field_data[0]) - # expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_sp_field_update.csv')) - # primary_keys = [f"'{primary_key['dcf_pcf_dr_cd', 'specialst_cd']}'" for primary_key in expect_data_list] - # actual_select_sql = f"SELECT * FROM src05.com_sp_field WHERE dcf_pcf_dr_cd IN ({','.join(primary_keys[0])}) AND specialst_cd IN ({','.join(primary_keys[1])})" - # actual_data_list = self.db.execute_select(actual_select_sql) # 期待値検査 ignore_columns = ['regist_ymd', 'update_ymd', 'sys_update_date', 'sys_regist_date'] assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) @@ -229,10 +221,6 @@ class TestComSpFieldMapper: assert len(sp_field_data) == 1, '1件取得できていること' actual_data_list.append(sp_field_data[0]) - # expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_sp_field_delete.csv')) - # primary_keys = [f"'{primary_key['dcf_pcf_dr_cd', 'specialst_cd']}'" for primary_key in expect_data_list] - # actual_select_sql = f"SELECT * FROM src05.com_sp_field WHERE alma_cd IN ({','.join(primary_keys)})" - # actual_data_list = self.db.execute_select(actual_select_sql) # 期待値検査 ignore_columns = ['regist_ymd', 'update_ymd', 'delete_ymd', 'sys_update_date', 'sys_regist_date'] assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns)