--- trunk/t/4-store.t	2005/12/05 17:46:57	209
+++ trunk/t/4-store.t	2005/12/05 17:47:51	217
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-use Test::More tests => 25;
+use Test::More tests => 29;
 use Test::Exception;
 use Cwd qw/abs_path/;
 use blib;
@@ -22,7 +22,7 @@
 
 diag "NULL Store";
 
-ok($db = new WebPAC::Store( debug => $debug, ), "new");
+ok($db = new WebPAC::Store( debug => $debug ), "new");
 
 ok(! $db->path, "path");
 
@@ -38,7 +38,7 @@
 
 diag "Store path: $path";
 
-ok($db = new WebPAC::Store( path => $path, debug => $debug, no_log => $no_log ), "new");
+ok($db = new WebPAC::Store( path => $path, database => '.', debug => $debug, no_log => $no_log ), "new");
 
 cmp_ok($db->{'path'}, 'eq', $path, "path");
 
@@ -50,7 +50,7 @@
 
 cmp_ok($db->{'path'}, 'eq', $path, "path");
 
-ok(! $db->load_ds(), 'load_ds');
+throws_ok { $db->load_ds() } qr/without id/, 'load_ds without arguments';
 ok(! $db->load_ds( id => 000 ), 'load_ds');
 
 throws_ok { $db->save_ds() } qr/id/, "save_ds - need id";
@@ -77,11 +77,19 @@
 
 is_deeply($ds, $ds2, "loaded data");
 
-ok($ds2 = $db->load_ds( 1 ), "load_ds without id");
+throws_ok { $ds2 = $db->load_ds( 1 ) } qr/HASH/, "load_ds without hash";
+
+ok($ds2 = $db->load_ds( id => 1 ), "load_ds");
 
 is_deeply($ds, $ds2, "loaded data");
 
 ok(! $db->load_ds( id => 42 ), "load_ds non-existing");
 
+ok($db = new WebPAC::Store( path => $path, debug => $debug, no_log => $no_log ), "new without database");
+
+throws_ok { $ds2 = $db->load_ds( id => 1 ) } qr/database/, "load_ds without database";
+
+ok($ds2 = $db->load_ds( id => 1, database => '.' ), "load_ds");
+
 undef $db;