r1604@llin: dpavlin | 2007-11-11 21:02:22 +0100

[webpac2] / t / 3-normalize-marc.t

diff --git a/t/3-normalize-marc.t b/t/3-normalize-marc.t
index 4d720ab..a636b91 100755 (executable)
--- a/t/3-normalize-marc.t
+++ b/t/3-normalize-marc.t
@@ -3,7 +3,7 @@
 use strict;
 use blib;
 
-use Test::More tests => 4;
+use Test::More tests => 7;
 
 BEGIN {
        use_ok( 'WebPAC::Test' );
@@ -33,13 +33,20 @@ my $rec = {
                'i' => 'i-4-1',
                'w' => 'w-4-1',
        },{
-               'a' => 'a-4-1',
-               'v' => 'v-4-1',
-               'i' => 'i-4-1',
+               'a' => 'a-5-1',
+               'v' => 'v-5-1',
+               'i' => 'i-5-1',
        },{
-               'a' => 'a-4-1',
-               'i' => 'i-4-1',
-               'w' => 'w-4-1',
+               'a' => 'a-6-1',
+               'i' => 'i-6-1',
+               'w' => 'w-6-1',
+       },{
+               'a' => 'a-7-1',
+       },{
+               'a' => 'a-8-1',
+               'v' => 'v-8-1',
+       },{
+               'v' => 'v-9-1',
        }],
 };
 
@@ -61,20 +68,25 @@ ok( marc_template(
        ],
        marc_template => [
                'a',
+               'a ;|v',
+               'a.|p',
                'a, |x ; |v. |n, |p ; |v',
                'a ; |v. |p ; |v',
+               'v',
        ],
 ), 'marc_template' );
 
 ok(my $marc = WebPAC::Normalize::_get_marc_fields(), "_get_marc_fields");
-diag dump( $marc ) if $debug;
+diag " _get_marc_fields = ",dump( $marc ) if $debug;
 
-is_deeply( $marc,
-       [
-               [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-5-1"],
-       ],
-'is_deeply');
+is_deeply( $marc, [
+       [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, " ", " ", "v", "v-9-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-5-1 ; ", "v", "v-5-1. ", "p", "i-5-1"],
+       [440, " ", " ", "a", "a-6-1. ", "p", "i-6-1 ; ", "v", "w-6-1"],
+       [440, " ", " ", "a", "a-7-1"],
+       [440, " ", " ", "a", "a-8-1 ;", "v", "v-8-1"],
+], 'is_deeply');