--- trunk/t/3-normalize.t	2006/07/04 10:34:15	578
+++ trunk/t/3-normalize.t	2006/07/04 11:08:43	579
@@ -2,7 +2,7 @@
 
 use strict;
 
-use Test::More tests => 140;
+use Test::More tests => 147;
 use Test::Exception;
 use Cwd qw/abs_path/;
 use blib;
@@ -364,11 +364,11 @@
 
 	test_s(qq{ marc_indicators('900',1,2) });
 	test_s(qq{ marc('900','a', rec('200') ) });
-	my @marc;
-	ok(@marc = WebPAC::Normalize::_get_marc_fields(), "_get_marc_fields");
-	diag dump( \@marc ) if ($debug);
+	my $marc;
+	ok($marc = WebPAC::Normalize::_get_marc_fields(), "_get_marc_fields");
+	diag dump( $marc ) if ($debug);
 
-	is_deeply( \@marc, [
+	is_deeply( $marc, [
 		[ '900', 1, 2, 'a', '200a' ],
 		[ '900', 1, 2, 'a', '200-solo' ]
 	], 'correct marc with indicators');
@@ -376,10 +376,10 @@
 	test_s(qq{ marc_indicators('900',' ',9) });
 	test_s(qq{ marc_repeatable_subfield('900','a', rec('200') ) });
 
-	ok(@marc = WebPAC::Normalize::_get_marc_fields(), "_get_marc_fields");
-	diag dump( \@marc ) if ($debug);
+	ok($marc = WebPAC::Normalize::_get_marc_fields(), "_get_marc_fields");
+	diag dump( $marc ) if ($debug);
 
-	is_deeply( \@marc, [
+	is_deeply( $marc, [
 		[ '900', 1, 2, 'a', '200a', 'a', '200-solo' ],
 		[ '900', ' ', 9, 'a', '200a', 'a', '200-solo' ]
 	], 'correct marc with repetable subfield');
@@ -401,10 +401,10 @@
 			test_s($r) if ($r);
 		}
 
-		ok(my @marc = WebPAC::Normalize::_get_marc_fields(), "_get_marc_fields");
-		diag dump( \@marc ) if ($debug);
+		ok(my $marc = WebPAC::Normalize::_get_marc_fields(), "_get_marc_fields");
+		diag dump( $marc ) if ($debug);
 		diag "expects:\n", dump($struct) if ($debug > 1);
-		is_deeply( \@marc, $struct, $msg );
+		is_deeply( $marc, $struct, $msg );
 	}
 
 	test_rec_rules(
@@ -565,7 +565,7 @@
 	);
 
 	test_rec_rules(
-		'marc_remove',
+		'marc_remove subfield',
 		{ '200' => [{ a => 42, b => 'bar', c => 'baz' }] },
 		qq{
 			marc('900', 'a', rec('200','a') );
@@ -580,6 +580,20 @@
 	);
 
 	test_rec_rules(
+		'marc_remove field',
+		{ '200' => [{ a => 42, b => 'bar', c => 'baz' }] },
+		qq{
+			marc('900', 'a', rec('200','a') );
+			marc('900', 'b', rec('200','b') );
+			marc('901', 'b', rec('200','b') );
+			marc('901', 'c', rec('200','c') );
+			marc_remove('900');
+		},
+		[
+			[ '901', ' ', ' ', 'b', 'bar', 'c', 'baz' ],
+		],
+	);
+	test_rec_rules(
 		'marc_duplicate',
 		{ '200' => [{ a => 42, b => 'bar', c => 'baz', d => 'bing', e => 'bong' }] },
 		qq{
@@ -604,11 +618,11 @@
 	my $i = 0;
 	foreach my $v ( qw/bar baz bing bong/ ) {
 
-		ok(@marc = WebPAC::Normalize::_get_marc_fields( offset => $i ),
+		ok($marc = WebPAC::Normalize::_get_marc_fields( offset => $i ),
 			"_get_marc_fields( offset => $i )"
 		);
-		diag "marc $i = ", dump( @marc ) if ($debug);
-		is_deeply( \@marc,
+		diag "marc $i = ", dump( $marc ) if ($debug);
+		is_deeply( $marc,
 			[ [ '900', ' ', ' ', 'a', 42, 'b', $v ] ],
 			"MARC copy $i has $v",
 		);