r1735@llin: dpavlin | 2008-09-06 11:54:01 +0200

 cleanup test

git-svn-id: svn+ssh://mjesec/home/dpavlin/svn/webpac2/trunk@1109 07558da8-63fa-0310-ba24-9fe276d99e06

diff --git a/lib/WebPAC/Normalize/MARC.pm b/lib/WebPAC/Normalize/MARC.pm
index e298bc3..0cc675b 100644 (file)
--- a/lib/WebPAC/Normalize/MARC.pm
+++ b/lib/WebPAC/Normalize/MARC.pm
@@ -634,7 +634,7 @@ Clone marc records from input file, whole or just some fields/indicators
 
 sub marc_clone {
        foreach my $f ( keys %$rec ) {
-               warn "## clone $f";
+               warn "## marc_clone $f\n" if $debug;
                marc_original_order( $f, $f );
        }
 }

diff --git a/t/3-normalize-marc.t b/t/3-normalize-marc.t
index 8c9f675..721d78b 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 => 325;
+use Test::More tests => 330;
 
 BEGIN {
        use_ok( 'WebPAC::Test' );
@@ -129,23 +129,27 @@ foreach my $from ( 0 .. $max_occ - 1 ) {
 }
 
 sub test_marc_clone {
-       my $rec = shift;
+       my ( $rec, $expect ) = @_;
 
        ok( _clean_ds(), '_clean_ds' );
        ok( _set_ds( $rec ), '_set_ds' );
 
-       ok( marc_clone, 'marc_clone' );
+       ok( ! marc_clone, 'marc_clone' );
 
        ok(my $marc = WebPAC::Normalize::MARC::_get_marc_fields(), "_get_marc_fields");
-       diag "rec = ",dump( $rec );
-       diag "marc = ",dump( $marc );
+#      diag "rec = ",dump( $rec );
+#      diag "marc = ",dump( $marc );
+#      diag "expect = ",dump( $marc );
 
-       is_deeply( $rec, $marc, 'same' );
+       is_deeply( $marc, $expect, 'marc_clone same' );
 
 }
 
 test_marc_clone( {
        '900' => [{ 'a' => '900a', 'b' => '900b',       subfields => [ qw/a 0 b 0/ ]    }],
        '901' => [{ 'c' => '901c',                                      subfields => [ qw/c 0/ ]                }],
-} );
+}, [
+   [900, " ", " ", "a", "900a", "b", "900b"],
+   [901, " ", " ", "c", "901c"],
+] );