7c518bd250
This patch makes Circulation_transfers.t no longer be sensitive to the exact time it runs, avoiding spurious test failures due to datesent being a second off between the creation of the test transfer and the comparison. To test: [1] To simulate the failure, add a "sleep(2);" after the "#Test GetTransfers" comment and run prove -v t/db_dependent/Circulation_transfers.t [2] Remove the sleep and apply the patch. [3] Verify that prove -v t/db_dependent/Circulation_transfers.t passes. Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Works as described. Signed-off-by: Galen Charlton <gmc@esilibrary.com>
202 lines
6.3 KiB
Perl
202 lines
6.3 KiB
Perl
#!/usr/bin/perl
|
|
|
|
use Modern::Perl;
|
|
use C4::Biblio;
|
|
use C4::Context;
|
|
use C4::Items;
|
|
use C4::Branch;
|
|
use C4::Circulation;
|
|
use Koha::DateUtils;
|
|
use DateTime::Duration;
|
|
|
|
use Test::More tests => 19;
|
|
use Test::Deep;
|
|
|
|
BEGIN {
|
|
use_ok('C4::Circulation');
|
|
}
|
|
can_ok(
|
|
'C4::Circulation',
|
|
qw(
|
|
CreateBranchTransferLimit
|
|
DeleteBranchTransferLimits
|
|
DeleteTransfer
|
|
GetTransfers
|
|
GetTransfersFromTo
|
|
)
|
|
);
|
|
|
|
#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 branch_transfer_limits|);
|
|
$dbh->do(q|DELETE FROM branchtransfers|);
|
|
|
|
#Add sample datas
|
|
#Add branches
|
|
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);
|
|
|
|
#Add biblio and items
|
|
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}
|
|
},
|
|
$biblionumber
|
|
);
|
|
my $item_id1 = $sampleitem1[2];
|
|
my @sampleitem2 = C4::Items::AddItem(
|
|
{
|
|
barcode => 2,
|
|
itemcallnumber => 'callnumber2',
|
|
homebranch => $samplebranch1->{branchcode},
|
|
holdingbranch => $samplebranch1->{branchcode}
|
|
},
|
|
$biblionumber
|
|
);
|
|
my $item_id2 = $sampleitem2[2];
|
|
|
|
#Add transfers
|
|
ModItemTransfer(
|
|
$item_id1,
|
|
$samplebranch1->{branchcode},
|
|
$samplebranch2->{branchcode}
|
|
);
|
|
ModItemTransfer(
|
|
$item_id2,
|
|
$samplebranch1->{branchcode},
|
|
$samplebranch2->{branchcode}
|
|
);
|
|
|
|
#Begin Tests
|
|
#Test CreateBranchTransferLimit
|
|
is(
|
|
CreateBranchTransferLimit(
|
|
$samplebranch2->{branchcode},
|
|
$samplebranch1->{branchcode}, 'CODE'
|
|
),
|
|
1,
|
|
"A Branch TransferLimit has been added"
|
|
);
|
|
is(CreateBranchTransferLimit(),undef,
|
|
"Without parameters CreateBranchTransferLimit returns undef");
|
|
is(CreateBranchTransferLimit($samplebranch2->{branchcode}),undef,
|
|
"With only tobranch CreateBranchTransferLimit returns undef");
|
|
is(CreateBranchTransferLimit(undef,$samplebranch2->{branchcode}),undef,
|
|
"With only frombranch CreateBranchTransferLimit returns undef");
|
|
#FIXME: Currently, we can add a transferlimit even to nonexistent branches because in the database,
|
|
#branch_transfer_limits.toBranch and branch_transfer_limits.fromBranch aren't foreign keys
|
|
#is(CreateBranchTransferLimit(-1,-1,'CODE'),0,"With wrong CreateBranchTransferLimit returns 0 - No transfertlimit added");
|
|
|
|
#Test GetTransfers
|
|
my @transfers = GetTransfers($item_id1);
|
|
cmp_deeply(
|
|
\@transfers,
|
|
[ re('^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$'), $samplebranch1->{branchcode}, $samplebranch2->{branchcode} ],
|
|
"Transfers of the item1"
|
|
); #NOTE: Only the first transfer is returned
|
|
@transfers = GetTransfers;
|
|
is_deeply( \@transfers, [],
|
|
"GetTransfers without params returns an empty array" );
|
|
@transfers = GetTransfers(-1);
|
|
is_deeply( \@transfers, [],
|
|
"GetTransfers with a wrong item id returns an empty array" );
|
|
|
|
#Test GetTransfersFromTo
|
|
my @transferfrom1to2 = GetTransfersFromTo( $samplebranch1->{branchcode},
|
|
$samplebranch2->{branchcode} );
|
|
cmp_deeply(
|
|
\@transferfrom1to2,
|
|
[
|
|
{
|
|
itemnumber => $item_id1,
|
|
datesent => re('^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$'),
|
|
frombranch => $samplebranch1->{branchcode}
|
|
},
|
|
{
|
|
itemnumber => $item_id2,
|
|
datesent => re('^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$'),
|
|
frombranch => $samplebranch1->{branchcode}
|
|
}
|
|
],
|
|
"Item1 and Item2 has been transfered from branch1 to branch2"
|
|
);
|
|
my @transferto = GetTransfersFromTo( undef, $samplebranch2->{branchcode} );
|
|
is_deeply( \@transferto, [],
|
|
"GetTransfersfromTo without frombranch returns an empty array" );
|
|
my @transferfrom = GetTransfersFromTo( $samplebranch1->{branchcode} );
|
|
is_deeply( \@transferfrom, [],
|
|
"GetTransfersfromTo without tobranch returns an empty array" );
|
|
@transferfrom = GetTransfersFromTo();
|
|
is_deeply( \@transferfrom, [],
|
|
"GetTransfersfromTo without params returns an empty array" );
|
|
|
|
#Test DeleteBranchTransferLimits
|
|
is(
|
|
C4::Circulation::DeleteBranchTransferLimits( $samplebranch1->{branchcode} ),
|
|
1,
|
|
"A Branch TransferLimit has been deleted"
|
|
);
|
|
is(C4::Circulation::DeleteBranchTransferLimits(),undef,"Without parameters DeleteBranchTransferLimit returns undef");
|
|
is(C4::Circulation::DeleteBranchTransferLimits('B'),'0E0',"With a wrong id DeleteBranchTransferLimit returns 0E0");
|
|
|
|
#Test DeleteTransfer
|
|
is( C4::Circulation::DeleteTransfer($item_id1),
|
|
1, "A the item1's transfer has been deleted" );
|
|
is(C4::Circulation::DeleteTransfer(),undef,"Without itemid DeleteTransfer returns undef");
|
|
is(C4::Circulation::DeleteTransfer(-1),'0E0',"with a wrong itemid DeleteTranfer returns 0E0");
|
|
|
|
#End transaction
|
|
$dbh->rollback;
|