Merged with master and am ready to merge back

[dbsrgits/DBM-Deep.git] / t / 14_filter.t

diff --git a/t/14_filter.t b/t/14_filter.t
index fbff9b1..9b90582 100644 (file)
--- a/t/14_filter.t
+++ b/t/14_filter.t
@@ -1,67 +1,69 @@
-##
-# DBM::Deep Test
-##
 use strict;
-use Test::More tests => 21;
+use warnings FATAL => 'all';
+
+use Test::More;
 use Test::Deep;
-use t::common qw( new_fh );
+
+use t::common qw( new_dbm );
 
 use_ok( 'DBM::Deep' );
 
-my ($fh, $filename) = new_fh();
-my $db = DBM::Deep->new(
-       file => $filename,
-);
+sub my_filter_store_key { return 'MYFILTER' . $_[0]; }
+sub my_filter_store_value { return 'MYFILTER' . $_[0]; }
 
-ok( !$db->set_filter( 'floober', sub {} ), "floober isn't a value filter key" );
+sub my_filter_fetch_key { $_[0] =~ s/^MYFILTER//; return $_[0]; }
+sub my_filter_fetch_value { $_[0] =~ s/^MYFILTER//; return $_[0]; }
 
-##
-# First try store filters only (values will be unfiltered)
-##
-ok( $db->set_filter( 'store_key', \&my_filter_store_key ), "set the store_key filter" );
-ok( $db->set_filter( 'store_value', \&my_filter_store_value ), "set the store_value filter" );
+my $dbm_factory = new_dbm();
+while ( my $dbm_maker = $dbm_factory->() ) {
+    my $db = $dbm_maker->();
 
-$db->{key1} = "value1";
-$db->{key2} = "value2";
+    ok( !$db->set_filter( 'floober', sub {} ), "floober isn't a value filter key" );
 
-is($db->{key1}, "MYFILTERvalue1", "The value for key1 was filtered correctly" );
-is($db->{key2}, "MYFILTERvalue2", "The value for key2 was filtered correctly" );
+    ##
+    # First try store filters only (values will be unfiltered)
+    ##
+    ok( $db->set_filter( 'store_key', \&my_filter_store_key ), "set the store_key filter" );
+    ok( $db->set_filter( 'store_value', \&my_filter_store_value ), "set the store_value filter" );
 
-##
-# Now try fetch filters as well
-##
-ok( $db->set_filter( 'fetch_key', \&my_filter_fetch_key ), "Set the fetch_key filter" );
-ok( $db->set_filter( 'fetch_value', \&my_filter_fetch_value), "Set the fetch_value filter" );
+    $db->{key1} = "value1";
+    $db->{key2} = "value2";
 
-is($db->{key1}, "value1", "Fetchfilters worked right");
-is($db->{key2}, "value2", "Fetchfilters worked right");
+    is($db->{key1}, "MYFILTERvalue1", "The value for key1 was filtered correctly" );
+    is($db->{key2}, "MYFILTERvalue2", "The value for key2 was filtered correctly" );
 
-##
-# Try fetching keys as well as values
-##
-cmp_bag( [ keys %$db ], [qw( key1 key2 )], "DB keys correct" );
+    ##
+    # Now try fetch filters as well
+    ##
+    ok( $db->set_filter( 'fetch_key', \&my_filter_fetch_key ), "Set the fetch_key filter" );
+    ok( $db->set_filter( 'fetch_value', \&my_filter_fetch_value), "Set the fetch_value filter" );
 
-# Exists and delete tests
-ok( exists $db->{key1}, "Key1 exists" );
-ok( exists $db->{key2}, "Key2 exists" );
+    is($db->{key1}, "value1", "Fetchfilters worked right");
+    is($db->{key2}, "value2", "Fetchfilters worked right");
 
-is( delete $db->{key1}, 'value1', "Delete returns the right value" );
+    ##
+    # Try fetching keys as well as values
+    ##
+    cmp_bag( [ keys %$db ], [qw( key1 key2 )], "DB keys correct" );
 
-ok( !exists $db->{key1}, "Key1 no longer exists" );
-ok( exists $db->{key2}, "Key2 exists" );
+    # Exists and delete tests
+    ok( exists $db->{key1}, "Key1 exists" );
+    ok( exists $db->{key2}, "Key2 exists" );
 
-##
-# Now clear all filters, and make sure all is unfiltered
-##
-ok( $db->filter_store_key( undef ), "Unset store_key filter" );
-ok( $db->filter_store_value( undef ), "Unset store_value filter" );
-ok( $db->filter_fetch_key( undef ), "Unset fetch_key filter" );
-ok( $db->filter_fetch_value( undef ), "Unset fetch_value filter" );
+    is( delete $db->{key1}, 'value1', "Delete returns the right value" );
 
-is( $db->{MYFILTERkey2}, "MYFILTERvalue2", "We get the right unfiltered value" );
+    ok( !exists $db->{key1}, "Key1 no longer exists" );
+    ok( exists $db->{key2}, "Key2 exists" );
 
-sub my_filter_store_key { return 'MYFILTER' . $_[0]; }
-sub my_filter_store_value { return 'MYFILTER' . $_[0]; }
+    ##
+    # Now clear all filters, and make sure all is unfiltered
+    ##
+    ok( $db->filter_store_key( undef ), "Unset store_key filter" );
+    ok( $db->filter_store_value( undef ), "Unset store_value filter" );
+    ok( $db->filter_fetch_key( undef ), "Unset fetch_key filter" );
+    ok( $db->filter_fetch_value( undef ), "Unset fetch_value filter" );
 
-sub my_filter_fetch_key { $_[0] =~ s/^MYFILTER//; return $_[0]; }
-sub my_filter_fetch_value { $_[0] =~ s/^MYFILTER//; return $_[0]; }
+    is( $db->{MYFILTERkey2}, "MYFILTERvalue2", "We get the right unfiltered value" );
+}
+
+done_testing;