r1604@llin: dpavlin | 2007-11-11 21:02:22 +0100

[webpac2] / t / 2-parse.t

diff --git a/t/2-parse.t b/t/2-parse.t
index 36f4da2..8f1f334 100755 (executable)
--- 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 Data::Dump qw/dump/;
-use Cwd qw/abs_path/;
+use Test::More tests => 55;
+
 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 = {
@@ -120,7 +114,7 @@ ok(
        my $parser = new WebPAC::Parser(
                config => new WebPAC::Config( path => $config_path ),
                base_path => $abs_path,
-               debug => $debug,
+               %LOG,
 ), "new");
 
 ok(my $marc = $parser->have_rules('marc', 'marc', 'marc-input'), 'have_rules(marc,...)');