diff options
| -rw-r--r-- | lib/WebCoso/Config.pm | 9 | ||||
| -rw-r--r-- | t/01-config.t | 14 | ||||
| -rw-r--r-- | t/05-naming.t | 43 |
3 files changed, 44 insertions, 22 deletions
diff --git a/lib/WebCoso/Config.pm b/lib/WebCoso/Config.pm index ebc3c75..1b4d6d8 100644 --- a/lib/WebCoso/Config.pm +++ b/lib/WebCoso/Config.pm @@ -83,14 +83,7 @@ sub res { $dest_filename=file($dest_filename)->absolute($config_dir); my @abs_source_files = map { - my $abs_name=file($_)->absolute($config_dir); - if (!-e $abs_name) { - WebCoso::X::FileNotFound->throw( - filename => $_, - abs_filename => $abs_name, - ); - }; - $abs_name; + file($_)->absolute($config_dir); } @source_files; my $pipeline_name="WebCoso::Pipeline::$short_pipeline_name"; diff --git a/t/01-config.t b/t/01-config.t index 4fee455..3e82cd2 100644 --- a/t/01-config.t +++ b/t/01-config.t @@ -57,20 +57,6 @@ WebCoso::Config->clear(); { my $conf_file=<<'EOF'; -res('src/file1.rest.txt','src/nonce.rest.txt','Id','dst/file.html'); -EOF - -throws_ok { - WebCoso::Config->read_scalar($conf_file,"$thisdir/config-in-test") - } - 'WebCoso::X::ConfigError', - 'muore se non trova il file'; -} - -WebCoso::Config->clear(); - -{ -my $conf_file=<<'EOF'; coll('coll1'); EOF diff --git a/t/05-naming.t b/t/05-naming.t new file mode 100644 index 0000000..0e6f22b --- /dev/null +++ b/t/05-naming.t @@ -0,0 +1,43 @@ +#!/usr/bin/perl +use strict; +use warnings; +use Path::Class; +use Test::More 'no_plan'; +use Test::Exception; +use WebCoso::Config; + +my $thisdir=file($0)->parent->absolute; + +{ +my $conf_file=<<'EOF'; +$res1=res('src/file1','Id','dst/file1'); +$res2=res('src/file2','Id','dst/file2'); +$coll1=coll('collezione'); +EOF + +ok(WebCoso::Config->read_scalar($conf_file,"$thisdir/config-in-test"), + 'eseguita la configurazione'); +is((WebCoso::Config->get_res_by_name('res1') + ->get_axis_values('filename'))[0], + "$thisdir/src/file1", + 'ok primo nome'); +is((WebCoso::Config->get_res_by_name('res2') + ->get_axis_values('filename'))[0], + "$thisdir/src/file2", + 'ok secondo nome'); +is(WebCoso::Config->get_coll_by_name('coll1') + ->get_properties(language=>'')->{name}, + 'collezione', + 'ok nome collezione'); + +throws_ok { + WebCoso::Config->get_res_by_name('coll1') + } + 'WebCoso::X::NameError', + 'muore se si chiede il tipo errato (r-c)'; +throws_ok { + WebCoso::Config->get_coll_by_name('res1') + } + 'WebCoso::X::NameError', + 'muore se si chiede il tipo errato (c-r)'; +} |