From 4dd0321951e12f40fbbbb92f268e13162125d856 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 1 Jul 2013 10:46:48 +0200 Subject: [PATCH] Bug 10509: Followup for load_sql_in_order in unit tests Content-Type: text/plain; charset=utf-8 Although I assume that the unit tests in t/db_dependent/lib are actually obsolete and should probably be removed, the two calls of load_sql_in_order are updated to reflect the current parameter list. (The all_languages parameter has been dropped.) --- t/db_dependent/lib/KohaTest.pm | 3 +-- .../lib/KohaTest/Installer/SqlScripts.pm | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/t/db_dependent/lib/KohaTest.pm b/t/db_dependent/lib/KohaTest.pm index 5a508ec..ca54805 100644 --- a/t/db_dependent/lib/KohaTest.pm +++ b/t/db_dependent/lib/KohaTest.pm @@ -713,12 +713,11 @@ sub create_test_database { diag 'creating testing database...'; my $installer = C4::Installer->new() or die 'unable to create new installer'; # warn Data::Dumper->Dump( [ $installer ], [ 'installer' ] ); - my $all_languages = getAllLanguages(); my $error = $installer->load_db_schema(); die "unable to load_db_schema: $error" if ( $error ); my $list = $installer->sql_file_list('en', 'marc21', { optional => 1, mandatory => 1 } ); - my ($fwk_language, $installed_list) = $installer->load_sql_in_order($all_languages, @$list); + my ($fwk_language, $installed_list) = $installer->load_sql_in_order(@$list); $installer->set_version_syspref(); $installer->set_marcflavour_syspref('MARC21'); diag 'database created.' diff --git a/t/db_dependent/lib/KohaTest/Installer/SqlScripts.pm b/t/db_dependent/lib/KohaTest/Installer/SqlScripts.pm index 510c574..fb4f593 100644 --- a/t/db_dependent/lib/KohaTest/Installer/SqlScripts.pm +++ b/t/db_dependent/lib/KohaTest/Installer/SqlScripts.pm @@ -20,7 +20,6 @@ sub installer_all_sample_data : Tests { skip "did not create installer" unless ref($self->{installer}) eq 'C4::Installer'; - my $all_languages = getAllLanguages(); # find the available directory names my $dir=C4::Context->config('intranetdir')."/installer/data/" . (C4::Context->config("db_scheme") ? C4::Context->config("db_scheme") : "mysql") . "/"; @@ -48,7 +47,7 @@ sub installer_all_sample_data : Tests { cmp_ok($sql_count, '>', 0, "at least one SQL init file for $lang_code, $flavour"); skip "no SQL init files defined for $lang_code, $flavour" unless $sql_count > 0; - my ($fwk_language, $installed_list) = $self->{installer}->load_sql_in_order($all_languages, @$list); + my ($fwk_language, $installed_list) = $self->{installer}->load_sql_in_order(@$list); # extract list of files my $level; -- 1.7.7.6