--- trunk/t/1-validate-delimiters.t	2007/05/20 16:19:16	827
+++ trunk/t/1-validate-delimiters.t	2007/05/27 09:53:54	847
@@ -1,12 +1,13 @@
 #!/usr/bin/perl -w
 
 use strict;
-use Test::More tests => 4;
+use Test::More tests => 13;
 use Test::Exception;
 use blib;
 
 use Data::Dump qw/dump/;
 use Cwd qw/abs_path/;
+use File::Temp qw/ :POSIX /;
 
 BEGIN {
 use_ok( 'WebPAC::Validate' );
@@ -17,13 +18,16 @@
 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 => [ ' : ', ' ; ', ' / ', ' \. ', ' = ' ],
+	delimiters_path => $delimiters_path,
 	debug => $debug,
 ), "new");
 
-diag "rules = ", dump( $v->{rules} );
+diag "rules = ", dump( $v->{rules} ) if ( $debug );
 
 $v->{rules} = {};
 
@@ -41,15 +45,66 @@
 }
 
 test_v({
-	'900' => [ { 'a' => 'a : aa = aaa : a ; a', 'b' => 'b ; b ; b ; b ; a : / z . z . ' }, { 'c' => 'a : b ; c / d' } ]
+	'900' => [
+		{ 'a' => 'a : aa = aaa : a ; a', 'b' => 'b ; b ; b ; b ; a : / z . z . ' },
+		{ 'a' => 'a : a : a', 'c' => [ 'a : b ; c', 'a : b ; c / d' ] },
+		{ 'a' => 'a : b / c' },
+		{ 'a' => 'a : b / c' },
+	],
+	'901' => [
+		{ 'a' => 'a : b / c', 'b' => 'foo' },
+		{ 'a' => 'a : b / c', 'b' => 'foo' },
+	],
 });
 
-diag dump($v->{_delimiters_templates});
+diag dump($v->{_delimiters_templates}) if ( $debug );
 
 is_deeply( $v->{_delimiters_templates}, {
 	900 => {
-		"^a :  :  ; ^b ;  ;  ;  ;  :  .  . "            => 1,
-		"^a :  :  ; ^b ;  ;  ;  ;  :  .  . ^c :  ;  / " => 1,
+		"^a :  / " => 2,
+		"^a :  : ^c :  ; ^c :  ;  / " => 1,
+		"^a :  =  :  ; ^b ;  ;  ;  ;  :  .  . " => 1,
 	},
+	901 => { "^a :  / ^b" => 2 },
 }, 'just subfields and delimiters');
 
+ok(my $dt = $v->delimiters_templates, 'delimiters_template');
+diag $dt if ( $debug );
+
+ok($dt = $v->delimiters_templates( report => 1 ), 'delimiters_template report');
+diag $dt if ( $debug );
+
+$v->{_validate_delimiters_templates} = {
+	900 => { '^a : ^b' => 1 },
+};
+
+test_v({
+	'900' => [
+		{ 'a' => 'foo : bar', 'b' => 'baz' },
+		{ 'a' => 'foo', 'b' => 'baz' },
+		{ 'a' => 'foo' },
+		{ 'a' => 'foo : bar' },
+	],
+});
+
+ok (my $e = $v->report, 'report');
+
+diag $e if ( $debug );
+
+ok( $v->save_delimiters_templates, 'save_delimiters_templates' );
+
+ok( -s $delimiters_path, "$delimiters_path " . -s $delimiters_path . " bytes" );
+
+ok( $v->save_delimiters_templates, 'save_delimiters_templates to existing file' );
+
+ok( -s $delimiters_path . '.new' , "new file created" );
+
+ok(my $v2 = new WebPAC::Validate(
+	delimiters => [ ' : ', ' ; ', ' / ', ' \. ', ' = ' ],
+	delimiters_path => $delimiters_path,
+	debug => $debug,
+), "new");
+
+is_deeply( $v->{_delimiters_templates}, $v2->{_validate_delimiters_templates}, 'save/load ok');
+
+diag dump( $v, $v2 ) if ( $debug );