r1650@llin: dpavlin | 2007-11-20 11:07:57 +0100

[webpac2] / t / 4-store.t

diff --git a/t/4-store.t b/t/4-store.t
index fe234d3..43629a0 100755 (executable)
--- a/t/4-store.t
+++ b/t/4-store.t
@@ -1,35 +1,24 @@
 #!/usr/bin/perl -w
 
-use Test::More tests => 47;
-use Test::Exception;
-use Cwd qw/abs_path/;
+use strict;
 use blib;
+
+use Test::More tests => 38;
+
 use File::Temp qw/tempdir/;
-use strict;
-use Data::Dumper;
 
 BEGIN {
+use_ok( 'WebPAC::Test' );
 use_ok( 'WebPAC::Store' );
 }
 
-ok(my $abs_path = abs_path($0), "abs_path");
-$abs_path =~ s#/[^/]*$#/#;
-diag "abs_path: $abs_path";
-
 my $db;
-my $debug = shift @ARGV;
-my $no_log = 1;        # force no log output
-$no_log = 0 if ($debug);
 
 diag "NULL Store";
 
-throws_ok { new WebPAC::Store() } qr/path/, 'new without path';
-
-ok(new WebPAC::Store( path => '/tmp' ), 'new without database');
-
-ok($db = new WebPAC::Store( path => '/tmp', database => 'foobar', debug => $debug ), "new");
+ok(new WebPAC::Store(), 'new without database');
 
-cmp_ok($db->path, 'eq', '/tmp', "path");
+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');
@@ -39,22 +28,7 @@ throws_ok { $db->save_ds( id => 000 ) } qr/ds/, 'save_ds without ds';
 
 undef $db;
 
-ok(my $path = tempdir( CLEANUP => $debug ? 0 : 1 ), "path");
-
-diag "Store path: $path";
-
-ok($db = new WebPAC::Store( path => $path, database => 'webpac-test', debug => $debug, no_log => $no_log ), "new");
-
-cmp_ok($db->{'path'}, 'eq', $path, "path");
-cmp_ok($db->path, 'eq', $path, "path");
-
-ok(! $db->path(''), "path - disable caching");
-
-ok(! defined($db->{'path'}), "no path");
-
-ok($db->path( $path ), "path($path)");
-
-cmp_ok($db->{'path'}, 'eq', $path, "path");
+ok($db = new WebPAC::Store({ database => 'webpac-test', %LOG }), "new");
 
 #
 # test *_ds
@@ -95,7 +69,7 @@ is_deeply($ds, $ds2, "loaded data");
 
 ok(! $db->load_ds( id => 42 ), "load_ds non-existing");
 
-ok($db = new WebPAC::Store( path => $path, 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");
 
@@ -115,13 +89,13 @@ ok(! $db->load_lookup( input => 'non-existant', key => 'foo' ), 'invalid load_lo
 
 ok($db->save_lookup( input => 'foo', key => 'bar', data => $l ), "save_lookup");
 
-ok(-e $db->path . '/lookup/webpac-test/foo/bar', "exists");
+ok(-e $db->var_path( 'lookup', 'webpac-test', 'foo', 'bar'), "exists");
 
 is_deeply($db->load_lookup( input => 'foo', key => 'bar' ), $l, 'load_lookup');
 
 ok($db->save_lookup( database => 'baz', input => 'foo', key => 'bar', data => $l ), "save_lookup with database");
 
-ok(-e $db->path . '/lookup/baz/foo/bar', "exists");
+ok(-e $db->var_path( '/lookup','baz','foo','bar'), "exists");
 
 is_deeply($db->load_lookup( database => 'baz', input => 'foo', key => 'bar' ), $l, 'load_lookup');
 
@@ -138,13 +112,13 @@ ok(! $db->load_row( input => 'non-existant', id => 1234 ), 'invalid load_row');
 
 ok($db->save_row( input => 'foo', id => 1234, row => $row ), "save_row");
 
-ok(-e $db->path . '/row/webpac-test/foo/1234', "exists");
+ok(-e $db->var_path( 'row','webpac-test','foo',1234), "exists");
 
 is_deeply($db->load_row( input => 'foo', id => 1234 ), $row, 'load_row');
 
 ok($db->save_row( database => 'baz', input => 'foo', id => 1234, row => $row ), "save_row with database");
 
-ok(-e $db->path . '/row/baz/foo/1234', "exists");
+ok(-e $db->var_path( 'row','baz','foo',1234), "exists");
 
 is_deeply($db->load_row( database => 'baz', input => 'foo', id => 1234 ), $row, 'load_row');