projects
/
webpac2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r1399@llin: dpavlin | 2007-10-31 11:19:39 +0100
[webpac2]
/
t
/
1-validate-delimiters.t
diff --git
a/t/1-validate-delimiters.t
b/t/1-validate-delimiters.t
index
9fe42d5
..
2f7e5b4
100755
(executable)
--- a/
t/1-validate-delimiters.t
+++ b/
t/1-validate-delimiters.t
@@
-1,7
+1,7
@@
#!/usr/bin/perl -w
use strict;
#!/usr/bin/perl -w
use strict;
-use Test::More tests => 1
3
;
+use Test::More tests => 1
5
;
use Test::Exception;
use blib;
use Test::Exception;
use blib;
@@
-38,7
+38,7
@@
sub test_v {
$row->{'000'} = [ 42 ];
$row->{'000'} = [ 42 ];
- $v->reset
_errors
;
+ $v->reset;
my $e = $v->validate_rec( $row );
diag ">> validate $d\n",dump($e) if ($debug);
my $e = $v->validate_rec( $row );
diag ">> validate $d\n",dump($e) if ($debug);
@@
-68,12
+68,17
@@
is_deeply( $v->{_delimiters_templates}, {
901 => { "^a : / ^b" => 2 },
}, 'just subfields and delimiters');
901 => { "^a : / ^b" => 2 },
}, 'just subfields and delimiters');
-ok(my $dt = $v->delimiters_templates, 'delimiters_template');
+ok(! $v->delimiters_templates, 'no accumulated delimiters_template');
+
+ok(my $dt = $v->delimiters_templates( current_input => 1 ), 'delimiters_template');
diag $dt if ( $debug );
diag $dt if ( $debug );
-ok($dt = $v->delimiters_templates( report => 1 ), 'delimiters_template report');
+ok($dt = $v->delimiters_templates( report => 1
, current_input => 1
), 'delimiters_template report');
diag $dt if ( $debug );
diag $dt if ( $debug );
+$v->reset;
+ok( $v->delimiters_templates, 'have accumulated delimiters_templates');
+
$v->{_validate_delimiters_templates} = {
900 => { '^a : ^b' => 1 },
};
$v->{_validate_delimiters_templates} = {
900 => { '^a : ^b' => 1 },
};
@@
-93,7
+98,7
@@
diag $e if ( $debug );
ok( $v->save_delimiters_templates, 'save_delimiters_templates' );
ok( $v->save_delimiters_templates, 'save_delimiters_templates' );
-ok( -s $delimiters_path, "$delimiters_path " .
-s $delimiters_path
. " bytes" );
+ok( -s $delimiters_path, "$delimiters_path " .
( -s $delimiters_path )
. " bytes" );
ok( $v->save_delimiters_templates, 'save_delimiters_templates to existing file' );
ok( $v->save_delimiters_templates, 'save_delimiters_templates to existing file' );
@@
-105,6
+110,6
@@
ok(my $v2 = new WebPAC::Validate(
debug => $debug,
), "new");
debug => $debug,
), "new");
-is_deeply( $v->{_delimiters_templates}, $v2->{_validate_delimiters_templates}, 'save/load ok');
+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 );