--- trunk/t/1-validate-delimiters.t	2007/11/01 00:16:46	948
+++ trunk/t/1-validate-delimiters.t	2007/11/01 00:16:48	949
@@ -1,30 +1,24 @@
 #!/usr/bin/perl -w
 
 use strict;
-use Test::More tests => 15;
-use Test::Exception;
 use blib;
 
-use Data::Dump qw/dump/;
-use Cwd qw/abs_path/;
+use Test::More tests => 15;
+
 use File::Temp qw/ :POSIX /;
 
 BEGIN {
+use_ok( 'WebPAC::Test' );
 use_ok( 'WebPAC::Validate' );
 }
 
-my $debug = shift @ARGV;
-
-ok(my $abs_path = abs_path($0), "abs_path");
-$abs_path =~ s#/[^/]*$#/#;
-
 my $delimiters_path = tmpnam();
 
 ok(my $v = new WebPAC::Validate(
 	path => "$abs_path/data/validate_test",
 	delimiters => [ ' : ', ' ; ', ' / ', ' \. ', ' = ' ],
 	delimiters_path => $delimiters_path,
-	debug => $debug,
+	%LOG,
 ), "new");
 
 diag "rules = ", dump( $v->{rules} ) if ( $debug );
@@ -112,4 +106,4 @@
 
 is_deeply( $v->{_accumulated_delimiters_templates}, $v2->{_validate_delimiters_templates}, 'save/load ok');
 
-diag dump( $v, $v2 ) if ( $debug );
+diag dump( $v, $v2 ) if $debug;