From 979b9c4678e79622c53b318c191333d8444c21d6 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 4 Mar 2021 08:21:29 +0000
Subject: [PATCH] Bug 26057: (QA follow-up) Fix Biblios, Reserves,
 Z3950Responder and XSLT tests

With the introduction of datecancellation we now have two fields to
check to varify if a transfer is 'complete' or not.  I forgot to update
these tests at the time to ensure the datecancellation field was not set
when adding the mock transfer.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 t/db_dependent/Koha/Biblios.t                 |  3 ++-
 t/db_dependent/Koha/Z3950Responder/Session.t  | 11 ++++++++++-
 t/db_dependent/Koha/Z3950Responder/Session2.t | 11 ++++++++++-
 t/db_dependent/Reserves.t                     |  1 +
 t/db_dependent/XSLT.t                         |  1 +
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/t/db_dependent/Koha/Biblios.t b/t/db_dependent/Koha/Biblios.t
index 82229f1f35..994bd9611b 100755
--- a/t/db_dependent/Koha/Biblios.t
+++ b/t/db_dependent/Koha/Biblios.t
@@ -120,7 +120,8 @@ subtest 'waiting_or_in_transit' => sub {
         source => 'Branchtransfer',
         value => {
             itemnumber => $item->itemnumber,
-            datearrived => undef
+            datearrived => undef,
+            datecancelled => undef,
         }
     });
     my $t = Koha::Database->new()->schema()->resultset( 'Branchtransfer' )->find($transfer->{branchtransfer_id});
diff --git a/t/db_dependent/Koha/Z3950Responder/Session.t b/t/db_dependent/Koha/Z3950Responder/Session.t
index 6493481ab7..279aafe197 100755
--- a/t/db_dependent/Koha/Z3950Responder/Session.t
+++ b/t/db_dependent/Koha/Z3950Responder/Session.t
@@ -33,7 +33,16 @@ subtest 'add_item_status' => sub {
     my $item_marc_1 = C4::Items::GetMarcItem( $item_1->biblionumber, $item_1->itemnumber );
     my $item_field_1 = scalar $item_marc_1->field($itemtag);
     $builder->build({ source => 'Reserve', value=> { itemnumber => $item_1->itemnumber } });
-    $builder->build({ source => 'Branchtransfer', value=> { itemnumber => $item_1->itemnumber, datearrived => undef } });
+    $builder->build(
+        {
+            source => 'Branchtransfer',
+            value  => {
+                itemnumber    => $item_1->itemnumber,
+                datearrived   => undef,
+                datecancelled => undef
+            }
+        }
+    );
     ## END FIRST ITEM ##
 
     ## SECOND ITEM HAS NO STATUSES ##
diff --git a/t/db_dependent/Koha/Z3950Responder/Session2.t b/t/db_dependent/Koha/Z3950Responder/Session2.t
index ec1e00b0c5..e6e8e23862 100755
--- a/t/db_dependent/Koha/Z3950Responder/Session2.t
+++ b/t/db_dependent/Koha/Z3950Responder/Session2.t
@@ -56,7 +56,16 @@ subtest 'add_item_status' => sub {
     my $item_marc_1 = C4::Items::GetMarcItem( $item_1->biblionumber, $item_1->itemnumber );
     my $item_field_1 = scalar $item_marc_1->field('952');
     $builder->build({ source => 'Reserve', value=> { itemnumber => $item_1->itemnumber } });
-    $builder->build({ source => 'Branchtransfer', value=> { itemnumber => $item_1->itemnumber, datearrived => undef } });
+    $builder->build(
+        {
+            source => 'Branchtransfer',
+            value  => {
+                itemnumber    => $item_1->itemnumber,
+                datearrived   => undef,
+                datecancelled => undef
+            }
+        }
+    );
     ## END FIRST ITEM ##
 
     ## SECOND ITEM HAS NO STATUSES ##
diff --git a/t/db_dependent/Reserves.t b/t/db_dependent/Reserves.t
index 4faab3c218..2b47ebce5e 100755
--- a/t/db_dependent/Reserves.t
+++ b/t/db_dependent/Reserves.t
@@ -866,6 +866,7 @@ subtest 'ReservesNeedReturns' => sub {
         value => {
           itemnumber  => $item->itemnumber,
           datearrived => undef,
+          datecancelled => undef
         }
     });
     $item->damaged(0)->store;
diff --git a/t/db_dependent/XSLT.t b/t/db_dependent/XSLT.t
index 2d9e9db1b3..befce88e5c 100755
--- a/t/db_dependent/XSLT.t
+++ b/t/db_dependent/XSLT.t
@@ -90,6 +90,7 @@ subtest 'buildKohaItemsNamespace status tests' => sub {
     $builder->build({ source => "Branchtransfer", value => {
         itemnumber  => $item->itemnumber,
         datearrived => undef,
+        datecancelled => undef,
         }
     });
     $xml = C4::XSLT::buildKohaItemsNamespace( $item->biblionumber,[]);
-- 
2.39.2