From fd581bea380084ed6621ae71bb4f238a4617c99c Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Tue, 19 May 2015 13:47:31 -0300 Subject: [PATCH] Bug 5338: (QA followup) update the tests for the new reports This patch fixes the unit tests related to guided reports. It is needed now that there are more options available. It also fixes a wrong 'savedsql' key (should be 'sql') that caused the tests to print warnings. Signed-off-by: Tomas Cohen Arazi --- t/db_dependent/Reports_Guided.t | 4 ++-- t/db_dependent/Templates.t | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/t/db_dependent/Reports_Guided.t b/t/db_dependent/Reports_Guided.t index 83be2df..04f6fd7 100755 --- a/t/db_dependent/Reports_Guided.t +++ b/t/db_dependent/Reports_Guided.t @@ -48,7 +48,7 @@ my @report_ids; for my $id ( 1 .. 3 ) { push @report_ids, save_report({ borrowernumber => $id, - savedsql => "SQL$id", + sql => "SQL$id", name => "Name$id", area => "area$id", group => "group$id", @@ -115,7 +115,7 @@ ok( 'attempting to run a report with an SQL syntax error returns error message (Bug 12214)' ); -is_deeply( get_report_areas(), [ 'CIRC', 'CAT', 'PAT', 'ACQ', 'ACC' ], +is_deeply( get_report_areas(), [ 'CIRC', 'CAT', 'PAT', 'ACQ', 'ACC', 'SER' ], "get_report_areas returns the correct array of report areas"); #End transaction diff --git a/t/db_dependent/Templates.t b/t/db_dependent/Templates.t index ade6f1d..236bd1e 100755 --- a/t/db_dependent/Templates.t +++ b/t/db_dependent/Templates.t @@ -41,8 +41,8 @@ my $columns = C4::Templates::GetColumnDefs( $query ); is( ref( $columns ) eq 'HASH', 1, 'GetColumnDefs returns a hashref' ); # get the tables names, sorted my @keys = sort keys %$columns; -is( scalar @keys, 5, "GetColumnDefs correctly returns the 5 tables defined in columns.def" ); -my @tables = ( 'biblio', 'biblioitems', 'borrowers', 'items', 'statistics'); +is( scalar @keys, 6, "GetColumnDefs correctly returns the 5 tables defined in columns.def" ); +my @tables = ( 'biblio', 'biblioitems', 'borrowers', 'items', 'statistics', 'subscription'); cmp_deeply( \@keys, \@tables, "GetColumnDefs returns the expected tables"); -- 2.4.1