Adjust tests to agree with the code. Since the server reports

that a patron is valid, but the password was wrong, we need to
make sure that that's what the tests expect.

diff --git a/t/01patron_status.t b/t/01patron_status.t
index 91a3e32..f67f12e 100644 (file)
--- a/t/01patron_status.t
+++ b/t/01patron_status.t
@@ -38,30 +38,36 @@ my @tests = (
                            required => 0, },
                          ], },
             { id => 'invalid password Patron Status',
-              msg => '2300120060101    084237AOUWOLS|AAdjfiander|AC|',
-              pat => qr/^24Y[ Y]{13}\d{3}$datepat/,
+              msg => '2300120060101    084237AOUWOLS|AAdjfiander|AC|ADbadw',
+              pat => qr/^24[ Y]{14}\d{3}$datepat/,
               fields => [
-                         { field    => 'AE',
-                           pat      => qr/^$/,
+                         { field    => FID_PERSONAL_NAME,
+                           pat      => qr/^David J\. Fiander$/,
                            required => 1, },
-                         { field    => 'AA',
+                         { field    => FID_PATRON_ID,
                            pat      => qr/^djfiander$/,
                            required => 1, },
-                         { field    => 'AO',
+                         { field    => FID_INST_ID,
                            pat      => qr/^UWOLS$/,
                            required => 1, },
+                         { field    => FID_VALID_PATRON_PWD,
+                           pat      => qr/^N$/,
+                           required => 1, },
+                         { field    => FID_VALID_PATRON,
+                           pat      => qr/^Y$/,
+                           required => 1, },
                          ], },
             { id => 'invalid Patron Status',
               msg => '2300120060101    084237AOUWOLS|AAwshakespeare|AC|',
               pat => qr/^24Y[ Y]{13}\d{3}$datepat/,
               fields => [
-                         { field    => 'AE',
+                         { field    => FID_PERSONAL_NAME,
                            pat      => qr/^$/,
                            required => 1, },
-                         { field    => 'AA',
+                         { field    => FID_PATRON_ID,
                            pat      => qr/^wshakespeare$/,
                            required => 1, },
-                         { field    => 'AO',
+                         { field    => FID_INST_ID,
                            pat      => qr/^UWOLS$/,
                            required => 1, },
                          ], },

diff --git a/t/02patron_info.t b/t/02patron_info.t
index 86c953c..29afb2f 100644 (file)
--- a/t/02patron_info.t
+++ b/t/02patron_info.t
@@ -3,46 +3,164 @@
 
 use strict;
 use warnings;
+use Clone qw(clone);
 
 use Sip::Constants qw(:all);
 
-use SIPtest qw($datepat);
+use SIPtest qw($datepat $textpat);
+
+# This is a template test case for the Patron Information
+# message handling.  Because of the large number of fields,
+# this template forms the bases for all of the different
+# situations: valid patron no details, valid patron with each
+# individual detail requested, invalid patron, invalid patron
+# password, etc.
+my $patron_info_test_template = {
+    id => 'valid Patron Info no details',
+    msg => '6300020060329    201700          AOUWOLS|AAdjfiander|',
+    pat => qr/^64 [ Y]{13}\d{3}$datepat(\d{4}){6}/,
+    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/^djfiander$/,
+                required => 1, },
+              { field    => FID_PERSONAL_NAME,
+                pat      => qr/^David J\. Fiander$/,
+                required => 1, },
+              $SIPtest::field_specs{(FID_HOLD_ITEMS_LMT)},
+              $SIPtest::field_specs{(FID_OVERDUE_ITEMS_LMT)},
+              $SIPtest::field_specs{(FID_CHARDED_ITEMS_LMT)},
+              { 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, },
+              { field    => FID_FEE_LMT,
+                pat      => $textpat,
+                required => 0, },
+              { field    => FID_HOME_ADDR,
+                pat      => qr/^2 Meadowvale Dr\. St Thomas, ON$/,
+                required => 1, }, # required by this test case
+              { field    => FID_EMAIL,
+                pat      => qr/^djfiander\@hotmail.com$/,
+                required => 1, },
+              { field    => FID_HOME_PHONE,
+                pat      => qr/^\(519\) 555 1234$/,
+                required => 1, },
+              { field    => FID_PATRON_BIRTHDATE,
+                pat      => qr/^19640925$/,
+                required => 1, },
+              { field    => FID_PATRON_CLASS,
+                pat      => qr/^A$/,
+                required => 1, },
+              ], };
 
 my @tests = (
             $SIPtest::login_test,
             $SIPtest::sc_status_test,
-            { id => 'valid Patron Info no details',
-              msg => '6300020060329    201700          AOUWOLS|AAdjfiander|',
-              pat => qr/^64 [ Y]{13}\d{3}$datepat(\d{4}){6}/,
-              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/^djfiander$/,
-                           required => 1, },
-                         { field    => FID_PERSONAL_NAME,
-                           pat      => qr/^David J\. Fiander$/,
-                           required => 1, },
-                         { field    => FID_HOLD_ITEMS_LMT,
-                           pat      => qr/^\d{4}$/,
-                           required => 0, },
-                         { field    => FID_OVERDUE_ITEMS_LMT,
-                           pat      => qr/^\d{4}$/,
-                           required => 0, },
-                         { field    => FID_CHARDED_ITEMS_LMT,
-                           pat      => qr/^\d{4}$/,
-                           required => 0, },
-                         { field    => FID_VALID_PATRON,
-                           pat      => qr/^Y$/,
-                           # Not required by the spec, but by the test
-                           required => 1, },
-                         { field    => FID_CURRENCY,
-                           pat      => qr/^CAD$/,
-                           required => 0, },
-                         ], },
+            clone($patron_info_test_template),
             );
 
+
+# Create the test cases for the various summary detail fields
+sub create_patron_summary_tests {
+    my $test;
+    my @patron_info_summary_tests = (
+                                    { field    => FID_HOLD_ITEMS,
+                                      pat      => $textpat,
+                                      required => 0, },
+                                    { field    => FID_OVERDUE_ITEMS,
+                                      pat      => $textpat,
+                                      required => 0, },
+                                    { field    => FID_CHARGED_ITEMS,
+                                      pat      => $textpat,
+                                      required => 0, },
+                                    { field    => FID_FINE_ITEMS,
+                                      pat      => $textpat,
+                                      required => 1, },
+                                    { field    => FID_RECALL_ITEMS,
+                                      pat      => $textpat,
+                                      required => 0, },
+                                    { field    => FID_UNAVAILABLE_HOLD_ITEMS,
+                                      pat      => $textpat,
+                                      required => 0, },
+                                    );
+
+    foreach my $i (0 .. scalar @patron_info_summary_tests-1) {
+       # The tests for each of the summary fields are exactly the
+       # same as the basic one, except for the fact that there's
+       # an extra field to test
+
+       # Copy the hash, adjust it, add it to the end of the list
+       $test = clone($patron_info_test_template);
+
+       substr($test->{msg}, 23+$i, 1) = 'Y';
+       $test->{id} = "valid Patron Info details: "
+           . $patron_info_summary_tests[$i]->{field};
+       push @{$test->{fields}}, $patron_info_summary_tests[$i];
+       push @tests, $test;
+    }
+}
+
+sub create_invalid_patron_tests {
+    my $test;
+
+    $test = clone($patron_info_test_template);
+    $test->{id} = "invalid Patron Info id";
+    $test->{msg} =~ s/AAdjfiander\|/AAberick|/;
+    $test->{pat} = qr/^64Y[ Y]{13}\d{3}$datepat(\d{4}){6}/;
+    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/^berick$/,
+                        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_info_test_template);
+    $test->{id} = "valid Patron Info, invalid password";
+    $test->{msg} .= (FID_PATRON_PWD) . 'badpwd|';
+    $test->{pat} = qr/^64[ Y]{14}\d{3}$datepat(\d{4}){6}/;
+    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/^djfiander$/,
+                        required => 1, },
+                      { field    => FID_PERSONAL_NAME,
+                        pat      => qr/^David J\. Fiander$/,
+                        required => 1, },
+                      { field    => FID_VALID_PATRON,
+                        pat      => qr/^Y$/,
+                        required => 1, },
+                      { field    => FID_VALID_PATRON_PWD,
+                        pat      => qr/^N$/,
+                        required => 1, },
+                      ];
+    push @tests, $test;
+}
+
+create_patron_summary_tests;
+
+create_invalid_patron_tests;
+
 SIPtest::run_sip_tests(@tests);
 
 1;