nik/newdwh2021
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Asertするデータの並び順がずれて正しく動作しないので、並び順を固定にする

Browse Source
This commit is contained in:
x.azuma.m@nds-tyo.co.jp 2023-09-29 13:14:31 +09:00
parent cb9c19d58d
commit c5ecf3b320
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/test_vjsk_load.py
View File

@ -895,7 +895,7 @@ class TestImportFileToDb:
# orgテーブル結果が期待値通りかを突合
assert_table_results(result_org, assert_list, ignore_columns, is_loaddata=True)
# srcテーブル結果を取得
result_src = self.db.execute_select(f"select * from {table_name_src}")
result_src = self.db.execute_select(f"select * from {table_name_src} order by customer_cd")
# 突合から除外する項目
ignore_columns = ['dwh_upd_dt']
# srcテーブル結果が期待値通りかを突合
@ -1085,7 +1085,7 @@ class TestImportFileToDb:
# orgテーブル結果が期待値通りかを突合
assert_table_results(result_org, assert_list, ignore_columns, is_loaddata=True)
# srcテーブル結果を取得
result_src = self.db.execute_select(f"select * from {table_name_src}")
result_src = self.db.execute_select(f"select * from {table_name_src} order by ser_num, lot_num")
# 突合から除外する項目
ignore_columns = ['dwh_upd_dt']
# srcテーブル結果が期待値通りかを突合

4
ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/lot_num_mst_202304290000.tsv vendored
View File

@ -1,5 +1,5 @@
"ser_no" "lot_num" "expr_dt" "frst_mov_dt" "ins_dt" "ins_usr"
"F0110602" "BAVA001" "20231031" "20210719" "23-05-08 20:40:41" "batch"
"F0110602" "BAVA002" "20231031" "20210823" "23-05-08 20:40:41" ""
"F0110601" "BAVA005" "20231031" "20210927" "23-05-08 20:40:41" "batch"
"F0110601" "BAVA006" "20240131" "20211025" "23-05-08 20:40:41" "batch"
"F0110602" "BAVA001" "20231031" "20210719" "23-05-08 20:40:41" "batch"
"F0110602" "BAVA002" "20231031" "20210823" "23-05-08 20:40:41" ""

1 ser_no lot_num expr_dt frst_mov_dt ins_dt ins_usr
F0110602 BAVA001 20231031 20210719 23-05-08 20:40:41 batch
F0110602 BAVA002 20231031 20210823 23-05-08 20:40:41
2 F0110601 BAVA005 20231031 20210927 23-05-08 20:40:41 batch
3 F0110601 BAVA006 20240131 20211025 23-05-08 20:40:41 batch
4 F0110602 BAVA001 20231031 20210719 23-05-08 20:40:41 batch
5 F0110602 BAVA002 20231031 20210823 23-05-08 20:40:41

4
ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/whs_customer_mst_202304290000.tsv vendored
View File

@ -1,5 +1,5 @@
"whs_cd" "whs_sub_cd" "customer_cd" "sub_no" "start_dt" "end_dt" "org_cd" "src_org_cd" "nm" "kn_nm" "addr" "kn_addr" "zip_cd" "tel_no" "rec_sts_kbn" "ins_dt" "upd_dt"
"006" "01" "1009200000" "0" "20000101" "99991231" "11" "1121A2224212" "山口医院２　　　　　　　　　　　　　　　　　　" "ﾔﾏｸﾞﾁｲｲﾝ" "長崎県　佐世保市春日町２９−１４　　　　　　　　　　　　　　　　" "ﾅｶﾞｻｷｹﾝ ｻｾﾎﾞｼｶｽｶﾞﾁﾖｳ29-14" "8570011" "0956228610" "0" "23-04-14 11:53:14" "23-04-14 11:53:14"
"006" "01" "1009300000" "0" "20000101" "99991231" "" "" "" "" "" "" "" "" "0" "23-04-14 11:53:14" "23-04-14 11:53:14"
"006" "01" "1008000000" "0" "20000101" "99991231" "11" "1131A2283316" "北原整形外科医院２　　　　　　　　　　　　　　" "ｷﾀﾊﾗｾｲｹｲｹﾞｶ ｲｲﾝ" "長崎県　佐世保市瀬戸越町４丁目１２９８−１　　　　　　　　　　　" "ﾅｶﾞｻｷｹﾝ ｻｾﾎﾞｼｾﾄｺﾞｼﾁﾖｳ 1298-1" "8570135" "0956497773" "0" "23-04-14 11:53:14" "23-04-14 11:53:14"
"006" "01" "1009100000" "0" "20000101" "99991231" "11" "1121A2224212" "山口医院２　　　　　　　　　　　　　　　　　　" "ﾔﾏｸﾞﾁｲｲﾝ" "長崎県　佐世保市春日町２９−１４　　　　　　　　　　　　　　　　" "ﾅｶﾞｻｷｹﾝ ｻｾﾎﾞｼｶｽｶﾞﾁﾖｳ29-14" "8570011" "0956228610" "0" "23-04-14 11:53:14" "23-04-14 11:53:14"
"006" "01" "1009200000" "0" "20000101" "99991231" "11" "1121A2224212" "山口医院２　　　　　　　　　　　　　　　　　　" "ﾔﾏｸﾞﾁｲｲﾝ" "長崎県　佐世保市春日町２９−１４　　　　　　　　　　　　　　　　" "ﾅｶﾞｻｷｹﾝ ｻｾﾎﾞｼｶｽｶﾞﾁﾖｳ29-14" "8570011" "0956228610" "0" "23-04-14 11:53:14" "23-04-14 11:53:14"
"006" "01" "1009300000" "0" "20000101" "99991231" "" "" "" "" "" "" "" "" "0" "23-04-14 11:53:14" "23-04-14 11:53:14"

1 whs_cd whs_sub_cd customer_cd sub_no start_dt end_dt org_cd src_org_cd nm kn_nm addr kn_addr zip_cd tel_no rec_sts_kbn ins_dt upd_dt
006 01 1009200000 0 20000101 99991231 11 1121A2224212 山口医院２　　　　　　　　　　　　　　　　　　 ﾔﾏｸﾞﾁｲｲﾝ 長崎県　佐世保市春日町２９−１４　　　　　　　　　　　　　　　　 ﾅｶﾞｻｷｹﾝ ｻｾﾎﾞｼｶｽｶﾞﾁﾖｳ29-14 8570011 0956228610 0 23-04-14 11:53:14 23-04-14 11:53:14
006 01 1009300000 0 20000101 99991231 0 23-04-14 11:53:14 23-04-14 11:53:14
2 006 01 1008000000 0 20000101 99991231 11 1131A2283316 北原整形外科医院２　　　　　　　　　　　　　　 ｷﾀﾊﾗｾｲｹｲｹﾞｶ ｲｲﾝ 長崎県　佐世保市瀬戸越町４丁目１２９８−１　　　　　　　　　　　 ﾅｶﾞｻｷｹﾝ ｻｾﾎﾞｼｾﾄｺﾞｼﾁﾖｳ 1298-1 8570135 0956497773 0 23-04-14 11:53:14 23-04-14 11:53:14
3 006 01 1009100000 0 20000101 99991231 11 1121A2224212 山口医院２　　　　　　　　　　　　　　　　　　 ﾔﾏｸﾞﾁｲｲﾝ 長崎県　佐世保市春日町２９−１４　　　　　　　　　　　　　　　　 ﾅｶﾞｻｷｹﾝ ｻｾﾎﾞｼｶｽｶﾞﾁﾖｳ29-14 8570011 0956228610 0 23-04-14 11:53:14 23-04-14 11:53:14
4 006 01 1009200000 0 20000101 99991231 11 1121A2224212 山口医院２　　　　　　　　　　　　　　　　　　 ﾔﾏｸﾞﾁｲｲﾝ 長崎県　佐世保市春日町２９−１４　　　　　　　　　　　　　　　　 ﾅｶﾞｻｷｹﾝ ｻｾﾎﾞｼｶｽｶﾞﾁﾖｳ29-14 8570011 0956228610 0 23-04-14 11:53:14 23-04-14 11:53:14
5 006 01 1009300000 0 20000101 99991231 0 23-04-14 11:53:14 23-04-14 11:53:14