spostata eccezione di file not found, cambiati i 'die' con Exception::Class, inizio di aggancio c-r

git-svn-id: svn://luxion/repos/WebCoso/trunk@19 fcb26f47-9200-0410-b104-b98ab5b095f3

1 files changed, 32 insertions, 14 deletions

diff --git a/t/01-config.t b/t/01-config.t
index e8b8ee6..d4c8e85 100644
--- a/t/01-config.t
+++ b/t/01-config.t
@@ -54,20 +54,10 @@ my $conf_file=<<'EOF';
 res('src/file1.rest.txt','src/nonce.rest.txt','Id','dst/file.html');
 EOF
 
-ok(WebCoso::Config->read_scalar($conf_file,"$thisdir/config-in-test"),
-   'eseguita la configurazione');
-
-my @resources=WebCoso::Config->get_all_resources();
-is(scalar @resources,1,'una risorsa definta');
-
-is_deeply(
-    [$resources[0]->axis('filename')],
-    ["$thisdir/src/file1.rest.txt", "$thisdir/src/nonce.rest.txt"],
-    'filenames');
-dies_ok
-    {
-        $resources[0]->datastream(filename=>"$thisdir/src/nonce.rest.txt")
-    }
+throws_ok {
+    WebCoso::Config->read_scalar($conf_file,"$thisdir/config-in-test")
+  }
+    'WebCoso::X::ConfigError',
         'muore se non trova il file';
 }
 
@@ -239,3 +229,31 @@ is_deeply(
     [],
     'nessuna foglia');
 }
+
+WebCoso::Config->clear();
+
+{
+my $conf_file=<<'EOF';
+$r1=res('src/file1.rest.txt','Id','dst/file.html');
+$c1=coll('coll1');
+$c1->add_res($r1);
+EOF
+
+ok(WebCoso::Config->read_scalar($conf_file,"$thisdir/config-in-test"),
+   'eseguita la configurazione (no strict)');
+
+my @resources=WebCoso::Config->get_all_resources();
+my $collections=WebCoso::Config->get_collections();
+my @collections=$collections->get_all_collections();
+
+is(scalar @resources,1,'una risorsa');
+is(scalar @collections,1,'una collezione');
+is_deeply(
+    [$resources[0]->collections()],
+    [$collections[0]],
+    'aggancio r->c');
+is_deeply(
+    [$collections[0]->get_resources()],
+    [$resources[0]],
+    'aggancio c->r');
+}