--- trunk/t/4-store.t	2007/09/03 15:26:46	887
+++ trunk/t/4-store.t	2007/11/01 00:16:48	949
@@ -1,26 +1,24 @@
 #!/usr/bin/perl -w
 
-use Test::More tests => 37;
-use Test::Exception;
+use strict;
 use blib;
+
+use Test::More tests => 38;
+
 use File::Temp qw/tempdir/;
-use strict;
-use Data::Dump;
 
 BEGIN {
+use_ok( 'WebPAC::Test' );
 use_ok( 'WebPAC::Store' );
 }
 
 my $db;
-my $debug = shift @ARGV;
-my $no_log = 1;	# force no log output
-$no_log = 0 if ($debug);
 
 diag "NULL Store";
 
 ok(new WebPAC::Store(), 'new without database');
 
-ok($db = new WebPAC::Store({ database => 'foobar', debug => $debug }), "new");
+ok($db = new WebPAC::Store({ database => 'foobar', %LOG }), "new");
 
 throws_ok { $db->load_ds() } qr/id/, 'load_ds without id';
 ok(! $db->load_ds( id => 000 ), 'load_ds');
@@ -30,7 +28,7 @@
 
 undef $db;
 
-ok($db = new WebPAC::Store({ database => 'webpac-test', debug => $debug, no_log => $no_log }), "new");
+ok($db = new WebPAC::Store({ database => 'webpac-test', %LOG }), "new");
 
 #
 # test *_ds
@@ -71,7 +69,7 @@
 
 ok(! $db->load_ds( id => 42 ), "load_ds non-existing");
 
-ok($db = new WebPAC::Store({ database => 'webpac-test', debug => $debug, no_log => $no_log }), "new");
+ok($db = new WebPAC::Store({ database => 'webpac-test', %LOG }), "new");
 
 ok(! $db->load_ds( id => 1, input => 'foobar' ), "load_ds with invalid input");