Re: [PATCH] Tests for File::Compare

[p5sagit/p5-mst-13.2.git] / t / lib / md5-file.t

diff --git a/t/lib/md5-file.t b/t/lib/md5-file.t
index d5df9af..c786a5f 100644 (file)
--- a/t/lib/md5-file.t
+++ b/t/lib/md5-file.t
@@ -6,24 +6,33 @@ BEGIN {
 print "1..2\n";
 
 use strict;
-use Digest::MD5 qw(md5 md5_hex);
+use Digest::MD5 qw(md5 md5_hex md5_base64);
 
 #
 # This is the output of: 'md5sum MD5.pm MD5.xs'
 #
 my $EXPECT;
 
-if (ord('A' == 193) { # EBCDIC
+if (ord('A') == 193) { # EBCDIC
 $EXPECT = <<EOT;
-9e1d1183ff41717c91a563c41e08d672  ext/Digest/MD5/MD5.pm
-61debd0ec12e131e1ba220e2f3ad2d26  ext/Digest/MD5/MD5.xs
+95a81f17a8e6c2273aecac12d8c4cb90  ext/Digest/MD5/MD5.pm
+9cecc5dbb27bd64b98f61f558b4db378  ext/Digest/MD5/MD5.xs
 EOT
 } else { # ASCII
 $EXPECT = <<EOT;
-9e1d1183ff41717c91a563c41e08d672  ext/Digest/MD5/MD5.pm
-61debd0ec12e131e1ba220e2f3ad2d26  ext/Digest/MD5/MD5.xs
+3d0146bf194e4fe68733d00fba02a49e  ext/Digest/MD5/MD5.pm
+5526659171a63f532d990dd73791b60e  ext/Digest/MD5/MD5.xs
 EOT
 }
+
+my $B64 = 1;
+eval { require MIME::Base64; };
+if ($@) {
+    print $@;
+    print "# Will not test base64 methods\n";
+    $B64 = 0;
+}
+
 my $testno = 0;
 
 use File::Spec;
@@ -38,6 +47,11 @@ for (split /^/, $EXPECT) {
      }
      $file = File::Spec->catfile($path, $last);
      my $md5bin = pack("H*", $md5hex);
+     my $md5b64;
+     if ($B64) {
+        $md5b64 = MIME::Base64::encode($md5bin, "");
+        chop($md5b64); chop($md5b64);   # remove padding
+     }
      my $failed;
 
      if (digest_file($file, 'digest') ne $md5bin) {
@@ -50,6 +64,11 @@ for (split /^/, $EXPECT) {
         $failed++;
      }
 
+     if ($B64 && digest_file($file, 'b64digest') ne $md5b64) {
+        print "$file: Bad b64digest\n";
+        $failed++;
+     }
+
      my $data = cat_file($file);
      if (md5($data) ne $md5bin) {
         print "$file: md5() failed\n";
@@ -59,6 +78,10 @@ for (split /^/, $EXPECT) {
         print "$file: md5_hex() failed\n";
         $failed++;
      }
+     if ($B64 && md5_base64($data) ne $md5b64) {
+        print "$file: md5_base64() failed\n";
+        $failed++;
+     }
 
      if (Digest::MD5->new->add($data)->digest ne $md5bin) {
         print "$file: MD5->new->add(...)->digest failed\n";
@@ -68,6 +91,10 @@ for (split /^/, $EXPECT) {
         print "$file: MD5->new->add(...)->hexdigest failed\n";
         $failed++;
      }
+     if ($B64 && Digest::MD5->new->add($data)->b64digest ne $md5b64) {
+        print "$file: MD5->new->add(...)->b64digest failed\n";
+        $failed++;
+     }
 
      my @data = split //, $data;
      if (md5(@data) ne $md5bin) {
@@ -99,7 +126,9 @@ sub digest_file
     #print "$file $method\n";
 
     open(FILE, $file) or die "Can't open $file: $!";
-    binmode(FILE);
+# Digests avove are generated on UNIX without CRLF
+# so leave handles in text mode
+#    binmode(FILE);
     my $digest = Digest::MD5->new->addfile(*FILE)->$method();
     close(FILE);
 
@@ -111,7 +140,9 @@ sub cat_file
     my($file) = @_;
     local $/;  # slurp
     open(FILE, $file) or die "Can't open $file: $!";
-    binmode(FILE);
+# Digests avove are generated on UNIX without CRLF
+# so leave handles in text mode
+#    binmode(FILE);
     my $tmp = <FILE>;
     close(FILE);
     $tmp;