r1592@llin: dpavlin | 2007-11-11 14:52:29 +0100

[webpac2] / t / 3-normalize.t

diff --git a/t/3-normalize.t b/t/3-normalize.t
index a04a529..3629eb6 100755 (executable)
--- a/t/3-normalize.t
+++ b/t/3-normalize.t
@@ -3,7 +3,7 @@
 use strict;
 use blib;
 
-use Test::More tests => 351;
+use Test::More tests => 343;
 
 BEGIN {
        use_ok( 'WebPAC::Test' );
@@ -523,7 +523,7 @@ sub test_s {
                }
 
                ok(my $marc = WebPAC::Normalize::_get_marc_fields(), "_get_marc_fields");
-               diag dump( $marc ) if ($debug);
+               diag dump( $marc ) if $debug;
                diag "expects:\n", dump($struct) if ($debug > 1);
                is_deeply( $marc, $struct, $msg );
        }
@@ -881,6 +881,17 @@ sub test_s {
        test_rule( 'frec', $rec, qq{ frec(200,'b') }, [ 'b1' ] );
        test_rule( 'frec', $rec, qq{ frec(200,'c') }, [ 'c1' ] );
 
+       $rec->{'900'} = $rec->{'200'};
+       foreach my $sf ( qw/a b c/ ) {
+               ok( frec_eq( '200' => $sf, '900' => $sf ), "frec_eq 200 == 900 $sf");
+               ok( ! frec_ne( '200' => $sf, '900' => $sf ), "! frec_ne 200 == 900 $sf");
+       }
+
+       foreach my $sf ( qw/a b/ ) {
+               ok( ! frec_eq( '200' => $sf, '200' => 'c' ), "! frec_eq 200 $sf == 200 c");
+               ok( frec_ne( '200' => $sf, '200' => 'c' ), "frec_ne 200 $sf == 200 c");
+       }
+
        # marc_template
 
        test_rec_rules(
@@ -906,6 +917,14 @@ sub test_s {
                                'v' => 'v-4-1',
                                'i' => 'i-4-1',
                                'w' => 'w-4-1',
+                       },{
+                               'a' => 'a-4-1',
+                               'v' => 'v-4-1',
+                               'i' => 'i-4-1',
+                       },{
+                               'a' => 'a-4-1',
+                               'i' => 'i-4-1',
+                               'w' => 'w-4-1',
                        }],
                },
                qq{
@@ -919,30 +938,24 @@ sub test_s {
                                        'i' => 'p',
                                        'w' => 'v',
                                ],
+                               isis_template => [
+                                       'a ; |v. |i',
+                                       'a. |i ; |w',
+                               ],
                                marc_template => [
+                                       'a',
                                        'a, |x ; |v. |n, |p ; |v',
                                        'a ; |v. |p ; |v',
-                                       'a. |p ; |v',
                                ],
                        );
                },
                [
-                       [440, " ", " ",
-                               ["a", "a-1-1"],
-                               ["x", "x-1-1"],
-                               ["v", "v-1-1"],
-                               ["n", "h-1-1"],
-                               ["p", "i-1-1"],
-                               ["v", "w-1-1"],
-                       ],
-                       [440, " ", " ", ["a", "a-2-1"], ["p", "i-2-1"], ["v", "v-2-1"]],
-                       [440, " ", " ", ["a", "a-3-1"], ["p", "i-3-1"], ["v", "v-3-1"]],
-                       [440, " ", " ",
-                               ["a", "a-4-1"],
-                               ["v", "v-4-1"],
-                               ["p", "i-4-1"],
-                               ["v", "w-4-1"],
-                       ],
+                       [440, " ", " ", "a", "a-1-1", "x", "x-1-1", "v", "v-1-1", "n", "h-1-1", "p", "i-1-1", "v", "w-1-1"],
+                       [440, " ", " ", "a", "a-2-1", "v", "v-2-1", "p", "i-2-1"],
+                       [440, " ", " ", "a", "a-3-1", "v", "v-3-1", "p", "i-3-1"],
+                       [440, " ", " ", "a", "a-4-1", "v", "v-4-1", "p", "i-4-1", "v", "w-4-1"],
+                       [440, " ", " ", "a", "a-4-1", "v", "v-4-1", "p", "i-4-1"],
+                       [440, " ", " ", "a", "a-4-1", "p", "i-4-1", "v", "w-4-1"],
                ],
        );
 }