X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F04_array.t;h=3eea45238cd86561539bc98c47c25c20545811bd;hb=29fc296f961943f762b5fc29b7a0b5d80d0bf6b6;hp=e5babd3bfa8e422b76c05f3e91d33eadb0d77ed0;hpb=fde3db1a5e4879bebec5ca8051caa2804d1a826e;p=dbsrgits%2FDBM-Deep.git

diff --git a/t/04_array.t b/t/04_array.t
index e5babd3..3eea452 100644
--- a/t/04_array.t
+++ b/t/04_array.t
@@ -2,7 +2,7 @@
 # DBM::Deep Test
 ##
 use strict;
-use Test::More tests => 109;
+use Test::More tests => 128;
 use Test::Exception;
 use t::common qw( new_fh );
 
@@ -10,15 +10,11 @@ use_ok( 'DBM::Deep' );
 
 my ($fh, $filename) = new_fh();
 my $db = DBM::Deep->new(
-	file => $filename,
-	type => DBM::Deep->TYPE_ARRAY
+    file => $filename,
+    fh => $fh,
+    type => DBM::Deep->TYPE_ARRAY
 );
 
-TODO: {
-    local $TODO = "How is this test ever supposed to pass?";
-    ok( !$db->clear, "If the file has never been written to, clear() returns false" );
-}
-
 ##
 # basic put/get/push
 ##
@@ -67,7 +63,8 @@ is( $db->fetch(4), 'elem4.1' );
 
 throws_ok {
     $db->[-6] = 'whoops!';
-} qr/Modification of non-creatable array value attempted, subscript -6/, "Correct error thrown"; 
+} qr/Modification of non-creatable array value attempted, subscript -6/,
+  "Correct error thrown when attempting to modify a non-creatable array value";
 
 my $popped = $db->pop;
 is( $db->length, 4, "... and we have four after popping" );
@@ -82,6 +79,7 @@ is( $db->length, 3, "... and we have three after shifting" );
 is( $db->[0], 'elem1', "0th element still there after shifting" );
 is( $db->[1], 'elem2', "1st element still there after shifting" );
 is( $db->[2], 'elem3', "2nd element still there after shifting" );
+is( $db->[3], undef, "There is no third element now" );
 is( $shifted, 'elem0', "Shifted value is correct" );
 
 ##
@@ -119,7 +117,7 @@ $db->[1] = 'elem2';
 # exists
 ##
 ok( $db->exists(1), "The 1st value exists" );
-ok( !$db->exists(0), "The 0th value doesn't exists" );
+ok( $db->exists(0), "The 0th value doesn't exist" );
 ok( !$db->exists(22), "The 22nd value doesn't exists" );
 ok( $db->exists(-1), "The -1st value does exists" );
 ok( !$db->exists(-22), "The -22nd value doesn't exists" );
@@ -201,13 +199,81 @@ is($db->[0], "elem first");
 is($db->[1], "elem last");
 is($returned[0], "middle ABC");
 
+@returned = $db->splice;
+is( $db->length, 0 );
+is( $returned[0], "elem first" );
+is( $returned[1], "elem last" );
+
 $db->[0] = [ 1 .. 3 ];
 $db->[1] = { a => 'foo' };
-is( $db->[1]->fetch('a'), 'foo', "Reuse of same space with hash successful" );
 is( $db->[0]->length, 3, "Reuse of same space with array successful" );
+is( $db->[1]->fetch('a'), 'foo', "Reuse of same space with hash successful" );
 
 # Test autovivification
-
 $db->[9999]{bar} = 1;
 ok( $db->[9999] );
 cmp_ok( $db->[9999]{bar}, '==', 1 );
+
+# Test failures
+throws_ok {
+    $db->fetch( 'foo' );
+} qr/Cannot use 'foo' as an array index/, "FETCH fails on an illegal key";
+
+throws_ok {
+    $db->fetch();
+} qr/Cannot use an undefined array index/, "FETCH fails on an undefined key";
+
+throws_ok {
+    $db->store( 'foo', 'bar' );
+} qr/Cannot use 'foo' as an array index/, "STORE fails on an illegal key";
+
+throws_ok {
+    $db->store();
+} qr/Cannot use an undefined array index/, "STORE fails on an undefined key";
+
+throws_ok {
+    $db->delete( 'foo' );
+} qr/Cannot use 'foo' as an array index/, "DELETE fails on an illegal key";
+
+throws_ok {
+    $db->delete();
+} qr/Cannot use an undefined array index/, "DELETE fails on an undefined key";
+
+throws_ok {
+    $db->exists( 'foo' );
+} qr/Cannot use 'foo' as an array index/, "EXISTS fails on an illegal key";
+
+throws_ok {
+    $db->exists();
+} qr/Cannot use an undefined array index/, "EXISTS fails on an undefined key";
+
+# Bug reported by Mike Schilli
+# Also, RT #29583 reported by HANENKAMP
+{
+    my ($fh, $filename) = new_fh();
+    my $db = DBM::Deep->new(
+        file => $filename,
+        fh => $fh,
+        type => DBM::Deep->TYPE_ARRAY
+    );
+
+    push @{$db}, 3, { foo => 1 };
+    lives_ok {
+        shift @{$db};
+    } "Shift doesn't die moving references around";
+    is( $db->[0]{foo}, 1, "Right hashref there" );
+
+    lives_ok {
+        unshift @{$db}, [ 1 .. 3, [ 1 .. 3 ] ];
+        unshift @{$db}, 1;
+    } "Unshift doesn't die moving references around";
+    is( $db->[1][3][1], 2, "Right arrayref there" );
+    is( $db->[2]{foo}, 1, "Right hashref there" );
+
+    # Add test for splice moving references around
+    lives_ok {
+        splice @{$db}, 0, 0, 1 .. 3;
+    } "Splice doesn't die moving references around";
+    is( $db->[4][3][1], 2, "Right arrayref there" );
+    is( $db->[5]{foo}, 1, "Right hashref there" );
+}