--- trunk/t/3-normalize.t	2006/06/29 15:29:41	540
+++ trunk/t/3-normalize.t	2006/06/29 23:19:26	547
@@ -2,7 +2,7 @@
 
 use strict;
 
-use Test::More tests => 69;
+use Test::More tests => 75;
 use Test::Exception;
 use Cwd qw/abs_path/;
 use blib;
@@ -342,9 +342,24 @@
 	}, 'correct get_ds');
 
 	# MARC
-	test_s(qq{ marc21('900','a', rec('200') ) });
+	test_s(qq{ marc_indicators('900',1,2) });
+	test_s(qq{ marc('900','a', rec('200') ) });
 	my @marc;
-	ok(@marc = WebPAC::Normalize::_get_marc21_fields(), "_get_marc21_fields");
-	diag Dumper(\@marc);
+	ok(@marc = WebPAC::Normalize::_get_marc_fields(), "_get_marc_fields");
+
+	is_deeply( \@marc, [
+		[ '900', 1, 2, 'a', '200a' ],
+		[ '900', 1, 2, 'a', '200-solo' ]
+	], 'correct marc with indicators');
+
+	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");
+
+	is_deeply( \@marc, [
+		[ '900', 1, 2, 'a', '200a', 'a', '200-solo' ],
+		[ '900', ' ', 9, 'a', '200a', 'a', '200-solo' ]
+	], 'correct marc with repetable subfield');
 }