better logging, use Data::Dump if available [0.14]

[Biblio-Isis] / t / 002_isis.t

diff --git a/t/002_isis.t b/t/002_isis.t
index 078f5b0..c031d94 100755 (executable)
--- a/t/002_isis.t
+++ b/t/002_isis.t
@@ -3,28 +3,45 @@
 use strict;
 use blib;
 
-use Data::Dumper;
+use Test::More tests => 110;
+use File::Spec;
 
-use Test::More tests => 104;
+my $emulate_dump = 0;
 
-BEGIN { use_ok( 'IsisDB' ); }
+BEGIN {
+       use_ok( 'Biblio::Isis' );
+       eval "use Data::Dump";
 
+       if (! $@) {
+               *Dumper = *Data::Dump::dump;
+       } else {
+               use Data::Dumper;
+       }
+}
+
+
+my $debug = shift @ARGV;
 my $isis;
 
+my $path_winisis = File::Spec->catfile('data', 'winisis', 'BIBL');
+my $path_isismarc = File::Spec->catfile('data', 'isismarc', 'BIBL');
+
 sub test_data {
 
        my $args = {@_};
 
-       isa_ok ($isis, 'IsisDB');
+       isa_ok ($isis, 'Biblio::Isis');
 
-       cmp_ok($isis->{maxmfn}, '==', 5, "maxmfn set to 5");
+       cmp_ok($isis->count, '==', 5, "count is 5");
 
        # test .CNT data
 
        SKIP: {
                skip "no CNT file for this database", 5 unless $isis->{cnt_file};
 
-               $isis->read_cnt;
+               ok(my $isis_cnt = $isis->read_cnt, "read_cnt");
+
+               cmp_ok(scalar keys %{$isis_cnt}, '==', 2, "returns 2 elements");
 
                my $cnt = {
                        '1' => {
@@ -53,7 +70,7 @@ sub test_data {
 
                foreach my $c (keys %{$cnt}) {
                        foreach my $kn (keys %{$cnt->{$c}}) {
-                               cmp_ok($isis->{cnt}->{$c}->{$kn}, '==', $cnt->{$c}->{$kn}, "cnt $c $kn same");
+                               cmp_ok($isis_cnt->{$c}->{$kn}, '==', $cnt->{$c}->{$kn}, "cnt $c $kn same");
                        }
                }
        }
@@ -90,7 +107,10 @@ sub test_data {
                '200' => [ '1#^aPsychology^fCamille B. Wortman, Elizabeth F. Loftus, Mary E. Marshal' ],
        } ];
                
-       foreach my $mfn (1 .. $isis->{'maxmfn'}) {
+       foreach my $mfn (1 .. $isis->count) {
+
+               diag "row: ",Dumper( $data->[$mfn-1] );
+
                my $rec;
                ok($rec = $isis->fetch($mfn), "fetch $mfn");
 
@@ -98,7 +118,7 @@ sub test_data {
                        my $i = 0;
                        foreach my $v (@{$data->[$mfn-1]->{$f}}) {
                                $v =~ s/^[01# ][01# ]// if ($args->{no_ident});
-                               cmp_ok($rec->{$f}->[$i], '==', $v, "MFN $mfn $f:$i $v");
+                               cmp_ok($v, 'eq', $rec->{$f}->[$i], "MFN $mfn $f:$i $v");
                                $i++;
                        }
                }
@@ -111,33 +131,36 @@ sub test_data {
 
                skip "no Digest::MD5 module", 5 if ($@);
 
-               foreach my $mfn (1 .. $isis->{'maxmfn'}) {
+               foreach my $mfn (1 .. $isis->count) {
                        my $md5 = md5_hex($isis->to_ascii($mfn));
-                       cmp_ok($args->{md5_ascii}[$mfn - 1], 'eq', $md5, "md5 $mfn");
+                       cmp_ok($md5, 'eq', $args->{md5_ascii}[$mfn - 1], "md5 $mfn");
                }
        }
 
 }
 
-$isis = IsisDB->new (
-       isisdb => './data/winisis/BIBL',
+$isis = Biblio::Isis->new (
+       isisdb => $path_winisis,
+       include_deleted => 1,
+       debug => $debug,
 );
 
-print Dumper($isis);
+diag "isis-new result: ", Dumper($isis);
 
 test_data(
        no_ident => 1,
        md5_ascii => [ qw(
                a369eff702307ba12eb81656ee0587fe
                4fb38537a94f3f5954e40d9536b942b0
-               498cc16c9e7ab0fdc29182533cc35d11
+               579a7c6901c654bdeac10547a98e5b71
                7d2adf1675c83283aa9b82bf343e3d85
                daf2cf86ca7e188e8360a185f3b43423
        ) ],
 );
 
-$isis = IsisDB->new (
-       isisdb => './data/isismarc/BIBL',
+$isis = Biblio::Isis->new (
+       isisdb => $path_isismarc,
+       include_deleted => 1,
 );
 
 test_data(
@@ -149,3 +172,22 @@ test_data(
                843b9ebccf16a498fba623c78f21b6c0
        ) ],
 );
+
+# check logically deleted
+
+$isis = Biblio::Isis->new (
+       isisdb => $path_winisis,
+       include_deleted => 1,
+);
+
+ok($isis->fetch(3), "deleted found");
+cmp_ok($isis->{deleted}, '==', 3, "MFN 3 is deleted");
+
+$isis = Biblio::Isis->new (
+       isisdb => $path_winisis,
+       debug => $debug,
+);
+
+ok(! $isis->fetch(3), "deleted not found");
+cmp_ok($isis->{deleted}, '==', 3, "MFN 3 is deleted");
+