test/test_digest: compare with literals

Compare with pre-calculated string literals rather than the output of
Digest::MD5 (ext/digest).

3 files changed, 17 insertions, 24 deletions

diff --git a/test/test_digest.rb b/test/test_digest.rb
index 51fc03bb..028889c1 100644
--- a/test/test_digest.rb
+++ b/test/test_digest.rb
@@ -7,27 +7,21 @@ class OpenSSL::TestDigest < OpenSSL::TestCase
   def setup
     @d1 = OpenSSL::Digest.new("MD5")
     @d2 = OpenSSL::Digest::MD5.new
-    @md = Digest::MD5.new
-    @data = "DATA"
-  end
-
-  def teardown
-    super
-    @d1 = @d2 = @md = nil
   end
 
   def test_digest
-    assert_equal(@md.digest, @d1.digest)
-    assert_equal(@md.hexdigest, @d1.hexdigest)
-    @d1 << @data
-    @d2 << @data
-    @md << @data
-    assert_equal(@md.digest, @d1.digest)
-    assert_equal(@md.hexdigest, @d1.hexdigest)
-    assert_equal(@d1.digest, @d2.digest)
-    assert_equal(@d1.hexdigest, @d2.hexdigest)
-    assert_equal(@md.digest, OpenSSL::Digest::MD5.digest(@data))
-    assert_equal(@md.hexdigest, OpenSSL::Digest::MD5.hexdigest(@data))
+    null_hex = "d41d8cd98f00b204e9800998ecf8427e"
+    null_bin = [null_hex].pack("H*")
+    data = "DATA"
+    hex = "e44f9e348e41cb272efa87387728571b"
+    bin = [hex].pack("H*")
+    assert_equal(null_bin, @d1.digest)
+    assert_equal(null_hex, @d1.hexdigest)
+    @d1 << data
+    assert_equal(bin, @d1.digest)
+    assert_equal(hex, @d1.hexdigest)
+    assert_equal(bin, OpenSSL::Digest::MD5.digest(data))
+    assert_equal(hex, OpenSSL::Digest::MD5.hexdigest(data))
   end
 
   def test_eql
@@ -43,17 +37,17 @@ class OpenSSL::TestDigest < OpenSSL::TestCase
   end
 
   def test_dup
-    @d1.update(@data)
+    @d1.update("DATA")
     assert_equal(@d1.name, @d1.dup.name, "dup")
     assert_equal(@d1.name, @d1.clone.name, "clone")
     assert_equal(@d1.digest, @d1.clone.digest, "clone .digest")
   end
 
   def test_reset
-    @d1.update(@data)
+    @d1.update("DATA")
     dig1 = @d1.digest
     @d1.reset
-    @d1.update(@data)
+    @d1.update("DATA")
     dig2 = @d1.digest
     assert_equal(dig1, dig2, "reset")
   end
diff --git a/test/test_x509name.rb b/test/test_x509name.rb
index 250f1d09..78da4df1 100644
--- a/test/test_x509name.rb
+++ b/test/test_x509name.rb
@@ -345,13 +345,13 @@ class OpenSSL::TestX509Name < OpenSSL::TestCase
   def test_hash
     dn = "/DC=org/DC=ruby-lang/CN=www.ruby-lang.org"
     name = OpenSSL::X509::Name.parse(dn)
-    d = Digest::MD5.digest(name.to_der)
+    d = OpenSSL::Digest::MD5.digest(name.to_der)
     expected = (d[0].ord & 0xff) | (d[1].ord & 0xff) << 8 | (d[2].ord & 0xff) << 16 | (d[3].ord & 0xff) << 24
     assert_equal(expected, name_hash(name))
     #
     dn = "/DC=org/DC=ruby-lang/CN=baz.ruby-lang.org"
     name = OpenSSL::X509::Name.parse(dn)
-    d = Digest::MD5.digest(name.to_der)
+    d = OpenSSL::Digest::MD5.digest(name.to_der)
     expected = (d[0].ord & 0xff) | (d[1].ord & 0xff) << 8 | (d[2].ord & 0xff) << 16 | (d[3].ord & 0xff) << 24
     assert_equal(expected, name_hash(name))
   end
diff --git a/test/utils.rb b/test/utils.rb
index 6f3a3c6d..0016f5c7 100644
--- a/test/utils.rb
+++ b/test/utils.rb
@@ -10,7 +10,6 @@ rescue LoadError
 end
 
 require "test/unit"
-require "digest/md5"
 require 'tempfile'
 require "rbconfig"
 require "socket"