--- trunk/t/1-validate.t	2007/05/27 16:49:15	857
+++ trunk/t/1-validate.t	2007/05/27 17:09:47	858
@@ -17,24 +17,16 @@
 ok(my $abs_path = abs_path($0), "abs_path");
 $abs_path =~ s#/[^/]*$#/#;
 
-my $validate_path = "$abs_path/data/validate_test";
-$validate_path =~ s#//+#/#g;
-
 ok(my $v = new WebPAC::Validate(
-	path => $validate_path,
+	path => "$abs_path/data/validate_test_simple",
 	debug => $debug,
 ), "new with path");
 
 ok($v->{rules}, "rules exist");
 
 is_deeply( $v->{rules}, {
-	'900' => 1,
-	'901' => [ 'a' ],
-	'902' => [ 'b', 'c' ],
-	'903' => [ 'a', 'b', 'c' ],
-	'904' => [ 'a' ],
-	'905' => [ 'a*' ],
-}, 'rules parsed');
+	'900' => [ 'a', 'b', 'c', 'd' ],
+}, 'simple rules parsed');
 
 ok($v = new WebPAC::Validate(
 	debug => $debug,
@@ -42,7 +34,7 @@
 
 ok( ! $v->{rules}, 'no path' );
 
-ok( $v->read_validate_file( $validate_path ), "read_validate_file( $validate_path )" );
+ok( $v->read_validate_file( "$abs_path/data/validate_test" ), "read_validate_file" );
 
 ok($v->{rules}, "rules exist");