From b46f61e509b766f8a2fd016aecf978ff5977bed0 Mon Sep 17 00:00:00 2001 From: Adrien Saurat Date: Thu, 21 Mar 2013 11:58:29 +0100 Subject: [PATCH] Bug 9845: SIP tests : fixes in 08checkin.t The tests were too restrictive. It should be possible to pass a checkin/checkout test with different values defined for magnetic medias. Signed-off-by: Chris Cormack Signed-off-by: Kyle M Hall --- C4/SIP/t/08checkin.t | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 deletions(-) diff --git a/C4/SIP/t/08checkin.t b/C4/SIP/t/08checkin.t index 2e04589..d7923ee 100644 --- a/C4/SIP/t/08checkin.t +++ b/C4/SIP/t/08checkin.t @@ -8,10 +8,33 @@ use Clone qw(clone); use Sip::Constants qw(:all); use SIPtest qw(:basic :user1 :item1); +# Checkout response, format: +# code: 12 +# success: 0 or 1 +# renewal ok: Y or N +# magnetic media: Y, N or U +# desensitize: Y or N +# date + +# Checkin response, format: +# code: 10 +# success: 0 or 1 +# resensitize: Y or N +# magnetic media: Y, N or U +# alert: Y or N +# date + +my $checkout_template = { + id => "Checkin: prep: check out item ($item_barcode)", + msg => "11YN20060329 203000 AO$instid|AA$user_barcode|AB$item_barcode|AC|", + pat => qr/^121N[NYU][NY]$datepat/, + fields => [], +}; + my $checkin_test_template = { id => "Checkin: Item ($item_barcode) is checked out", msg => "09N20060102 08423620060113 084235AP$item_owner|AO$instid|AB$item_barcode|AC$password|", - pat => qr/^101YNN$datepat/, + pat => qr/^101[NY][NYU]N$datepat/, fields => [ $SIPtest::field_specs{(FID_INST_ID )}, $SIPtest::field_specs{(FID_SCREEN_MSG)}, @@ -33,13 +56,6 @@ my $checkin_test_template = { required => 0, }, # 3M Extension ],}; -my $checkout_template = { - id => "Checkin: prep: check out item ($item_barcode)", - msg => "11YN20060329 203000 AO$instid|AA$user_barcode|AB$item_barcode|AC|", - pat => qr/^121NNY$datepat/, - fields => [], -}; - my @tests = ( $SIPtest::login_test, $SIPtest::sc_status_test, @@ -54,7 +70,7 @@ my $test; # the ILS didn't check the item in, and there's no patron id. $test = clone($checkin_test_template); $test->{id} = 'Checkin: Item not checked out'; -$test->{pat} = qr/^100YNN$datepat/o; +$test->{pat} = qr/^100[NY][NYU][NY]$datepat/o; $test->{fields} = [grep $_->{field} ne FID_PATRON_ID, @{$test->{fields}}]; push @tests, $test; -- 1.7.2.5