--- trunk/t/001_marc.t	2007/10/29 22:41:21	21
+++ trunk/t/001_marc.t	2010/02/04 12:54:00	29
@@ -3,8 +3,8 @@
 use strict;
 use blib;
 
-use Test::More tests => 53;
-use Test::Exception;
+use Test::More tests => 63;
+use Data::Dump qw/dump/;
 
 BEGIN {
 	use_ok( 'MARC::Fast' );
@@ -14,19 +14,16 @@
 
 my $marc_file = 't/camel.usmarc';
 
-if ( $debug ) {
-	eval { require Data::Dump; };
-	$debug = 0 if ($@);
-}
-
 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} = $marc_file if -e $marc_file;
 
@@ -50,16 +47,20 @@
 	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->fetch(0), "fetch(0) again");
 	ok(! $marc->last_leader, "no last_leader");
 }