X-Git-Url: http://git.rot13.org/?p=MARC-Fast;a=blobdiff_plain;f=t%2F001_marc.t;h=ddb90706991fb80d2c833a80ba7a6af2914afa98;hp=3553dc346bc07a76873dab1e27d7d9d3caa62655;hb=cabfd93a9ff6f82e8b67e3050ca3c2ea1ef0af37;hpb=32a687e3527bec06b7a15ccceb53e6ba9f5d272a

diff --git a/t/001_marc.t b/t/001_marc.t
index 3553dc3..ddb9070 100755
--- a/t/001_marc.t
+++ b/t/001_marc.t
@@ -3,52 +3,64 @@
 use strict;
 use blib;
 
-use Test::More tests => 40;
-use Test::Exception;
+use Test::More tests => 63;
+use Data::Dump qw/dump/;
 
 BEGIN {
 	use_ok( 'MARC::Fast' );
 }
 
 my $debug = shift @ARGV;
-if ( $debug ) {
-	eval { require Data::Dump; };
-	$debug = 0 if ($@);
-}
+
+my $marc_file = 't/camel.usmarc';
 
 my $marc;
 my %param;
 
-throws_ok { $marc = MARC::Fast->new(%param); } qr/marcdb/, "marcdb parametar";
+eval { $marc = MARC::Fast->new(%param) };
+ok( $@ =~ /marcdb/, "marcdb parametar" );
 
 $param{marcdb} = '/foo/bar/file';
 
-throws_ok { $marc = MARC::Fast->new(%param); } qr/foo.bar/, "marcdb exist";
+eval { $marc = MARC::Fast->new(%param) };
+ok( $@ =~ /foo.bar/, "marcdb exist" );
 
-$param{marcdb} = 'data/unimarc.iso';
+$param{marcdb} = $marc_file if -e $marc_file;
 
 SKIP: {
 	skip "no $param{marcdb} test file ", 37 unless (-e $param{marcdb});
 
+	diag "marc file: $marc_file";
+
 	ok($marc = MARC::Fast->new(%param), "new");
 
 	isa_ok ($marc, 'MARC::Fast');
 
 	#diag Dumper($marc);
 
-	cmp_ok($marc->count, '==', scalar @{$marc->{leaders}}, "count == leaders");
+	cmp_ok($marc->count, '==', scalar @{$marc->{leader}}, "count == leader");
 	cmp_ok($marc->count, '==', scalar @{$marc->{fh_offset}}, "count == fh_offset");
 
 	ok(! $marc->fetch(0), "fetch 0");
+	ok(! $marc->last_leader, "no last_leader");
 	ok($marc->fetch($marc->count), "fetch max:".$marc->count);
 	ok(! $marc->fetch($marc->count + 1), "fetch max+1:".($marc->count+1));
 
 	foreach (1 .. 10) {
-		ok($marc->fetch($_), "fetch $_");
+		ok($marc->fetch($_), "fetch($_)");
+
+		ok($marc->last_leader, "last_leader $_");
 
-		ok(my $hash = $marc->to_hash($_), "to_hash $_");
+		ok(my $hash = $marc->to_hash($_), "to_hash($_)");
 		diag "to_hash($_) = ",Data::Dump::dump($hash) if ($debug);
-		ok(my $ascii = $marc->to_ascii($_), "to_ascii $_");
+
+		ok(my $hash_sf = $marc->to_hash($_, include_subfields => 1), "to_hash($_,include_subfields)");
+		diag "to_hash($_, include_subfields => 1) = ",Data::Dump::dump($hash_sf) if ($debug);
+
+		ok(my $ascii = $marc->to_ascii($_), "to_ascii($_)");
 		diag "to_ascii($_) ::\n$ascii" if ($debug);
 	}
+
+	ok(! $marc->fetch(0), "fetch(0) again");
+	ok(! $marc->last_leader, "no last_leader");
 }