From 02946e5e473a55f0a074e497dbb95be4f162ea5d Mon Sep 17 00:00:00 2001 From: Kenza Zaki Date: Wed, 28 Aug 2013 10:08:10 +0200 Subject: [PATCH] Bug 10683: CRUD routines in C4::Circulation need unit tests This patch adds some unit tests wrap in a transaction for C4::Circulation.pm. Circulation_Branch.t adds tests for routines which deal with branch_item_rules,branch_borrower_circ_rules, default_branch_circ_rules, default_circ_rules, default_branch_item_rules in the database. Circulation_issue.t adds tests for routines which deal with accountline and issues in the database. NOTE: Some commented tests have to be fixed, and some tests can be added.More, other routines of Circulation.pm are tested in the patches: 10692 UT: Routines about transfers in Circulation.pm need unit tests 10710 UT : OfflineOperation's routines in C4/Circulation.t need unit tests 10767 UT: Routines which interact with the table issuingrules in C4/Circulation need unit test Test plan: prove t/db_dependent/Circulation_issue.t t/db_dependent/Circulation_issue.t .. ok All tests successful. Files=1, Tests=16, 0 wallclock secs ( 0.02 usr 0.00 sys + 0.40 cusr 0.02 csys = 0.44 CPU) Result: PASS prove t/db_dependent/Circulation_Branch.t t/db_dependent/Circulation_Branch.t .. ok All tests successful. Files=1, Tests=10, 2 wallclock secs ( 0.06 usr 0.00 sys + 1.02 cusr 0.06 csys = 1.14 CPU) Result: PASS Signed-off-by: Bernardo Gonzalez Kriegel Comment: Well, I don't know exactly what to do with this, so I left it to QA a) prove t/db_dependent/Circulation_Branch.t works well and without erros b) prove t/db_dependent/Circulation_issue.t works without errors for me ONLY if I have a issuingrule for All, All with 1 as renewals allowed, in other cases it fails. No koha-qa errors Signed-off-by: Jonathan Druart --- t/db_dependent/Circulation_Branch.t | 242 ++++++++++++++++++++++++++++++++ t/db_dependent/Circulation_issue.t | 264 +++++++++++++++++++++++++++++++++++ 2 files changed, 506 insertions(+) create mode 100644 t/db_dependent/Circulation_Branch.t create mode 100644 t/db_dependent/Circulation_issue.t diff --git a/t/db_dependent/Circulation_Branch.t b/t/db_dependent/Circulation_Branch.t new file mode 100644 index 0000000..a2d0b90 --- /dev/null +++ b/t/db_dependent/Circulation_Branch.t @@ -0,0 +1,242 @@ +#!/usr/bin/perl + +use Modern::Perl; +use C4::Biblio; +use C4::Members; +use C4::Branch; +use C4::Circulation; +use C4::Items; +use C4::Context; + +use Test::More tests => 10; + +BEGIN { + use_ok('C4::Circulation'); +} + +can_ok( 'C4::Circulation', qw( + GetBranchBorrowerCircRule + GetBranchItemRule + ) +); + +#Start transaction +my $dbh = C4::Context->dbh; +$dbh->{RaiseError} = 1; +$dbh->{AutoCommit} = 0; + +$dbh->do(q|DELETE FROM issues|); +$dbh->do(q|DELETE FROM borrowers|); +$dbh->do(q|DELETE FROM items|); +$dbh->do(q|DELETE FROM branches|); +$dbh->do(q|DELETE FROM categories|); +$dbh->do(q|DELETE FROM accountlines|); +$dbh->do(q|DELETE FROM itemtypes|); +$dbh->do(q|DELETE FROM branch_item_rules|); +$dbh->do(q|DELETE FROM branch_borrower_circ_rules|); +$dbh->do(q|DELETE FROM default_branch_circ_rules|); +$dbh->do(q|DELETE FROM default_circ_rules|); +$dbh->do(q|DELETE FROM default_branch_item_rules|); + +#Add branch and category +my $samplebranch1 = { + add => 1, + branchcode => 'SAB1', + branchname => 'Sample Branch', + branchaddress1 => 'sample adr1', + branchaddress2 => 'sample adr2', + branchaddress3 => 'sample adr3', + branchzip => 'sample zip', + branchcity => 'sample city', + branchstate => 'sample state', + branchcountry => 'sample country', + branchphone => 'sample phone', + branchfax => 'sample fax', + branchemail => 'sample email', + branchurl => 'sample url', + branchip => 'sample ip', + branchprinter => undef, + opac_info => 'sample opac', +}; +my $samplebranch2 = { + add => 1, + branchcode => 'SAB2', + branchname => 'Sample Branch2', + branchaddress1 => 'sample adr1_2', + branchaddress2 => 'sample adr2_2', + branchaddress3 => 'sample adr3_2', + branchzip => 'sample zip2', + branchcity => 'sample city2', + branchstate => 'sample state2', + branchcountry => 'sample country2', + branchphone => 'sample phone2', + branchfax => 'sample fax2', + branchemail => 'sample email2', + branchurl => 'sample url2', + branchip => 'sample ip2', + branchprinter => undef, + opac_info => 'sample opac2', +}; +ModBranch($samplebranch1); +ModBranch($samplebranch2); + +my $samplecat = { + categorycode => 'CAT1', + description => 'Description1', + enrolmentperiod => 'Null', + enrolmentperioddate => 'Null', + dateofbirthrequired => 'Null', + finetype => 'Null', + bulk => 'Null', + enrolmentfee => 'Null', + overduenoticerequired => 'Null', + issuelimit => 'Null', + reservefee => 'Null', + hidelostitems => 0, + category_type => 'Null' +}; +my $query = +"INSERT INTO categories (categorycode, + description, + enrolmentperiod, + enrolmentperioddate, + dateofbirthrequired , + finetype, + bulk, + enrolmentfee, + overduenoticerequired, + issuelimit, + reservefee, + hidelostitems, + category_type + ) +VALUES( ?,?,?,?,?,?,?,?,?,?,?,?,?)"; +$dbh->do( + $query, {}, + $samplecat->{categorycode}, $samplecat->{description}, + $samplecat->{enrolmentperiod}, $samplecat->{enrolmentperioddate}, + $samplecat->{dateofbirthrequired}, $samplecat->{finetype}, + $samplecat->{bulk}, $samplecat->{enrolmentfee}, + $samplecat->{overduenoticerequired}, $samplecat->{issuelimit}, + $samplecat->{reservefee}, $samplecat->{hidelostitems}, + $samplecat->{category_type} +); + +#Add itemtypes +my $sampleitemtype1 = { + itemtype => 'BOOK', + description => 'BookDescription', + rentalcharge => '10.0', + notforloan => 1, + imageurl => 'Null', + summary => 'BookSummary' +}; +my $sampleitemtype2 = { + itemtype => 'DVD', + description => 'DvdDescription', + rentalcharge => '5.0', + notforloan => 0, + imageurl => 'Null', + summary => 'DvdSummary' +}; +$query = +"INSERT INTO itemtypes (itemtype, + description, + rentalcharge, + notforloan, + imageurl, + summary + ) + VALUES( ?,?,?,?,?,?)"; +my $sth = $dbh->prepare($query); +$sth->execute( + $sampleitemtype1->{itemtype}, $sampleitemtype1->{description}, + $sampleitemtype1->{rentalcharge}, $sampleitemtype1->{notforloan}, + $sampleitemtype1->{imageurl}, $sampleitemtype1->{summary} +); +$sth->execute( + $sampleitemtype2->{itemtype}, $sampleitemtype2->{description}, + $sampleitemtype2->{rentalcharge}, $sampleitemtype2->{notforloan}, + $sampleitemtype2->{imageurl}, $sampleitemtype2->{summary} +); + +$query = +"INSERT INTO branch_borrower_circ_rules (branchcode,categorycode,maxissueqty) VALUES( ?,?,?)"; +$dbh->do( + $query, {}, + $samplebranch1->{branchcode}, + $samplecat->{categorycode}, 5 +); +$query = +"INSERT INTO default_branch_circ_rules (branchcode,maxissueqty,holdallowed,returnbranch) VALUES( ?,?,?,?)"; +$dbh->do( $query, {}, $samplebranch2->{branchcode}, + 3, 1, $samplebranch2->{branchcode} ); +$query = +"INSERT INTO default_circ_rules (singleton,maxissueqty,holdallowed,returnbranch) VALUES( ?,?,?,?)"; +$dbh->do( $query, {}, 'singleton', 4, 3, $samplebranch1->{branchcode} ); + +$query = +"INSERT INTO branch_item_rules (branchcode,itemtype,holdallowed,returnbranch) VALUES( ?,?,?,?)"; +$sth = $dbh->prepare($query); +$sth->execute( + $samplebranch1->{branchcode}, + $sampleitemtype1->{itemtype}, + 5, $samplebranch1->{branchcode} +); +$sth->execute( + $samplebranch2->{branchcode}, + $sampleitemtype2->{itemtype}, + 5, $samplebranch1->{branchcode} +); + +#Test GetBranchBorrowerCircRule +is_deeply( + GetBranchBorrowerCircRule(), + { maxissueqty => 4 }, +"Without parameter, GetBranchBorrower returns the maxissueqty of default_circ_rules" +); +is_deeply( + GetBranchBorrowerCircRule( $samplebranch2->{branchcode} ), + { maxissueqty => 3 }, +"Without only the branchcode specified, GetBranchBorrower returns the maxissueqty corresponding" +); +is_deeply( + GetBranchBorrowerCircRule( + $samplebranch1->{branchcode}, + $samplecat->{categorycode} + ), + { maxissueqty => 5 }, + "GetBranchBorrower returns the maxissueqty of the branch1 and the category1" +); +is_deeply( + GetBranchBorrowerCircRule( -1, -1 ), + { maxissueqty => 4 }, +"GetBranchBorrower with wrong parameters returns tthe maxissueqty of default_circ_rules" +); + +#Test GetBranchItemRule +is_deeply( + GetBranchItemRule( + $samplebranch1->{branchcode}, + $sampleitemtype1->{itemtype} + ), + { returnbranch => $samplebranch1->{branchcode}, holdallowed => 5 }, + "GetBranchitem returns holdallowed and return branch" +); +is_deeply( + GetBranchItemRule(), + { returnbranch => $samplebranch1->{branchcode}, holdallowed => 3 }, +"Without parameters GetBranchItemRule returns the values in default_circ_rules" +); +is_deeply( + GetBranchItemRule( $samplebranch1->{branchcode} ), + { returnbranch => $samplebranch1->{branchcode}, holdallowed => 3 }, +"With only a branchcode GetBranchItemRule returns values in default_branch_circ_rules" +); +is_deeply( + GetBranchItemRule( -1, -1 ), + { returnbranch => $samplebranch1->{branchcode}, holdallowed => 3 }, + "With only one parametern GetBranchItemRule returns default values" +); + +$dbh->rollback; diff --git a/t/db_dependent/Circulation_issue.t b/t/db_dependent/Circulation_issue.t new file mode 100644 index 0000000..09f4d34 --- /dev/null +++ b/t/db_dependent/Circulation_issue.t @@ -0,0 +1,264 @@ +#!/usr/bin/perl + +use Modern::Perl; +use Koha::DateUtils; +use DateTime::Duration; +use C4::Biblio; +use C4::Members; +use C4::Branch; +use C4::Circulation; +use C4::Items; +use C4::Context; + +use Test::More tests => 16; + +BEGIN { + use_ok('C4::Circulation'); +} +can_ok( + 'C4::Circulation', + qw(AddIssue + AddIssuingCharge + AddRenewal + AddReturn + GetBiblioIssues + GetIssuingCharges + GetIssuingRule + GetItemIssue + GetItemIssues + GetOpenIssue + GetRenewCount + GetUpcomingDueIssues + ) +); + +#Start transaction +my $dbh = C4::Context->dbh; +$dbh->{RaiseError} = 1; +$dbh->{AutoCommit} = 0; + +$dbh->do(q|DELETE FROM issues|); +$dbh->do(q|DELETE FROM borrowers|); +$dbh->do(q|DELETE FROM items|); +$dbh->do(q|DELETE FROM branches|); +$dbh->do(q|DELETE FROM categories|); +$dbh->do(q|DELETE FROM accountlines|); + +#Add sample datas +my @USERENV = ( 1, 'test', 'MASTERTEST', 'Test', 'Test', 't', 'Test', 0, ); + +C4::Context->_new_userenv('DUMMY_SESSION_ID'); +C4::Context->set_userenv(@USERENV); + +my $userenv = C4::Context->userenv + or BAIL_OUT("No userenv"); + +#Add Dates + +my $dt_today = dt_from_string; +my $today = output_pref( $dt_today, 'iso', '24hr', 1 ); + +my $dt_today2 = dt_from_string; +my $dur10 = DateTime::Duration->new( days => -10 ); +$dt_today2->add_duration($dur10); +my $daysago10 = output_pref( $dt_today2, 'iso', '24hr', 1 ); + +#Add branch and category +my $samplebranch1 = { + add => 1, + branchcode => 'SAB1', + branchname => 'Sample Branch', + branchaddress1 => 'sample adr1', + branchaddress2 => 'sample adr2', + branchaddress3 => 'sample adr3', + branchzip => 'sample zip', + branchcity => 'sample city', + branchstate => 'sample state', + branchcountry => 'sample country', + branchphone => 'sample phone', + branchfax => 'sample fax', + branchemail => 'sample email', + branchurl => 'sample url', + branchip => 'sample ip', + branchprinter => undef, + opac_info => 'sample opac', +}; +my $samplebranch2 = { + add => 1, + branchcode => 'SAB2', + branchname => 'Sample Branch2', + branchaddress1 => 'sample adr1_2', + branchaddress2 => 'sample adr2_2', + branchaddress3 => 'sample adr3_2', + branchzip => 'sample zip2', + branchcity => 'sample city2', + branchstate => 'sample state2', + branchcountry => 'sample country2', + branchphone => 'sample phone2', + branchfax => 'sample fax2', + branchemail => 'sample email2', + branchurl => 'sample url2', + branchip => 'sample ip2', + branchprinter => undef, + opac_info => 'sample opac2', +}; +ModBranch($samplebranch1); +ModBranch($samplebranch2); + +my $samplecat = { + categorycode => 'CAT1', + description => 'Description1', + enrolmentperiod => 'Null', + enrolmentperioddate => 'Null', + dateofbirthrequired => 'Null', + finetype => 'Null', + bulk => 'Null', + enrolmentfee => 'Null', + overduenoticerequired => 'Null', + issuelimit => 'Null', + reservefee => 'Null', + hidelostitems => 0, + category_type => 'Null' +}; +my $query = +"INSERT INTO categories (categorycode,description,enrolmentperiod,enrolmentperioddate,dateofbirthrequired ,finetype,bulk,enrolmentfee,overduenoticerequired,issuelimit ,reservefee ,hidelostitems ,category_type) VALUES( ?,?,?,?,?,?,?,?,?,?,?,?,?)"; +$dbh->do( + $query, {}, + $samplecat->{categorycode}, $samplecat->{description}, + $samplecat->{enrolmentperiod}, $samplecat->{enrolmentperioddate}, + $samplecat->{dateofbirthrequired}, $samplecat->{finetype}, + $samplecat->{bulk}, $samplecat->{enrolmentfee}, + $samplecat->{overduenoticerequired}, $samplecat->{issuelimit}, + $samplecat->{reservefee}, $samplecat->{hidelostitems}, + $samplecat->{category_type} +); + +#Add biblio and item +my $record = MARC::Record->new(); +$record->append_fields( + MARC::Field->new( '952', '0', '0', a => $samplebranch1->{branchcode} ) ); +my ( $biblionumber, $biblioitemnumber ) = C4::Biblio::AddBiblio( $record, '', ); + +my @sampleitem1 = C4::Items::AddItem( + { + barcode => 1, + itemcallnumber => 'callnumber1', + homebranch => $samplebranch1->{branchcode}, + holdingbranch => $samplebranch1->{branchcode}, + issue => 1, + reserve => 1 + }, + $biblionumber +); +my $item_id1 = $sampleitem1[2]; +my @sampleitem2 = C4::Items::AddItem( + { + barcode => 2, + itemcallnumber => 'callnumber2', + homebranch => $samplebranch2->{branchcode}, + holdingbranch => $samplebranch2->{branchcode}, + notforloan => 1, + issue => 1 + }, + $biblionumber +); +my $item_id2 = $sampleitem2[2]; + +#Add borrower +my $borrower_id1 = C4::Members::AddMember( + firstname => 'firstname1', + surname => 'surname1 ', + categorycode => $samplecat->{categorycode}, + branchcode => $samplebranch1->{branchcode}, +); +my $borrower_id2 = C4::Members::AddMember( + firstname => 'firstname2', + surname => 'surname2 ', + categorycode => $samplecat->{categorycode}, + branchcode => $samplebranch2->{branchcode}, +); + +#Begin Tests + +#Test AddIssue +$query = " SELECT count(*) FROM issues"; +my $sth = $dbh->prepare($query); +$sth->execute; +my $countissue = $sth -> fetchrow_array; +is ($countissue ,0, "there is no issue"); +my $datedue1 = C4::Circulation::AddIssue( $borrower_id1, "code", $daysago10,0, $today, '' ); +like( + $datedue1, + qr/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/, + "AddRenewal returns a date" +); +my $issue_id1 = $dbh->last_insert_id( undef, undef, 'issues', undef ); + +my $datedue2 = C4::Circulation::AddIssue( $borrower_id1, 'Barcode2' ); +is( $datedue2, undef, "AddIssue returns undef if no datedue is specified" ); +my $issue_id2 = $dbh->last_insert_id( undef, undef, 'issues', undef ); + +$sth->execute; +$countissue = $sth -> fetchrow_array; +#FIXME: Currently AddIssue doesn't add correctly issues +#is ($countissue,2,"2 issues have been added"); + +#Test AddIssuingCharge +$query = " SELECT count(*) FROM accountlines"; +$sth = $dbh->prepare($query); +$sth->execute; +my $countaccount = $sth -> fetchrow_array; +is ($countaccount,0,"0 accountline exists"); +is( C4::Circulation::AddIssuingCharge( $item_id1, $borrower_id1, 10 ), + 1, "An issuing charge has been added" ); +my $account_id = $dbh->last_insert_id( undef, undef, 'accountlines', undef ); +$sth->execute; +$countaccount = $sth -> fetchrow_array; +is ($countaccount,1,"1 accountline has been added"); + +#Test AddRenewal +my $datedue3 = + AddRenewal( $borrower_id1, $item_id1, $samplebranch1->{branchcode}, + $datedue1, $daysago10 ); +like( + $datedue3, + qr/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/, + "AddRenewal returns a date" +); + +#Test GetBiblioIssues +is( GetBiblioIssues(), undef, "GetBiblio Issues without parameters" ); + +#Test GetItemIssue +#FIXME : As the issues are not correctly added in the database, these tests don't work correctly +is(GetItemIssue,undef,"Without parameter GetItemIssue returns undef"); +#is(GetItemIssue($item_id1),{},"Item1's issues"); + +#Test GetItemIssues +#FIXME: this routine currently doesn't work be +#is_deeply (GetItemIssues,{},"Without parameter, GetItemIssue returns all the issues"); + +#Test GetOpenIssue +is( GetOpenIssue(), undef, "Without parameter GetOpenIssue returns undef" ); +is( GetOpenIssue(-1), undef, + "With wrong parameter GetOpenIssue returns undef" ); +my $openissue = GetOpenIssue($item_id1); + +#Test GetRenewCount +my @renewcount = C4::Circulation::GetRenewCount(); +is_deeply( + \@renewcount, + [ 0, 1, 1 ], +"Without paramater, GetRenewCount returns renewcount0,renewsallowed = 0,renewsleft = 0" +); +@renewcount = C4::Circulation::GetRenewCount(-1); +is_deeply( + \@renewcount, + [ 0, 1, 1 ], +"Without wrong, GetRenewCount returns renewcount0,renewsallowed = 0,renewsleft = 0" +); +@renewcount = C4::Circulation::GetRenewCount($item_id1); +is_deeply( \@renewcount, [ 0, 1, 1 ], "Getrenewcount of item1 returns" ); + +#End transaction +$dbh->rollback; -- 1.7.10.4