X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=t%2Fdb_dependent%2FCirculation%2Ftransfers.t;h=99767c8798e779253478b7f8d7e950b670015ac0;hb=9d6d641d1f8b77271800f43bc027b651f9aea52b;hp=7ad80f31d67a908bd9e4695621c2bbc85f08e645;hpb=25d1d22082dd620ca785913554246bada3ba5892;p=srvgit

diff --git a/t/db_dependent/Circulation/transfers.t b/t/db_dependent/Circulation/transfers.t
index 7ad80f31d6..99767c8798 100755
--- a/t/db_dependent/Circulation/transfers.t
+++ b/t/db_dependent/Circulation/transfers.t
@@ -17,9 +17,9 @@
 
 use Modern::Perl;
 use C4::Context;
-use C4::Circulation;
-use C4::Biblio;
-use C4::Items;
+use C4::Circulation qw( CreateBranchTransferLimit DeleteBranchTransferLimits GetTransfers GetTransfersFromTo TransferSlip );
+use C4::Biblio qw( AddBiblio );
+use C4::Items qw( ModItemTransfer );
 use Koha::Database;
 use Koha::DateUtils;
 use DateTime::Duration;
@@ -27,18 +27,17 @@ use Koha::Item::Transfers;
 
 use t::lib::TestBuilder;
 
-use Test::More tests => 25;
+use Test::More tests => 22;
 use Test::Deep;
 
 BEGIN {
-    use_ok('C4::Circulation');
+    use_ok('C4::Circulation', qw( CreateBranchTransferLimit DeleteBranchTransferLimits GetTransfers GetTransfersFromTo TransferSlip ));
 }
 can_ok(
     'C4::Circulation',
     qw(
       CreateBranchTransferLimit
       DeleteBranchTransferLimits
-      DeleteTransfer
       GetTransfers
       GetTransfersFromTo
       )
@@ -173,7 +172,7 @@ is(CreateBranchTransferLimit(undef,$branchcode_2),undef,
 my @transfers = GetTransfers($item_id1);
 cmp_deeply(
     \@transfers,
-    [ re('^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$'), $branchcode_1, $branchcode_2, re('[0-9]*'), re('^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$'), undef ],
+    [ re('^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$'), $branchcode_1, $branchcode_2, re('[0-9]*'), re('^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$'), 'Manual' ],
     "Transfers of the item1"
 );    #NOTE: Only the first transfer is returned
 @transfers = GetTransfers;
@@ -223,12 +222,6 @@ is(
 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");
-
 #Test TransferSlip
 is( C4::Circulation::TransferSlip($branchcode_1, undef, 5, $branchcode_2),
     undef, "No tranferslip if invalid or undef itemnumber or barcode" );
@@ -255,8 +248,8 @@ ModItemTransfer(
     $trigger
 );
 $transfer->{_result}->discard_changes;
-ok( $transfer->datearrived, 'Date arrived is set when new transfer is initiated' );
-is( $transfer->comments, "Canceled, new transfer from $branchcode_1 to $branchcode_2 created", 'Transfer comment is set as expected when new transfer is initiated' );
+ok( $transfer->datecancelled, 'Date cancelled is set when new transfer is initiated' );
+is( $transfer->cancellation_reason, "Manual", 'Cancellation reason is set correctly when new transfer is initiated' );
 
 $schema->storage->txn_rollback;