Convert ext/ODBM_File/t/odbm.t to Test::More.

1 files changed, 91 insertions, 96 deletions

diff --git a/ext/ODBM_File/t/odbm.t b/ext/ODBM_File/t/odbm.t
index a713b274c6..55ba0ad2ad 100644
--- a/ext/ODBM_File/t/odbm.t
+++ b/ext/ODBM_File/t/odbm.t
@@ -13,44 +13,34 @@ BEGIN {
 use strict;
 use warnings;
 
-sub ok
-{
-    my $no = shift ;
-    my $result = shift ;
-
-    print "not " unless $result ;
-    print "ok $no\n" ;
-}
+use Test::More tests => 79;
 
 require ODBM_File;
 #If Fcntl is not available, try 0x202 or 0x102 for O_RDWR|O_CREAT
 use Fcntl;
 
-print "1..78\n";
-
 unlink <Op.dbmx*>;
 
 umask(0);
 my %h;
-ok(1, tie(%h,'ODBM_File','Op.dbmx', O_RDWR|O_CREAT, 0640));
+isa_ok(tie(%h, 'ODBM_File', 'Op.dbmx', O_RDWR|O_CREAT, 0640), 'ODBM_File');
 
 my $Dfile = "Op.dbmx.pag";
 if (! -e $Dfile) {
 	($Dfile) = <Op.dbmx*>;
 }
-if ($^O eq 'amigaos' || $^O eq 'os2' || $^O eq 'MSWin32' || $^O eq 'NetWare') {
-    print "ok 2 # Skipped: different file permission semantics\n";
-}
-else {
+SKIP: {
+    skip "different file permission semantics on $^O", 1
+	if $^O eq 'amigaos' || $^O eq 'os2' || $^O eq 'MSWin32' || $^O eq 'NetWare';
     my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,
      $blksize,$blocks) = stat($Dfile);
-    print (($mode & 0777) == 0640 ? "ok 2\n" : "not ok 2\n");
+    is($mode & 0777, 0640);
 }
 my $i = 0;
 while (my ($key,$value) = each(%h)) {
     $i++;
 }
-print (!$i ? "ok 3\n" : "not ok 3\n");
+is($i, 0);
 
 $h{'goner1'} = 'snork';
 
@@ -72,7 +62,7 @@ $h{'goner2'} = 'snork';
 delete $h{'goner2'};
 
 untie(%h);
-print (tie(%h,'ODBM_File','Op.dbmx', O_RDWR, 0640) ? "ok 4\n" : "not ok 4\n");
+isa_ok(tie(%h, 'ODBM_File', 'Op.dbmx', O_RDWR, 0640), 'ODBM_File');
 
 $h{'j'} = 'J';
 $h{'k'} = 'K';
@@ -100,7 +90,8 @@ delete $h{'goner3'};
 my @keys = keys(%h);
 my @values = values(%h);
 
-if ($#keys == 29 && $#values == 29) {print "ok 5\n";} else {print "not ok 5\n";}
+is($#keys, 29);
+is($#values, 29);
 
 while (my ($key,$value) = each(%h)) {
     if ($key eq $keys[$i] && $value eq $values[$i] && $key eq lc($value)) {
@@ -109,30 +100,29 @@ while (my ($key,$value) = each(%h)) {
     }
 }
 
-if ($i == 30) {print "ok 6\n";} else {print "not ok 6\n";}
+is($i, 30);
 
 @keys = ('blurfl', keys(%h), 'dyick');
-if ($#keys == 31) {print "ok 7\n";} else {print "not ok 7\n";}
+is($#keys, 31);
 
 $h{'foo'} = '';
 $h{''} = 'bar';
 
-# check cache overflow and numeric keys and contents
 my $ok = 1;
 for ($i = 1; $i < 200; $i++) { $h{$i + 0} = $i + 0; }
 for ($i = 1; $i < 200; $i++) { $ok = 0 unless $h{$i} == $i; }
-print ($ok ? "ok 8\n" : "not ok 8\n");
+is($ok, 1, 'check cache overflow and numeric keys and contents');
 
 my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,
    $blksize,$blocks) = stat($Dfile);
-print ($size > 0 ? "ok 9\n" : "not ok 9\n");
+cmp_ok($size, '>', 0);
 
 @h{0..200} = 200..400;
 my @foo = @h{0..200};
-print join(':',200..400) eq join(':',@foo) ? "ok 10\n" : "not ok 10\n";
+is(join(':',200..400), join(':',@foo));
 
-print ($h{'foo'} eq '' ? "ok 11\n" : "not ok 11\n");
-print ($h{''} eq 'bar' ? "ok 12\n" : "not ok 12\n");
+is($h{'foo'}, '');
+is($h{''}, 'bar');
 
 untie %h;
 unlink 'Op.dbmx.dir', $Dfile;
@@ -185,22 +175,22 @@ EOM
     BEGIN { push @INC, '.'; }
 
     eval 'use SubDB ; use Fcntl ;';
-    main::ok(13, $@ eq "") ;
+    main::is($@, "");
     my %h ;
     my $X ;
     eval '
 	$X = tie(%h, "SubDB","dbhash.tmp", O_RDWR|O_CREAT, 0640 );
 	' ;
 
-    main::ok(14, $@ eq "") ;
+    main::is($@, "");
 
     my $ret = eval '$h{"fred"} = 3 ; return $h{"fred"} ' ;
-    main::ok(15, $@ eq "") ;
-    main::ok(16, $ret == 5) ;
+    main::is($@, "");
+    main::is($ret, 5);
 
     $ret = eval '$X->A_new_method("fred") ' ;
-    main::ok(17, $@ eq "") ;
-    main::ok(18, $ret eq "[[5]]") ;
+    main::is($@, "");
+    main::is($ret, "[[5]]");
 
     undef $X;
     untie(%h);
@@ -225,7 +215,8 @@ EOM
    }
    
    unlink <Op.dbmx*>;
-   ok(19, $db = tie(%h, 'ODBM_File','Op.dbmx', O_RDWR|O_CREAT, 0640)) ;
+   $db = tie %h, 'ODBM_File', 'Op.dbmx', O_RDWR|O_CREAT, 0640;
+   isa_ok($db, 'ODBM_File');
 
    $db->filter_fetch_key   (sub { $fetch_key = $_ }) ;
    $db->filter_store_key   (sub { $store_key = $_ }) ;
@@ -236,17 +227,17 @@ EOM
 
    $h{"fred"} = "joe" ;
    #                   fk   sk     fv   sv
-   ok(20, checkOutput( "", "fred", "", "joe")) ;
+   ok(checkOutput("", "fred", "", "joe"));
 
    ($fetch_key, $store_key, $fetch_value, $store_value) = ("") x 4 ;
-   ok(21, $h{"fred"} eq "joe");
+   is($h{"fred"}, "joe");
    #                   fk    sk     fv    sv
-   ok(22, checkOutput( "", "fred", "joe", "")) ;
+   ok(checkOutput("", "fred", "joe", ""));
 
    ($fetch_key, $store_key, $fetch_value, $store_value) = ("") x 4 ;
-   ok(23, $db->FIRSTKEY() eq "fred") ;
+   is($db->FIRSTKEY(), "fred");
    #                    fk     sk  fv  sv
-   ok(24, checkOutput( "fred", "", "", "")) ;
+   ok(checkOutput("fred", "", "", ""));
 
    # replace the filters, but remember the previous set
    my ($old_fk) = $db->filter_fetch_key   
@@ -261,17 +252,17 @@ EOM
    ($fetch_key, $store_key, $fetch_value, $store_value) = ("") x 4 ;
    $h{"Fred"} = "Joe" ;
    #                   fk   sk     fv    sv
-   ok(25, checkOutput( "", "fred", "", "Jxe")) ;
+   ok(checkOutput("", "fred", "", "Jxe"));
 
    ($fetch_key, $store_key, $fetch_value, $store_value) = ("") x 4 ;
-   ok(26, $h{"Fred"} eq "[Jxe]");
+   is($h{"Fred"}, "[Jxe]");
    #                   fk   sk     fv    sv
-   ok(27, checkOutput( "", "fred", "[Jxe]", "")) ;
+   ok(checkOutput("", "fred", "[Jxe]", ""));
 
    ($fetch_key, $store_key, $fetch_value, $store_value) = ("") x 4 ;
-   ok(28, $db->FIRSTKEY() eq "FRED") ;
+   is($db->FIRSTKEY(), "FRED");
    #                   fk   sk     fv    sv
-   ok(29, checkOutput( "FRED", "", "", "")) ;
+   ok(checkOutput("FRED", "", "", ""));
 
    # put the original filters back
    $db->filter_fetch_key   ($old_fk);
@@ -281,15 +272,15 @@ EOM
 
    ($fetch_key, $store_key, $fetch_value, $store_value) = ("") x 4 ;
    $h{"fred"} = "joe" ;
-   ok(30, checkOutput( "", "fred", "", "joe")) ;
+   ok(checkOutput("", "fred", "", "joe"));
 
    ($fetch_key, $store_key, $fetch_value, $store_value) = ("") x 4 ;
-   ok(31, $h{"fred"} eq "joe");
-   ok(32, checkOutput( "", "fred", "joe", "")) ;
+   is($h{"fred"}, "joe");
+   ok(checkOutput("", "fred", "joe", ""));
 
    ($fetch_key, $store_key, $fetch_value, $store_value) = ("") x 4 ;
-   ok(33, $db->FIRSTKEY() eq "fred") ;
-   ok(34, checkOutput( "fred", "", "", "")) ;
+   is($db->FIRSTKEY(), "fred");
+   ok(checkOutput("fred", "", "", ""));
 
    # delete the filters
    $db->filter_fetch_key   (undef);
@@ -299,15 +290,15 @@ EOM
 
    ($fetch_key, $store_key, $fetch_value, $store_value) = ("") x 4 ;
    $h{"fred"} = "joe" ;
-   ok(35, checkOutput( "", "", "", "")) ;
+   ok(checkOutput("", "", "", ""));
 
    ($fetch_key, $store_key, $fetch_value, $store_value) = ("") x 4 ;
-   ok(36, $h{"fred"} eq "joe");
-   ok(37, checkOutput( "", "", "", "")) ;
+   is($h{"fred"}, "joe");
+   ok(checkOutput("", "", "", ""));
 
    ($fetch_key, $store_key, $fetch_value, $store_value) = ("") x 4 ;
-   ok(38, $db->FIRSTKEY() eq "fred") ;
-   ok(39, checkOutput( "", "", "", "")) ;
+   is($db->FIRSTKEY(), "fred");
+   ok(checkOutput("", "", "", ""));
 
    undef $db ;
    untie %h;
@@ -320,7 +311,8 @@ EOM
     my (%h, $db) ;
 
     unlink <Op.dbmx*>;
-    ok(40, $db = tie(%h, 'ODBM_File','Op.dbmx', O_RDWR|O_CREAT, 0640)) ;
+    $db = tie %h, 'ODBM_File', 'Op.dbmx', O_RDWR|O_CREAT, 0640;
+    isa_ok($db, 'ODBM_File');
 
     my %result = () ;
 
@@ -344,32 +336,32 @@ EOM
     $_ = "original" ;
 
     $h{"fred"} = "joe" ;
-    ok(41, $result{"store key"} eq "store key - 1: [fred]");
-    ok(42, $result{"store value"} eq "store value - 1: [joe]");
-    ok(43, !defined $result{"fetch key"} );
-    ok(44, !defined $result{"fetch value"} );
-    ok(45, $_ eq "original") ;
-
-    ok(46, $db->FIRSTKEY() eq "fred") ;
-    ok(47, $result{"store key"} eq "store key - 1: [fred]");
-    ok(48, $result{"store value"} eq "store value - 1: [joe]");
-    ok(49, $result{"fetch key"} eq "fetch key - 1: [fred]");
-    ok(50, ! defined $result{"fetch value"} );
-    ok(51, $_ eq "original") ;
+    is($result{"store key"}, "store key - 1: [fred]");
+    is($result{"store value"}, "store value - 1: [joe]");
+    is($result{"fetch key"}, undef);
+    is($result{"fetch value"}, undef);
+    is($_, "original");
+
+    is($db->FIRSTKEY(), "fred");
+    is($result{"store key"}, "store key - 1: [fred]");
+    is($result{"store value"}, "store value - 1: [joe]");
+    is($result{"fetch key"}, "fetch key - 1: [fred]");
+    is($result{"fetch value"}, undef);
+    is($_, "original");
 
     $h{"jim"}  = "john" ;
-    ok(52, $result{"store key"} eq "store key - 2: [fred jim]");
-    ok(53, $result{"store value"} eq "store value - 2: [joe john]");
-    ok(54, $result{"fetch key"} eq "fetch key - 1: [fred]");
-    ok(55, ! defined $result{"fetch value"} );
-    ok(56, $_ eq "original") ;
-
-    ok(57, $h{"fred"} eq "joe");
-    ok(58, $result{"store key"} eq "store key - 3: [fred jim fred]");
-    ok(59, $result{"store value"} eq "store value - 2: [joe john]");
-    ok(60, $result{"fetch key"} eq "fetch key - 1: [fred]");
-    ok(61, $result{"fetch value"} eq "fetch value - 1: [joe]");
-    ok(62, $_ eq "original") ;
+    is($result{"store key"}, "store key - 2: [fred jim]");
+    is($result{"store value"}, "store value - 2: [joe john]");
+    is($result{"fetch key"}, "fetch key - 1: [fred]");
+    is($result{"fetch value"}, undef);
+    is($_, "original");
+
+    is($h{"fred"}, "joe");
+    is($result{"store key"}, "store key - 3: [fred jim fred]");
+    is($result{"store value"}, "store value - 2: [joe john]");
+    is($result{"fetch key"}, "fetch key - 1: [fred]");
+    is($result{"fetch value"}, "fetch value - 1: [joe]");
+    is($_, "original");
 
     undef $db ;
     untie %h;
@@ -381,12 +373,13 @@ EOM
    my (%h, $db) ;
    unlink <Op.dbmx*>;
 
-   ok(63, $db = tie(%h, 'ODBM_File','Op.dbmx', O_RDWR|O_CREAT, 0640)) ;
+   $db = tie %h, 'ODBM_File', 'Op.dbmx', O_RDWR|O_CREAT, 0640;
+   isa_ok($db, 'ODBM_File');
 
    $db->filter_store_key (sub { $_ = $h{$_} }) ;
 
    eval '$h{1} = 1234' ;
-   ok(64, $@ =~ /^recursion detected in filter_store_key at/ );
+   like($@, qr/^recursion detected in filter_store_key at/);
    
    undef $db ;
    untie %h;
@@ -404,9 +397,9 @@ EOM
     my $a = "";
     local $SIG{__WARN__} = sub {$a = $_[0]} ;
     
-    ok(65, tie(%h, 'ODBM_File','Op.dbmx', O_RDWR|O_CREAT, 0640)) ;
+    isa_ok(tie(%h, 'ODBM_File', 'Op.dbmx', O_RDWR|O_CREAT, 0640), 'ODBM_File');
     $h{ABC} = undef;
-    ok(66, $a eq "") ;
+    is($a, "");
     untie %h;
     unlink <Op.dbmx*>;
 }
@@ -421,27 +414,28 @@ EOM
     unlink <Op.dbmx*>;
     my $bad_key = 0 ;
     my %h = () ;
-    ok(67, my $db = tie(%h, 'ODBM_File','Op.dbmx', O_RDWR|O_CREAT, 0640)) ;
+    my $db = tie %h, 'ODBM_File','Op.dbmx', O_RDWR|O_CREAT, 0640;
+    isa_ok($db, 'ODBM_File');
     $db->filter_fetch_key (sub { $_ =~ s/^Beta_/Alpha_/ if defined $_}) ;
     $db->filter_store_key (sub { $bad_key = 1 if /^Beta_/ ; $_ =~ s/^Alpha_/Beta_/}) ;
 
     $h{'Alpha_ABC'} = 2 ;
     $h{'Alpha_DEF'} = 5 ;
 
-    ok(68, $h{'Alpha_ABC'} == 2);
-    ok(69, $h{'Alpha_DEF'} == 5);
+    is($h{'Alpha_ABC'}, 2);
+    is($h{'Alpha_DEF'}, 5);
 
     my ($k, $v) = ("","");
     while (($k, $v) = each %h) {}
-    ok(70, $bad_key == 0);
+    is($bad_key, 0);
 
     $bad_key = 0 ;
     foreach $k (keys %h) {}
-    ok(71, $bad_key == 0);
+    is($bad_key, 0);
 
     $bad_key = 0 ;
     foreach $v (values %h) {}
-    ok(72, $bad_key == 0);
+    is($bad_key, 0);
 
     undef $db ;
     untie %h ;
@@ -455,7 +449,8 @@ EOM
    my %h ;
    unlink <Op.dbmx*>;
 
-   ok(73, my $db = tie(%h, 'ODBM_File','Op.dbmx', O_RDWR|O_CREAT, 0640)) ;
+   my $db = tie %h, 'ODBM_File','Op.dbmx', O_RDWR|O_CREAT, 0640;
+   isa_ok($db, 'ODBM_File');
 
    $db->filter_fetch_key   (sub { }) ;
    $db->filter_store_key   (sub { }) ;
@@ -465,10 +460,10 @@ EOM
    $_ = "original" ;
 
    $h{"fred"} = "joe" ;
-   ok(74, $h{"fred"} eq "joe");
+   is($h{"fred"}, "joe");
 
    eval { grep { $h{$_} } (1, 2, 3) };
-   ok (75, ! $@);
+   is($@, '');
 
 
    # delete the filters
@@ -479,18 +474,18 @@ EOM
 
    $h{"fred"} = "joe" ;
 
-   ok(76, $h{"fred"} eq "joe");
+   is($h{"fred"}, "joe");
 
-   ok(77, $db->FIRSTKEY() eq "fred") ;
+   is($db->FIRSTKEY(), "fred");
    
    eval { grep { $h{$_} } (1, 2, 3) };
-   ok (78, ! $@);
+   is($@, '');
 
    undef $db ;
    untie %h;
    unlink <Op.dbmx*>;
 }
-exit ;
+
 if ($^O eq 'hpux') {
     print <<EOM;
 #