Cleanup and adjustment

bad_barcode is is better than berick for clarity.

diff --git a/t/02patron_info.t b/t/02patron_info.t
index 70f8212..0437bc2 100755 (executable)
--- a/t/02patron_info.t
+++ b/t/02patron_info.t
@@ -41,7 +41,7 @@ my $patron_info_test_template = {
     msg => "6300020060329    201700          AO$instid|AA$user_barcode|",
     pat => qr/^64 [ Y]{13}\d{3}$datepat(\d{4}){6}/,
     fields => [
-              $SIPtest::field_specs{(FID_INST_ID)},
+              $SIPtest::field_specs{(FID_INST_ID)   },
               $SIPtest::field_specs{(FID_SCREEN_MSG)},
               $SIPtest::field_specs{(FID_PRINT_LINE)},
               { field    => FID_PATRON_ID,
@@ -50,7 +50,7 @@ my $patron_info_test_template = {
               { field    => FID_PERSONAL_NAME,
                 pat      => qr/^$user_fullname$/o,
                 required => 1, },
-              $SIPtest::field_specs{(FID_HOLD_ITEMS_LMT)},
+              $SIPtest::field_specs{(FID_HOLD_ITEMS_LMT)   },
               $SIPtest::field_specs{(FID_OVERDUE_ITEMS_LMT)},
               $SIPtest::field_specs{(FID_CHARGED_ITEMS_LMT)},
               { field    => FID_VALID_PATRON,
@@ -88,10 +88,10 @@ my $patron_info_test_template = {
              ], };
 
 my @tests = (
-            $SIPtest::login_test,
-            $SIPtest::sc_status_test,
-            clone($patron_info_test_template),
-            );
+    $SIPtest::login_test,
+    $SIPtest::sc_status_test,
+    clone($patron_info_test_template),
+);
 
 
 # Create the test cases for the various summary detail fields
@@ -120,18 +120,18 @@ sub create_patron_summary_tests {
                                     );
 
     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;
+    # 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;
     }
 }
 
@@ -140,23 +140,26 @@ sub create_invalid_patron_tests {
 
     $test = clone($patron_info_test_template);
     $test->{id} = "invalid Patron Info id";
-    $test->{msg} =~ s/AA$user_barcode\|/AAberick|/o;
+    $test->{msg} =~ s/AA$user_barcode\|/AAbad_barcode|/o;
     $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, },
-                      ];
+        $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_barcode$/,
+            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
@@ -166,22 +169,26 @@ sub create_invalid_patron_tests {
     $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/^$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, },
-                      ];
+        $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;
 }
 

diff --git a/t/03checkout.t b/t/03checkout.t
index b0ea53f..11dcd5d 100755 (executable)
--- a/t/03checkout.t
+++ b/t/03checkout.t
@@ -32,14 +32,14 @@ use SIPtest qw($datepat $textpat $instid $currency $user_barcode
               $item_diacritic_owner);
 
 my $patron_enable_template = {
-    id => 'Renew All: prep: enable patron permissions',
+    id  => 'Renew All: prep: enable patron permissions',
     msg => "2520060102    084238AO$instid|AA$user_barcode|",
     pat => qr/^26 {4}[ Y]{10}000$datepat/o,
     fields => [],
 };
 
 my $patron_disable_template = {
-    id => 'Checkout: block patron (prep to test checkout denied)',
+    id  => 'Checkout: block patron (prep to test checkout denied)',
     msg => "01N20060102    084238AO$instid|ALHe's a jerk|AA$user_barcode|",
     # response to block patron is a patron status message
     pat => qr/^24Y{4}[ Y]{10}000$datepat/o,
@@ -47,14 +47,14 @@ my $patron_disable_template = {
 };
 
 my $checkin_template = {
-    id => 'Checkout: cleanup: check in item',
+    id  => 'Checkout: cleanup: check in item',
     msg => "09N20050102    08423620060113    084235APUnder the bed|AO$instid|AB$item_barcode|ACterminal password|",
     pat => qr/^101YNN$datepat/o,
     fields => [],
 };
 
 my $checkout_test_template = {
-    id => 'Checkout: valid item, valid patron',
+    id  => 'Checkout: valid item, valid patron',
     msg => "11YN20060329    203000                  AO$instid|AA$user_barcode|AB$item_barcode|AC|",
     pat => qr/^121NNY$datepat/,
     fields => [
@@ -151,54 +151,54 @@ $test->{msg} =~ s/AB$item_barcode/ABno-barcode/o;
 $test->{pat} = qr/^120NUN$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/^$user_barcode$/o,
-                    required => 1, },
-                  { field    => FID_ITEM_ID,
-                    pat      => qr/^no-barcode$/,
-                    required => 1, },
-                  { field    => FID_TITLE_ID,
-                    pat      => qr/^$/,
-                    required => 1, },
-                  { field    => FID_DUE_DATE,
-                    pat      => qr/^$/,
-                    required => 1, },
-                  { field    => FID_VALID_PATRON,
-                    pat      => qr/^Y$/,
-                    required => 1, },
-                  ];
+    $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$/o,
+      required => 1, },
+    { field    => FID_ITEM_ID,
+      pat      => qr/^no-barcode$/,
+      required => 1, },
+    { field    => FID_TITLE_ID,
+      pat      => qr/^$/,
+      required => 1, },
+    { field    => FID_DUE_DATE,
+      pat      => qr/^$/,
+      required => 1, },
+    { field    => FID_VALID_PATRON,
+      pat      => qr/^Y$/,
+      required => 1, },
+];
 
 push @tests, $test;
 
 # Invalid patron, valid item
 $test = clone($checkout_test_template);
 $test->{id} = 'Checkout: invalid patron, valid item';
-$test->{msg} =~ s/AA$user_barcode/AAberick/;
+$test->{msg} =~ s/AA$user_barcode/AAbad_barcode/;
 $test->{pat} = qr/^120NUN$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/^berick$/,
-                    required => 1, },
-                  { field    => FID_ITEM_ID,
-                    pat      => qr/^$item_barcode$/o,
-                    required => 1, },
-                  { field    => FID_TITLE_ID,
-                    pat      => qr/^$item_title\s*$/o,
-                    required => 1, },
-                  { field    => FID_DUE_DATE,
-                    pat      => qr/^$/,
-                    required => 1, },
-                  { field    => FID_VALID_PATRON,
-                    pat      => qr/^N$/,
-                    required => 1, },
-                  ];
+    $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_ITEM_ID,
+      pat      => qr/^$item_barcode$/o,
+      required => 1, },
+    { field    => FID_TITLE_ID,
+      pat      => qr/^$item_title\s*$/o,
+      required => 1, },
+    { field    => FID_DUE_DATE,
+      pat      => qr/^$/,
+      required => 1, },
+    { field    => FID_VALID_PATRON,
+      pat      => qr/^N$/,
+      required => 1, },
+];
 
 push @tests, $test;