--- trunk/t/2_isis.t	2006/07/07 23:45:12	54
+++ trunk/t/2_isis.t	2006/07/13 13:27:27	64
@@ -3,7 +3,7 @@
 use strict;
 use blib;
 
-use Test::More tests => 124;
+use Test::More tests => 174;
 use File::Spec;
 
 BEGIN {
@@ -18,7 +18,7 @@
 }
 
 
-my $debug = length( shift @ARGV );
+my $debug = length( shift(@ARGV) || '' );
 my $isis;
 
 my $path_winisis = File::Spec->catfile('data', 'winisis', 'BIBL');
@@ -187,11 +187,17 @@
 cmp_ok($isis->{deleted}, '==', 3, "MFN 3 is deleted");
 ok($isis->{record}, "record exists");
 
-diag "record = ",Dumper($isis->{record});
+diag "record = ",Dumper($isis->{record}) if ($debug);
 
 $isis = Biblio::Isis->new (
 	isisdb => $path_winisis,
 	debug => $debug,
+	hash_filter => sub {
+		my ($l,$nr) = @_;
+		ok(grep(/$nr/, keys %{ $isis->{record} }), "hash_filter $nr in record");
+		ok(grep(/\Q$l\E/, @{ $isis->{record}->{$nr} }), "hash_filter line $l found");
+		return($l);
+	},
 );
 
 ok(! $isis->fetch(3), "deleted not found");
@@ -211,5 +217,64 @@
 };
 $isis->{current_mfn} = 42;
 
-diag "to_hash = ",Dumper( $isis->to_hash( $isis->mfn ) );
-diag "to_ascii = \n", $isis->to_ascii( $isis->mfn );
+ok(my $hash = $isis->to_hash( $isis->mfn ), 'to_hash');
+diag "to_hash = ",Dumper( $hash ) if ($debug);
+is_deeply( $hash, {
+	"000" => [42],
+	900   => [{ a => "900a", b => "900b", c => "900c" }],
+	901   => [
+		{ a => "901a-1", b => "901b-1", c => "901c-1" },
+		{ a => "901a-2", b => "901b-2" },
+		{ a => "901a-3" },
+	],
+	902   => [
+		{ a => ["a1", "a2", "a3", "a4", "a5"], b => ["b1", "b2"], c => "c1" },
+	],
+}, 'hash is_deeply');
+
+ok(my $ascii = $isis->to_ascii( $isis->mfn ), 'to_ascii');
+diag "to_ascii = \n", $ascii if ($debug);
+cmp_ok($ascii, 'eq', <<'__END_OF_ASCII__', 'to_ascii output');
+0	42
+900	^a900a^b900b^c900c
+901	^a901a-1^b901b-1^c901c-1
+901	^a901a-2^b901b-2
+901	^a901a-3
+902	^aa1^aa2^aa3^bb1^aa4^bb2^cc1^aa5
+__END_OF_ASCII__
+
+ok(my $hash2 = $isis->to_hash({ mfn => $isis->mfn }), 'to_hash(mfn)');
+is_deeply( $hash2, $hash, 'same hash' );
+
+ok($hash = $isis->to_hash({ mfn => $isis->mfn, include_subfields => 1 }), 'to_hash(mfn,include_subfields)');
+diag "to_hash = ",Dumper( $hash ) if ($debug);
+is_deeply( $hash, {
+  "000" => [42],
+  900   => [
+	{ a => "900a", b => "900b", c => "900c", subfields => ["a", 0, "b", 0, "c", 0] },
+  ],
+  901   => [
+	{ a => "901a-1", b => "901b-1", c => "901c-1", subfields => ["a", 0, "b", 0, "c", 0] },
+	{ a => "901a-2", b => "901b-2", subfields => ["a", 0, "b", 0] },
+	{ a => "901a-3", subfields => ["a", 0] },
+  ],
+  902   => [
+	{ a => ["a1", "a2", "a3", "a4", "a5"], b => ["b1", "b2"], c => "c1",
+	  subfields => ["a", 0, "a", 1, "a", 2, "b", 0, "a", 3, "b", 1, "c", 0, "a", 4],
+	},
+  ],
+}, 'hash is_deeply');
+
+ok($hash = $isis->to_hash({ mfn => $isis->mfn, join_subfields_with => ' ; ' }), 'to_hash(mfn,join_subfields_with)');
+diag "to_hash = ",Dumper( $hash ) if ($debug);
+is_deeply( $hash, {
+   "000" => [42],
+   900   => [{ a => "900a", b => "900b", c => "900c" }],
+   901   => [
+              { a => "901a-1", b => "901b-1", c => "901c-1" },
+              { a => "901a-2", b => "901b-2" },
+              { a => "901a-3" },
+            ],
+   902   => [{ a => "a1 ; a2 ; a3 ; a4 ; a5", b => "b1 ; b2", c => "c1" }],
+}, 'hash is_deeply');
+