--- trunk/t/4-db.t	2005/11/23 21:53:01	123
+++ trunk/t/4-db.t	2005/11/24 11:47:10	124
@@ -1,11 +1,12 @@
 #!/usr/bin/perl -w
 
-use Test::More tests => 26;
+use Test::More tests => 25;
 use Test::Exception;
 use Cwd qw/abs_path/;
 use blib;
 use File::Temp qw/tempdir/;
 use strict;
+use Data::Dumper;
 
 BEGIN {
 use_ok( 'WebPAC::DB' );
@@ -17,18 +18,19 @@
 
 my $db;
 my $debug = 1;
+my $no_log = 1;	# force no log output
 
 diag "NULL DB";
 
-ok($db = new WebPAC::DB( debug => $debug, no_log => 1, ), "new");
+ok($db = new WebPAC::DB( debug => $debug, ), "new");
 
 ok(! $db->path, "path");
 
 ok(! $db->load_ds(), 'load_ds');
-ok(! $db->load_ds({ '000' => '000' }), 'load_ds');
+ok(! $db->load_ds( id => 000 ), 'load_ds');
 
 ok(! $db->save_ds(), "save_ds");
-ok(! $db->save_ds({ '000' => '000' }), 'save_ds');
+ok(! $db->save_ds( id => 000 ), 'save_ds');
 
 undef $db;
 
@@ -36,7 +38,7 @@
 
 diag "DB path: $path";
 
-ok($db = new WebPAC::DB( path => $path, debug => $debug, no_log => 1 ), "new");
+ok($db = new WebPAC::DB( path => $path, debug => $debug, no_log => $no_log ), "new");
 
 cmp_ok($db->{'path'}, 'eq', $path, "path");
 
@@ -49,9 +51,9 @@
 cmp_ok($db->{'path'}, 'eq', $path, "path");
 
 ok(! $db->load_ds(), 'load_ds');
-ok(! $db->load_ds({ '000' => '000' }), 'load_ds');
+ok(! $db->load_ds( id => 000 ), 'load_ds');
 
-ok(! $db->save_ds(), "save_ds");
+throws_ok { $db->save_ds() } qr/id/, "save_ds - need id";
 
 my $ds = {
 	'Source' => {
@@ -65,23 +67,21 @@
 		'swish' => [ 'bar' ],
 		'lookup_key' => [ 'bar' ]
 	},
-	'filename' => [ 'out/thes/001.html' ],
-	'name' => 'filename',
-	'tag' => 'filename'
 };
 
-ok(! $db->save_ds(), "empty save_ds");
-throws_ok { $db->save_ds( foo => 1 ) } qr/ds/, "save_ds - ds";
-throws_ok { $db->save_ds( ds => $ds ) } qr/current_filename/, "save_ds - current_filename";
-throws_ok { $db->save_ds( ds => $ds, 'current_filename' => 'foo' ) } qr/headline/, "save_ds - headline";
+throws_ok { $db->save_ds( id => 1 ) } qr/ds/, "save_ds - need ds";
+
+ok($db->save_ds( id => 1, ds => $ds ), "save_ds");
 
-ok($db->save_ds( ds => $ds, 'current_filename' => 'foo', 'headline' => 'bar' ), "save_ds");
+ok(my $ds2 = $db->load_ds( id => 1 ), "load_ds with id");
+
+is_deeply($ds, $ds2, "loaded data");
 
-ok(my $ds2 = $db->load_ds({ '000' => '000' }), "load_ds");
+ok($ds2 = $db->load_ds( 1 ), "load_ds without id");
 
 is_deeply($ds, $ds2, "loaded data");
 
-ok(! $db->load_ds({ '000' => 42 }), "load_ds non-existing");
+ok(! $db->load_ds( id => 42 ), "load_ds non-existing");
 
 undef $db;