>From e593ecd3e4e960d84ed106775771b5c76cc322fc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 14 Dec 2015 03:45:22 +0100 Subject: [PATCH] Update the census output validation test after group premiums changes The base extension is not used in the name of the output file any more since the changes of r6323 (later amended by r6345). And, as the Ctrl-Shift-O combination now opens a popup menu instead of printing the roster to a spreadsheet directly, update the test to select the appropriate item from it. --- wx_test_validate_output.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/wx_test_validate_output.cpp b/wx_test_validate_output.cpp index bb0b8a6..ddf43b9 100644 --- a/wx_test_validate_output.cpp +++ b/wx_test_validate_output.cpp @@ -270,7 +270,7 @@ struct enter_comments_in_case_defaults_dialog ,std::string const& insured_name ) { - std::string const census_file(corp_name + ".cns" + tsv_ext()); + std::string const census_file(corp_name + tsv_ext()); output_file_existence_checker output_census(census_file); struct print_case @@ -302,7 +302,7 @@ struct enter_comments_in_case_defaults_dialog ,std::string const& insured_name ) { - std::string const roster_file(corp_name + ".cns.roster" + tsv_ext()); + std::string const roster_file(corp_name + ".roster" + tsv_ext()); output_file_existence_checker output_roster(roster_file); struct print_roster @@ -311,8 +311,12 @@ struct enter_comments_in_case_defaults_dialog { wxUIActionSimulator ui; - // "Census|Print roster to spreadsheet" + // "Census|Print group roster..." ui.Char('o', wxMOD_CONTROL | wxMOD_SHIFT); + + // Select "Print roster to spreadsheet" from the popup menu. + ui.Char('o'); + wxYield(); } }; @@ -342,7 +346,7 @@ struct enter_comments_in_case_defaults_dialog wxYield(); std::string const ill_data_file - (corp_name + "." + insured_name + serial_suffix(1) + ".ill" + tsv_ext() + (corp_name + "." + insured_name + serial_suffix(1) + tsv_ext() ); output_file_existence_checker output_ill_data(ill_data_file); @@ -419,21 +423,21 @@ struct enter_comments_in_case_defaults_dialog /// Verify that these files were created: /// ABC.John_Brown.000000001.monthly_trace.tsv /// ABC.000000002.monthly_trace.tsv -/// ABC.cns.tsv +/// ABC.tsv /// ...and delete all three now. /// /// Census | Print roster to spreadsheet /// Verify that these files were created: /// ABC.John_Brown.000000001.monthly_trace.tsv /// ABC.000000002.monthly_trace.tsv -// ABC.cns.roster.tsv +// ABC.roster.tsv /// ...and delete all three now. /// /// select the "John Brown" cell /// Census | Run cell /// Illustration | Copy full illustration data [Ctrl-D] /// Verify that this file was created: -/// ABC.John_Brown.000000001.ill.tsv +/// ABC.John_Brown.000000001.tsv /// and that its contents have been placed on the clipboard. /// /// [These two functions: -- 2.5.1