@@ -94,14 +94,10 @@ def test_find_csv_files(self, mock_glob: MagicMock):
9494 path_prefix + 'invalid/weekly_222222_b_c.csv' ,
9595 # invalid geography
9696 path_prefix + 'invalid/20200418_province_c.csv' ,
97- # valid hsa day
98- path_prefix + 'valid/20200408_hsa_sig.csv' ,
9997 # valid hsa_nci day
10098 path_prefix + 'valid/20200408_hsa_nci_sig.csv' ,
10199 # valid hsa_nci week
102100 path_prefix + 'valid/weekly_202015_hsa_nci_sig.csv' ,
103- # valid hsa week
104- path_prefix + 'valid/weekly_202015_hsa_sig.csv' ,
105101 # ignored
106102 path_prefix + 'ignored/README.md' ,
107103 ]
@@ -121,10 +117,8 @@ def test_find_csv_files(self, mock_glob: MagicMock):
121117 (glob_paths [5 ], None ),
122118 (glob_paths [6 ], None ),
123119 (glob_paths [7 ], None ),
124- (glob_paths [8 ], PathDetails (expected_issue_day , (date .today () - date (year = time_value_day // 10000 , month = (time_value_day // 100 ) % 100 , day = time_value_day % 100 )).days , 'valid' , 'sig' , 'day' , time_value_day , 'hsa' )),
125- (glob_paths [9 ], PathDetails (expected_issue_day , (date .today () - date (year = time_value_day // 10000 , month = (time_value_day // 100 ) % 100 , day = time_value_day % 100 )).days , 'valid' , 'sig' , 'day' , time_value_day , 'hsa_nci' )),
126- (glob_paths [10 ], PathDetails (expected_issue_week , delta_epiweeks (202015 , expected_issue_week ), 'valid' , 'sig' , 'week' , 202015 , 'hsa_nci' )),
127- (glob_paths [11 ], PathDetails (expected_issue_week , delta_epiweeks (202015 , expected_issue_week ), 'valid' , 'sig' , 'week' , 202015 , 'hsa' )),
120+ (glob_paths [8 ], PathDetails (expected_issue_day , (date .today () - date (year = time_value_day // 10000 , month = (time_value_day // 100 ) % 100 , day = time_value_day % 100 )).days , 'valid' , 'sig' , 'day' , time_value_day , 'hsa_nci' )),
121+ (glob_paths [9 ], PathDetails (expected_issue_week , delta_epiweeks (202015 , expected_issue_week ), 'valid' , 'sig' , 'week' , 202015 , 'hsa_nci' )),
128122 ])
129123 self .assertEqual (found , expected )
130124
0 commit comments