X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=t%2Fdb_dependent%2FKoha.t;h=4e814a07386026a83f7d00cbed1e615d60a5faf4;hb=c345d30cc8284f690f375faa140de49e62358709;hp=0e90403213c041aaaa0c827c18dbd6d9d95cd12c;hpb=a0b042b8a276ddacf3be13fa1666454b9b1d3903;p=koha.git diff --git a/t/db_dependent/Koha.t b/t/db_dependent/Koha.t index 0e90403213..4e814a0738 100644 --- a/t/db_dependent/Koha.t +++ b/t/db_dependent/Koha.t @@ -3,25 +3,32 @@ # This is to test C4/Koha # It requires a working Koha database with the sample data -use strict; -use warnings; +use Modern::Perl; +use DateTime::Format::MySQL; +use Test::More tests => 6; + +use t::lib::TestBuilder; + use C4::Context; +use Koha::Database; use Koha::DateUtils qw(dt_from_string); - -use Test::More tests => 7; -use DateTime::Format::MySQL; +use Koha::AuthorisedValue; +use Koha::AuthorisedValueCategories; BEGIN { - use_ok('C4::Koha', qw( :DEFAULT GetDailyQuote )); + use_ok('C4::Koha', qw( :DEFAULT GetDailyQuote GetItemTypesCategorized)); use_ok('C4::Members'); } +my $schema = Koha::Database->new->schema; +$schema->storage->txn_begin; +my $builder = t::lib::TestBuilder->new; my $dbh = C4::Context->dbh; -$dbh->{AutoCommit} = 0; -$dbh->{RaiseError} = 1; + +our $itype_1 = $builder->build({ source => 'Itemtype' }); subtest 'Authorized Values Tests' => sub { - plan tests => 8; + plan tests => 3; my $data = { category => 'CATEGORY', @@ -31,28 +38,19 @@ subtest 'Authorized Values Tests' => sub { imageurl => 'IMAGEURL' }; - + my $avc = Koha::AuthorisedValueCategories->find($data->{category}); + Koha::AuthorisedValueCategory->new({ category_name => $data->{category} })->store unless $avc; # Insert an entry into authorised_value table - my $insert_success = AddAuthorisedValue($data->{category}, $data->{authorised_value}, $data->{lib}, $data->{lib_opac}, $data->{imageurl}); - ok($insert_success, "Insert data in database"); - - -# Tests - SKIP: { - skip "INSERT failed", 5 unless $insert_success; - - is ( GetAuthorisedValueByCode($data->{category}, $data->{authorised_value}), $data->{lib}, "GetAuthorisedValueByCode" ); - is ( GetKohaImageurlFromAuthorisedValues($data->{category}, $data->{lib}), $data->{imageurl}, "GetKohaImageurlFromAuthorisedValues" ); - - my $sortdet=C4::Members::GetSortDetails("lost", "3"); - is ($sortdet, "Lost and Paid For", "lost and paid works"); + my $insert_success = Koha::AuthorisedValue->new( + { category => $data->{category}, + authorised_value => $data->{authorised_value}, + lib => $data->{lib}, + lib_opac => $data->{lib_opac}, + imageurl => $data->{imageurl} + } + )->store; + ok( $insert_success, "Insert data in database" ); - my $sortdet2=C4::Members::GetSortDetails("loc", "child"); - is ($sortdet2, "Children's Area", "Child area works"); - - my $sortdet3=C4::Members::GetSortDetails("withdrawn", "1"); - is ($sortdet3, "Withdrawn", "Withdrawn works"); - } # Clean up if($insert_success){ @@ -64,11 +62,35 @@ subtest 'Authorized Values Tests' => sub { SKIP: { eval { require Test::Deep; import Test::Deep; }; skip "Test::Deep required to run the GetAuthorisedValues() tests.", 2 if $@; - AddAuthorisedValue('BUG10656', 'ZZZ', 'Z_STAFF', 'A_PUBLIC', ''); - AddAuthorisedValue('BUG10656', 'AAA', 'A_STAFF', 'Z_PUBLIC', ''); + Koha::AuthorisedValueCategory->new({ category_name => 'BUG10656' })->store; + Koha::AuthorisedValue->new( + { category => 'BUG10656', + authorised_value => 'ZZZ', + lib => 'Z_STAFF', + lib_opac => 'A_PUBLIC', + imageurl => '' + } + )->store; + Koha::AuthorisedValue->new( + { category => 'BUG10656', + authorised_value => 'AAA', + lib => 'A_STAFF', + lib_opac => 'Z_PUBLIC', + imageurl => '' + } + )->store; + # the next one sets lib_opac to NULL; in that case, the staff # display value is meant to be used. - AddAuthorisedValue('BUG10656', 'DDD', 'D_STAFF', undef, ''); + Koha::AuthorisedValue->new( + { category => 'BUG10656', + authorised_value => 'DDD', + lib => 'D_STAFF', + lib_opac => undef, + imageurl => '' + } + )->store; + my $authvals = GetAuthorisedValues('BUG10656'); cmp_deeply( $authvals, @@ -77,7 +99,6 @@ subtest 'Authorized Values Tests' => sub { id => ignore(), category => 'BUG10656', authorised_value => 'AAA', - selected => 0, lib => 'A_STAFF', lib_opac => 'Z_PUBLIC', imageurl => '', @@ -86,7 +107,6 @@ subtest 'Authorized Values Tests' => sub { id => ignore(), category => 'BUG10656', authorised_value => 'DDD', - selected => 0, lib => 'D_STAFF', lib_opac => undef, imageurl => '', @@ -95,7 +115,6 @@ subtest 'Authorized Values Tests' => sub { id => ignore(), category => 'BUG10656', authorised_value => 'ZZZ', - selected => 0, lib => 'Z_STAFF', lib_opac => 'A_PUBLIC', imageurl => '', @@ -103,7 +122,7 @@ subtest 'Authorized Values Tests' => sub { ], 'list of authorised values in staff mode sorted by staff label (bug 10656)' ); - $authvals = GetAuthorisedValues('BUG10656', '', 1); + $authvals = GetAuthorisedValues('BUG10656', 1); cmp_deeply( $authvals, [ @@ -111,7 +130,6 @@ subtest 'Authorized Values Tests' => sub { id => ignore(), category => 'BUG10656', authorised_value => 'ZZZ', - selected => 0, lib => 'A_PUBLIC', lib_opac => 'A_PUBLIC', imageurl => '', @@ -120,7 +138,6 @@ subtest 'Authorized Values Tests' => sub { id => ignore(), category => 'BUG10656', authorised_value => 'DDD', - selected => 0, lib => 'D_STAFF', lib_opac => undef, imageurl => '', @@ -129,7 +146,6 @@ subtest 'Authorized Values Tests' => sub { id => ignore(), category => 'BUG10656', authorised_value => 'AAA', - selected => 0, lib => 'Z_PUBLIC', lib_opac => 'Z_PUBLIC', imageurl => '', @@ -141,26 +157,6 @@ subtest 'Authorized Values Tests' => sub { }; -subtest 'Itemtype info Tests' => sub { - like ( getitemtypeinfo('BK')->{'imageurl'}, qr/intranet-tmpl/, 'getitemtypeinfo on unspecified interface returns intranet imageurl (legacy behavior)' ); - like ( getitemtypeinfo('BK', 'intranet')->{'imageurl'}, qr/intranet-tmpl/, 'getitemtypeinfo on "intranet" interface returns intranet imageurl' ); - like ( getitemtypeinfo('BK', 'opac')->{'imageurl'}, qr/opac-tmpl/, 'getitemtypeinfo on "opac" interface returns opac imageurl' ); -}; - - - - - - - - - - - - - - - ### test for C4::Koha->GetDailyQuote() SKIP: { @@ -174,11 +170,18 @@ SKIP: skip "C4::Koha can't \'GetDailyQuote\'!", 3 unless can_ok('C4::Koha','GetDailyQuote'); +# Fill the quote table with the default needed and a spare +$dbh->do("DELETE FROM quotes WHERE id=3 OR id=25;"); +my $sql = "INSERT INTO quotes (id,source,text,timestamp) VALUES +(25,'Richard Nixon','When the President does it, that means that it is not illegal.',NOW()), +(3,'Abraham Lincoln','Four score and seven years ago our fathers brought forth on this continent, a new nation, conceived in Liberty, and dedicated to the proposition that all men are created equal.',NOW());"; +$dbh->do($sql); + my $expected_quote = { id => 3, source => 'Abraham Lincoln', text => 'Four score and seven years ago our fathers brought forth on this continent, a new nation, conceived in Liberty, and dedicated to the proposition that all men are created equal.', - timestamp => re('\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}'), #'0000-00-00 00:00:00', + timestamp => re('\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}'), #'YYYY-MM-DD HH:MM:SS' }; # test quote retrieval based on id @@ -211,21 +214,14 @@ SKIP: } -# -# test that &slashifyDate returns correct (non-US) date -# -subtest 'Date and ISBN tests' => sub { - plan tests => 7; +subtest 'ISBN tests' => sub { + plan tests => 6; - my $date = "01/01/2002"; - my $newdate = &slashifyDate("2002-01-01"); my $isbn13 = "9780330356473"; my $isbn13D = "978-0-330-35647-3"; my $isbn10 = "033035647X"; my $isbn10D = "0-330-35647-X"; - ok( $date eq $newdate, 'slashifyDate' ); - my $undef = undef; - is( xml_escape($undef), '', + is( xml_escape(undef), '', 'xml_escape() returns empty string on undef input' ); my $str = q{'"&<>'}; is( @@ -243,21 +239,59 @@ subtest 'Date and ISBN tests' => sub { }; -subtest 'getFacets() tests' => sub { - plan tests => 2; +subtest 'GetItemTypesCategorized test' => sub{ + plan tests => 7; - C4::Context->set_preference('singleBranchMode', 0); - my $facets = C4::Koha::getFacets(); - is( - scalar( grep { defined $_->{idx} && $_->{idx} eq 'location' } @$facets ), - 1, - 'location facet present with singleBranchMode off (bug 10078)' - ); - C4::Context->set_preference('singleBranchMode', 1); - $facets = C4::Koha::getFacets(); - is( - scalar( grep { defined $_->{idx} && $_->{idx} eq 'location' } @$facets ), - 1, - 'location facet present with singleBranchMode on (bug 10078)' - ); + my $avc = Koha::AuthorisedValueCategories->find('ITEMTYPECAT'); + Koha::AuthorisedValueCategory->new({ category_name => 'ITEMTYPECAT' })->store unless $avc; + my $insertGroup = Koha::AuthorisedValue->new( + { category => 'ITEMTYPECAT', + authorised_value => 'Quertyware', + } + )->store; + + ok($insertGroup, "Create group Qwertyware"); + + my $query = "INSERT into itemtypes (itemtype, description, searchcategory, hideinopac) values (?,?,?,?)"; + my $insertSth = C4::Context->dbh->prepare($query); + $insertSth->execute('BKghjklo1', 'One type of book', '', 0); + $insertSth->execute('BKghjklo2', 'Another type of book', 'Qwertyware', 0); + $insertSth->execute('BKghjklo3', 'Yet another type of book', 'Qwertyware', 0); + + # Azertyware should not exist. + my @itemtypes = Koha::ItemTypes->search({ searchcategory => 'Azertyware' }); + is( @itemtypes, 0, 'Search item types by searchcategory: Invalid category returns nothing'); + + @itemtypes = Koha::ItemTypes->search({ searchcategory => 'Qwertyware' }); + my @got = map { $_->itemtype } @itemtypes; + my @expected = ( 'BKghjklo2', 'BKghjklo3' ); + is_deeply(\@got,\@expected,'Search item types by searchcategory: valid category returns itemtypes'); + + # add more data since GetItemTypesCategorized's search is more subtle + $insertGroup = Koha::AuthorisedValue->new( + { category => 'ITEMTYPECAT', + authorised_value => 'Varyheavybook', + } + )->store; + + $insertSth->execute('BKghjklo4', 'Another hidden book', 'Veryheavybook', 1); + + my $hrCat = GetItemTypesCategorized(); + ok(exists $hrCat->{Qwertyware}, 'GetItemTypesCategorized: fully visible category exists'); + ok($hrCat->{Veryheavybook} && + $hrCat->{Veryheavybook}->{hideinopac}==1, 'GetItemTypesCategorized: non-visible category hidden' ); + + $insertSth->execute('BKghjklo5', 'An hidden book', 'Qwertyware', 1); + $hrCat = GetItemTypesCategorized(); + ok(exists $hrCat->{Qwertyware}, 'GetItemTypesCategorized: partially visible category exists'); + + my @only = ( 'BKghjklo1', 'BKghjklo2', 'BKghjklo3', 'BKghjklo4', 'BKghjklo5', 'Qwertyware', 'Veryheavybook' ); + my @results = (); + foreach my $key (@only) { + push @results, $key if exists $hrCat->{$key}; + } + @expected = ( 'BKghjklo1', 'Qwertyware', 'Veryheavybook' ); + is_deeply(\@results,\@expected, 'GetItemTypesCategorized: grouped and ungrouped items returned as expected.'); }; + +$schema->storage->txn_rollback;