--- trunk/t/002_isis.t	2005/01/12 19:28:41	38
+++ trunk/t/002_isis.t	2006/07/07 22:29:49	51
@@ -3,12 +3,20 @@
 use strict;
 use blib;
 
-use Data::Dumper;
-
-use Test::More tests => 110;
+use Test::More tests => 112;
 use File::Spec;
 
-BEGIN { use_ok( 'Biblio::Isis' ); }
+BEGIN {
+	use_ok( 'Biblio::Isis' );
+	eval "use Data::Dump";
+
+	if (! $@) {
+		*Dumper = *Data::Dump::dump;
+	} else {
+		use Data::Dumper;
+	}
+}
+
 
 my $debug = shift @ARGV;
 my $isis;
@@ -93,19 +101,25 @@
 		'10' => [ '^a0-340-59691-0' ],
 	}, {
 		# identifier test
-		'225' => [ '1#^aMcGraw-Hill series in Psychology' ],
 		'200' => [ '1#^aPsychology^fCamille B. Wortman, Elizabeth F. Loftus, Mary E. Marshal' ],
+		225 => ["1#^aMcGraw-Hill series in Psychology"],
+		205 => ["^a4th ed"],
 	} ];
 		
 	foreach my $mfn (1 .. $isis->count) {
+
 		my $rec;
 		ok($rec = $isis->fetch($mfn), "fetch $mfn");
 
+
+		diag "<<<<< rec: ",Dumper( $rec ), "\n>>>>> row:", Dumper( $data->[$mfn-1] ) if ($debug);
+
 		foreach my $f (keys %{$data->[$mfn-1]}) {
 			my $i = 0;
 			foreach my $v (@{$data->[$mfn-1]->{$f}}) {
 				$v =~ s/^[01# ][01# ]// if ($args->{no_ident});
-				cmp_ok($v, '==', $rec->{$f}->[$i], "MFN $mfn $f:$i $v");
+				diag "compare '", $rec->{$f}->[$i], "' eq '$v'" if ($debug);
+				cmp_ok($rec->{$f}->[$i], 'eq', $v, "MFN $mfn field: $f offset: $i");
 				$i++;
 			}
 		}
@@ -132,7 +146,7 @@
 	debug => $debug,
 );
 
-print Dumper($isis);
+diag "new Biblio::Isis = ", Dumper($isis) if ($debug);
 
 test_data(
 	no_ident => 1,
@@ -141,7 +155,7 @@
 		4fb38537a94f3f5954e40d9536b942b0
 		579a7c6901c654bdeac10547a98e5b71
 		7d2adf1675c83283aa9b82bf343e3d85
-		daf2cf86ca7e188e8360a185f3b43423
+		4cc1f798bbcf36862f7aa78c3410801a
 	) ],
 );