d85f757ce7
For historical reasons the SIPServer and SIP modules have used an extra module path in addition to the standard Koha one. This has caused numerous irritants in attempting to set up scripts and basic tests. It does not help in attempting to modify or debug this code This patch changes the package value in the modules under the C4/SIP directory and makes calls to them use the full package name. Where the export mechanism was being short circuited routines have been explicitly exported and imported declarations of 'use ILS' when that module was not being used and which only generated warnings have been removed. As a lot of the changes affect lines where an object is instantiated with new. The opportunity has been taken to replace the ambiguous indirect syntax with the preferred direct call In intializing ILS the full path is added as this will not require any changes to existing configs. I suspect this feature is unused, and adds obfuscation rather than flexibility but have kept the feature as we need this change in order to rationalize and extend the testing of the server. The visible difference is that with the normal Koha PERL5LIB setting. Compilation of Modules under C4/SIP should be successful and not fail with unlocated modules, allowing developers to see any perl warnings All the SIP modules can now be run through the tests in t/00-load.t now except for SIPServer itself Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
100 lines
2.8 KiB
Perl
100 lines
2.8 KiB
Perl
#!/usr/bin/perl
|
|
# patron_status: test Patron Status Response
|
|
|
|
use strict;
|
|
use warnings;
|
|
use FindBin qw($Bin);
|
|
use lib "$Bin";
|
|
use Clone qw(clone);
|
|
|
|
use C4::SIP::Sip::Constants qw(:all);
|
|
use SIPtest qw(:user1 :basic);
|
|
|
|
my $patron_status_test_template = {
|
|
id => 'Patron Status: valid patron, no patron password',
|
|
msg => "2300120060101 084237AO$instid|AA$user_barcode|AC$password|",
|
|
pat => qr/^24[ Y]{14}001$datepat/,
|
|
fields => [
|
|
$SIPtest::field_specs{(FID_INST_ID)},
|
|
$SIPtest::field_specs{(FID_SCREEN_MSG)},
|
|
$SIPtest::field_specs{(FID_PRINT_LINE)},
|
|
{ field => FID_PATRON_ID,
|
|
pat => qr/^$user_barcode$/,
|
|
required => 1, },
|
|
{ field => FID_PERSONAL_NAME,
|
|
pat => qr/^$user_fullname$/,
|
|
required => 1, },
|
|
{ field => FID_VALID_PATRON,
|
|
pat => qr/^Y$/,
|
|
# Not required by the spec, but by the test
|
|
required => 1, },
|
|
$SIPtest::field_specs{(FID_CURRENCY)},
|
|
{ field => FID_FEE_AMT,
|
|
pat => $textpat,
|
|
required => 0, },
|
|
], };
|
|
|
|
my @tests = (
|
|
$SIPtest::login_test,
|
|
$SIPtest::sc_status_test,
|
|
clone($patron_status_test_template),
|
|
);
|
|
|
|
# Invalid patron
|
|
my $test = clone($patron_status_test_template);
|
|
|
|
$test->{id} = 'Patron Status: invalid id';
|
|
$test->{msg} =~ s/AA$user_barcode\|/AAbad_userid|/;
|
|
|
|
# The test assumes that the language sent by the terminal is
|
|
# just echoed back for invalid patrons.
|
|
$test->{pat} = qr/^24Y[ Y]{13}001$datepat/;
|
|
|
|
delete $test->{fields};
|
|
$test->{fields} = [
|
|
$SIPtest::field_specs{(FID_INST_ID)},
|
|
$SIPtest::field_specs{(FID_SCREEN_MSG)},
|
|
$SIPtest::field_specs{(FID_PRINT_LINE)},
|
|
{ field => FID_PATRON_ID,
|
|
pat => qr/^bad_userid$/,
|
|
required => 1, },
|
|
{ field => FID_PERSONAL_NAME,
|
|
pat => qr/^$/,
|
|
required => 1, },
|
|
{ field => FID_VALID_PATRON,
|
|
pat => qr/^N$/,
|
|
required => 1, },
|
|
];
|
|
|
|
push @tests, $test;
|
|
|
|
# Valid patron, invalid patron password
|
|
$test = clone($patron_status_test_template);
|
|
$test->{id} = 'Patron Status: Valid patron, invalid patron password';
|
|
$test->{msg} .= (FID_PATRON_PWD) . 'badpwd|';
|
|
delete $test->{fields};
|
|
$test->{fields} = [
|
|
$SIPtest::field_specs{(FID_INST_ID)},
|
|
$SIPtest::field_specs{(FID_SCREEN_MSG)},
|
|
$SIPtest::field_specs{(FID_PRINT_LINE)},
|
|
{ field => FID_PATRON_ID,
|
|
pat => qr/^$user_barcode$/,
|
|
required => 1, },
|
|
{ field => FID_PERSONAL_NAME,
|
|
pat => qr/^$user_fullname$/,
|
|
required => 1, },
|
|
{ field => FID_VALID_PATRON,
|
|
pat => qr/^Y$/,
|
|
required => 1, },
|
|
{ field => FID_VALID_PATRON_PWD,
|
|
pat => qr/^N$/,
|
|
required => 1, },
|
|
];
|
|
push @tests, $test;
|
|
|
|
# TODO: Need multiple patrons to test each individual
|
|
# status field
|
|
|
|
SIPtest::run_sip_tests(@tests);
|
|
|
|
1;
|