X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=t%2F2-parse.t;h=34a795bdc114ff0d6320429bf7c658eee09e4253;hb=33156dfb36756fcafdf27a56b3254344aab06d09;hp=10e677fc8ce8dfe86f549eeba19b1b797b9842ee;hpb=0dbf6d34479554989fa7b34137bf1aa37c72671d;p=webpac2

diff --git a/t/2-parse.t b/t/2-parse.t
index 10e677f..34a795b 100755
--- a/t/2-parse.t
+++ b/t/2-parse.t
@@ -1,35 +1,29 @@
 #!/usr/bin/perl -w
 
 use strict;
-use Test::More tests => 55;
-use Test::Exception;
-use blib;
+use lib 'lib';
+
+use Test::More tests => 60;
 
-use Data::Dump qw/dump/;
-use Cwd qw/abs_path/;
 use YAML qw/LoadFile/;
 
 BEGIN {
+use_ok( 'WebPAC::Test' );
 use_ok( 'WebPAC::Parser' );
 use_ok( 'WebPAC::Config' );
 }
 
-my $debug = shift @ARGV;
-
-ok(my $abs_path = abs_path($0), "abs_path");
-$abs_path =~ s#/[^/]*$#/#;
-
 my $config_path = "$abs_path/conf/test.yml";
 
 ok(-e $config_path, "$config_path exists");
 
-throws_ok { new WebPAC::Parser( no_log => 1 ) } qr/WebPAC::Config/, "new without config";
+throws_ok { new WebPAC::Parser( %LOG ) } qr/WebPAC::Config/, "new without config";
 
 ok(
 	my $parser = new WebPAC::Parser(
 		config => new WebPAC::Config( path => $config_path ),
 		base_path => $abs_path,
-		debug => $debug,
+		%LOG
 ), "new");
 
 my $inputs = {
@@ -67,7 +61,7 @@ ok(my $n = $parser->{_normalize_source}, "_normalize_source");
 diag "_normalize_source = ",dump($n) if ($debug);
 foreach my $db (keys %$n) {
 	foreach my $i (keys %{$n->{$db}}) {
-		ok(my $r = $parser->normalize_rules($db,$i), "normalize_source($db/$i)");
+		ok(my $r = $parser->normalize_rules($db,$i), "normalize_rules($db/$i)");
 		diag "normalize_rules($db,$i) = $r" if ($debug);
 		cmp_ok($n->{$db}->{$i}, 'eq', $r, "same");
 	}
@@ -117,13 +111,13 @@ $config_path = "$abs_path/conf/marc.yml";
 ok(-e $config_path, "$config_path exists");
 
 ok(
-	my $parser = new WebPAC::Parser(
+	$parser = new WebPAC::Parser(
 		config => new WebPAC::Config( path => $config_path ),
 		base_path => $abs_path,
-		debug => $debug,
+		%LOG,
 ), "new");
 
-ok(my $marc = $parser->generate_marc('marc','marc-input'), 'generate_marc');
+ok(my $marc = $parser->have_rules('marc', 'marc', 'marc-input'), 'have_rules(marc,...)');
 
 diag "marc: ",dump($marc) if ($debug);
 
@@ -138,3 +132,27 @@ is_deeply($marc, {
 	marc_repeatable_subfield	=> 1,
 }, 'catched all marc_*');
 
+
+$config_path = "$abs_path/conf/sub.yml";
+
+ok(-e $config_path, "$config_path exists");
+
+ok(
+	$parser = new WebPAC::Parser(
+		config => new WebPAC::Config( path => $config_path ),
+		base_path => $abs_path,
+		%LOG,
+), "new");
+
+ok(my $rules = $parser->normalize_rules('sub','sub-input'), "normalize_rules(sub)");
+
+diag "rules: $rules" if $debug;
+
+our @test;
+eval $rules;
+diag "test = ",dump( @test ) if $debug;
+
+ok(! $@, "eval: $@" );
+
+is_deeply( [ @test ], [ "foo", "foo", "bar >>2<<", "bar >>42<<", 1,2,3 ], 'source fixed' );
+