gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 10644: (follow-up) remove inadvertant dependence on Perl 5.14 

Perl 5.14 changed array and hash container functions (e.g., keys())
to accept hashrefs or arrayrefs.  However, this doesn't work in
Perl 5.10, so doing

  scalar(keys( function_returning_hashref() ) );

is a syntax error in that version.  This patch changes the affected
tests to explicitly difference the hashrefs returned by the various
functions.

To test:

Verify that t/db_dependent/ClassSource.t passes.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 8f933bc040)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 9504e00f7b)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 9504e00f7b)
This commit is contained in:
Galen Charlton 2013-08-09 18:53:20 +00:00 committed by Bernardo Gonzalez Kriegel
parent 0a47d3444d
commit 4e474580b1
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
t/db_dependent/ClassSource.t
View File

@ -34,12 +34,12 @@ $dbh->do(q|DELETE FROM class_sources|);
$dbh->do(q|DELETE FROM class_sort_rules|);
#Test AddClassSortRule
my $countSources = scalar( keys(GetClassSources) );
my $countSources2 = scalar( keys(GetClassSortRules) );
my $countSources = scalar( keys(%{ GetClassSources() }) );
my $countSources2 = scalar( keys(%{ GetClassSortRules() }) );
AddClassSortRule( 'sortrule1', 'description1', 'routine1' );
AddClassSortRule( 'sortrule2', 'description2', 'routine2' );
is(
scalar( keys(GetClassSortRules) ),
scalar( keys(%{ GetClassSortRules() }) ),
$countSources + 2,
"SortRule1 and SortRules2 have been added"
);
@ -48,7 +48,7 @@ is(
AddClassSource( 'source1', 'Description_source1', 1, 'sortrule1' );
AddClassSource( 'source2', 'Description_source2', 0, 'sortrule1' );
is(
scalar( keys(GetClassSources) ),
scalar( keys(%{ GetClassSources() }) ),
$countSources2 + 2,
"Source1 and source2 have been added"
);
@ -148,24 +148,24 @@ is_deeply( \@sources, [],
#Test DelClassSortRule
#DelClassSortRule ('sortrule1');
#is(scalar (keys (GetClassSortRules)),1,"SortRule1 has been deleted");#FIXME : impossible if some sources exist
#is(scalar (keys (%{ GetClassSortRules() })),1,"SortRule1 has been deleted");#FIXME : impossible if some sources exist
DelClassSortRule('sortrule2');
is( scalar( keys(GetClassSortRules) ), 1, "SortRule2 has been deleted" );
is( scalar( keys(%{ GetClassSortRules() }) ), 1, "SortRule2 has been deleted" );
DelClassSortRule();
is( scalar( keys(GetClassSortRules) ),
is( scalar( keys(%{ GetClassSortRules() }) ),
1, "Without params DelClassSortRule doesn't do anything" );
DelClassSortRule('doesnt_exist');
is( scalar( keys(GetClassSortRules) ),
is( scalar( keys(%{ GetClassSortRules() }) ),
1, "With wrong id, DelClassSortRule doesn't do anything" );
#Test DelClassSource
DelClassSource('source2');
is( scalar( keys(GetClassSources) ), 1, "Source2 has been deleted" );
is( scalar( keys(%{ GetClassSources() }) ), 1, "Source2 has been deleted" );
DelClassSource();
is( scalar( keys(GetClassSources) ),
is( scalar( keys(%{ GetClassSources() }) ),
1, "Without params DelClassSource doesn't do anything" );
DelClassSource('doesnt_exist');
is( scalar( keys(GetClassSources) ),
is( scalar( keys(%{ GetClassSources() }) ),
1, "With wrong id, DelClassSource doesn't do anything" );
#Test ModClassSortRule