Merged with master and am ready to merge back

[dbsrgits/DBM-Deep.git] / t / 21_tie_access.t

diff --git a/t/21_tie_access.t b/t/21_tie_access.t
index 64339b0..faeaa2f 100644 (file)
--- a/t/21_tie_access.t
+++ b/t/21_tie_access.t
@@ -1,54 +1,55 @@
-##
-# DBM::Deep Test
-##
 use strict;
+use warnings FATAL => 'all';
+
 use Test::More;
 use Test::Exception;
-
-plan tests => 7;
+use t::common qw( new_fh );
 
 use_ok( 'DBM::Deep' );
 
-# How should one test for creation failure with the tie mechanism?
-
-unlink "t/test.db";
+my ($fh, $filename) = new_fh();
 
 {
     my %hash;
-    tie %hash, 'DBM::Deep', "t/test.db";
+    tie %hash, 'DBM::Deep', $filename;
 
     $hash{key1} = 'value';
     is( $hash{key1}, 'value', 'Set and retrieved key1' );
+    tied( %hash )->_get_self->_engine->storage->close( tied( %hash )->_get_self );
 }
 
 {
     my %hash;
-    tie %hash, 'DBM::Deep', "t/test.db";
+    tie %hash, 'DBM::Deep', $filename;
 
     is( $hash{key1}, 'value', 'Set and retrieved key1' );
 
     is( keys %hash, 1, "There's one key so far" );
     ok( exists $hash{key1}, "... and it's key1" );
+    tied( %hash )->_get_self->_engine->storage->close( tied( %hash )->_get_self );
 }
 
-TODO: {
-    local $TODO = "Sig doesn't match, but it's legal??";
-    my @array;
+{
     throws_ok {
-        tie @array, 'DBM::Deep', {
-            file => 't/test.db',
+        tie my @array, 'DBM::Deep', {
+            file => $filename,
             type => DBM::Deep->TYPE_ARRAY,
         };
-    } qr/DBM::Deep: Cannot open a hash-based file with an array/, "\$SIG_TYPE doesn't match file's type";
+        tied( @array )->_get_self->_engine->storage->close( tied( @array )->_get_self );
+    } qr/DBM::Deep: File type mismatch/, "\$SIG_TYPE doesn't match file's type";
+}
 
-    unlink "t/test.db";
-    DBM::Deep->new( file => 't/test.db', type => DBM::Deep->TYPE_ARRAY );
+{
+    my ($fh, $filename) = new_fh();
+    my $db = DBM::Deep->new( file => $filename, type => DBM::Deep->TYPE_ARRAY );
 
-    my %hash;
     throws_ok {
-        tie %hash, 'DBM::Deep', {
-            file => 't/test.db',
+        tie my %hash, 'DBM::Deep', {
+            file => $filename,
             type => DBM::Deep->TYPE_HASH,
         };
-    } qr/DBM::Deep: Cannot open a array-based file with a hash/, "\$SIG_TYPE doesn't match file's type";
+    } qr/DBM::Deep: File type mismatch/, "\$SIG_TYPE doesn't match file's type";
+    $db->_get_self->_engine->storage->close( $db->_get_self );
 }
+
+done_testing;