X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=t%2F2-input.t;h=052b5866d299e03d851db548f45859b32ccdca58;hb=01091188dac765b18d9fb9bd84cad20ee4bd3e95;hp=96772f9d90fc58ede0be3b12f86a7d1333356940;hpb=4227c492b24a820e144f8398de90c70a567712f0;p=webpac2

diff --git a/t/2-input.t b/t/2-input.t
index 96772f9..052b586 100755
--- a/t/2-input.t
+++ b/t/2-input.t
@@ -1,31 +1,27 @@
 #!/usr/bin/perl -w
 
-use Test::More tests => 108;
-use Test::Exception;
-use Cwd qw/abs_path/;
-use blib;
 use strict;
+use lib 'lib';
 
-use Data::Dump qw/dump/;
+use Test::More tests => 124;
 
 BEGIN {
+use_ok( 'WebPAC::Test' );
 use_ok( 'WebPAC::Input::ISIS' );
 use_ok( 'WebPAC::Input::MARC' );
 use_ok( 'WebPAC::Input::Test' );
 }
 
-my $debug = shift @ARGV;
-my $no_log = $debug ? 0 : 1;
+$LOG{no_progress_bar} = 1;
 
-ok(my $abs_path = abs_path($0), "abs_path");
-$abs_path =~ s#/[^/]*$#/#;
+warn "# LOG = ",dump( %LOG );
 
 my $module = 'WebPAC::Input::ISIS';
 diag "testing with $module";
 
-throws_ok { my $input = new WebPAC::Input( ) } qr/module/, "need module";
-ok(my $input = new WebPAC::Input( module => $module, no_log => $no_log, no_progress_bar => 1, stats => 1 ), "new $module");
-ok(my $input_lm = new WebPAC::Input( module => $module, no_log => $no_log, no_progress_bar => 1 ), "new $module");
+throws_ok { my $input = new WebPAC::Input( %LOG ) } qr/module/, "need module";
+ok(my $input = new WebPAC::Input( module => $module, stats => 1, \%LOG ), "new $module");
+ok(my $input_lm = new WebPAC::Input( module => $module, \%LOG ), "new $module");
 
 throws_ok { $input->open( ) } qr/path/, "need path";
 
@@ -79,6 +75,8 @@ sub test_fetch($$) {
 		cmp_ok($input->pos, '==', $mfn, "pos $mfn");
 		push @db, $rec;
 		ok(my $dump = $input->dump_ascii, "dump_ascii $mfn");
+		# XXX test count will help us keep this test in-line :-)
+		ok($rec->{leader}, "leader $mfn") if $rec->{leader};
 		diag $dump if ($debug);
 	}
 
@@ -96,22 +94,22 @@ sub test_start_limit($$$$) {
 	diag "offset $s, limit: $l, expected: $e";
 
 	ok($s = $input->open( path => "$abs_path/winisis/BIBL", offset => $s, limit => $l, debug => $debug ), "open winisis");
-	cmp_ok($s, '==', $size, "db size from open = $size");
+	cmp_ok($s, '==', $size, "db size");
 	cmp_ok($input->size, '==', $e, "input->size = $e");
 }
 
 test_start_limit($input, 1, 3, 3);
 test_start_limit($input, $size, 3, 0);
-test_start_limit($input, 3, $size, $size - 2);
-test_start_limit($input, 1, $size + 2, $size);
+test_start_limit($input, 3, $size, $size - 3);
+test_start_limit($input, 1, $size, $size - 1);
 
-ok(my $s = $input->stats, 'stats');
+ok(my $s = $input->stats, "$module stats");
 diag "stats:\n$s" if ($debug);
 
 $module = 'WebPAC::Input::MARC';
 diag "testing with $module";
 
-ok($input = new WebPAC::Input( module => $module, no_log => $no_log, no_progress_bar => 1 ), "new $module");
+ok($input = new WebPAC::Input( module => $module, stats => 1, %LOG ), "new $module");
 
 ok($input->open( path => "$abs_path/data/marc.iso" ), "open marc.iso");
 
@@ -119,9 +117,12 @@ test_after_open($input);
 
 test_fetch($input, $input->size);
 
+ok(my $s = $input->stats, "$module stats");
+
+diag "stats:\n$s" if ($debug);
 # test modify_record
 $module = 'WebPAC::Input::Test';
-ok($input = new WebPAC::Input( module => $module, no_log => $no_log, no_progress_bar => 1, debug => $debug ), "new $module");
+ok($input = new WebPAC::Input( module => $module, %LOG ), "new $module");
 
 $WebPAC::Input::Test::rec = {
  	'200' => [
@@ -134,7 +135,7 @@ $WebPAC::Input::Test::rec = {
 
 $WebPAC::Input::Test::size = 42;
 
-ok($input->open( path => "$abs_path/modify_isis/LIBRI", ), "open modify_isis (plain)");
+ok($input->open( path => "/fake/path", ), "open modify_isis (plain)");
 
 cmp_ok($input->size, '==', 42, 'size');
 
@@ -143,7 +144,7 @@ ok(my $rec_p = $input->fetch, 'fetch');
 # modify_records
 
 ok($input->open(
-	path => "$abs_path/modify_isis/LIBRI",
+	path => "/another/fake/path",
 	modify_records => {
 		200 => {
 			'*' => { '^c' => '. ' },
@@ -156,13 +157,18 @@ ok($input->open(
 throws_ok { $input->seek } qr/without/, 'seek without position';
 cmp_ok($input->seek(0), '==', -1, 'seek');
 
-my $f = $WebPAC::Input::Test::filter_coderef;
-ok(ref($f) eq 'CODE', 'filter_coderef');
+sub test_filter {
+
+	my $f = $WebPAC::Input::Test::filter_coderef;
+	ok(ref($f) eq 'CODE', 'filter_coderef');
 
-cmp_ok(
-	$f->(	'^afoo^cbar^fbing : bong',	200),
-	'eq',	'^afoo. bar^fbing / bong',
-	'modify 200'
+	my ($field, $from, $to) = @_;
+	cmp_ok( $f->( $from, $field, 1 ), 'eq', $to, "filter $field |$from| -> |$to|" );
+}
+
+test_filter(200,
+	'^afoo^cbar^fbing : bong',
+	'^afoo. bar^fbing / bong',
 );
 
 # modify_file
@@ -170,22 +176,42 @@ cmp_ok(
 my $modify_file = "$abs_path/conf/modify/test.pl";
 
 ok($input->open(
-	path => "$abs_path/modify_isis/LIBRI",
+	path => "/and/another/fake/path",
 	modify_file => $modify_file,
 ), "open (with modify_file $modify_file)");
 
-my $f = $WebPAC::Input::Test::filter_coderef;
-ok(ref($f) eq 'CODE', 'filter_coderef');
-
-diag "regexps = ", dump($input->modify_file_regexps( $modify_file ));
-
-sub test_filter {
-	my ($field, $from, $to) = @_;
-	cmp_ok( $f->( $from, $field, 1 ), 'eq', $to, "filter $field |$from| -> |$to|" );
-}
+diag "regexps = ", dump($input->modify_file_regexps( $modify_file )) if ($debug);
 
 test_filter(200,
 	'^a foo ; bar = baz : zzz',
-	'^a foo^kbar^dbaz^ezzz',
+	'^a foo^kbar^dbaz : zzz',
+);
+
+# empty subfield removal
+
+ok($input->open(
+	path => "/another/fake/path",
+	modify_records => {
+		900 => {
+			'^a' => { '^e' => ' : ^e' },
+		},
+		901 => {
+			'^a' => { 'foo' => 'baz' },
+		},
+	},
+), "open (with modify_records for empty subfields)");
+
+test_filter(900,
+	'^a^ebar',
+	'^a^ebar',
 );
 
+test_filter(900,
+	'^afoo^ebar',
+	'^afoo : ^ebar',
+);
+
+test_filter(901,
+	'^afoo^ebar',
+	'^abaz^ebar',
+);