From ccf99b9ce600ceb1f0360db7af4164a916f03882 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 17 Feb 2006 08:40:52 +0000
Subject: * eval.c (ev_const_get): simplified using rb_const_get_fallback().

* eval.c (ev_const_defined): adopt to ev_const_get() using
  rb_const_defined_fallback().

* variable.c (rb_const_get_fallback): new function to implement
  constant search.

* variable.c (rb_const_defined_fallback): new function to
  implement constant definition check.

* variable.c (rb_const_get_0): adopt to new behavior.  constants
  are looked up in the order of: current class, super classes (but
  Object), lexically external classes/modules, and Object.

* variable.c (rb_const_defined_0): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/digest/test_digest.rb | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'test/digest/test_digest.rb')

diff --git a/test/digest/test_digest.rb b/test/digest/test_digest.rb
index 62f0aa2cd7..5cc9a99c01 100644
--- a/test/digest/test_digest.rb
+++ b/test/digest/test_digest.rb
@@ -12,7 +12,6 @@ require 'digest'
   rescue LoadError
   end
 end
-include Digest
 
 module TestDigest
   Data1 = "abc"
@@ -66,55 +65,55 @@ module TestDigest
 
   class TestMD5 < Test::Unit::TestCase
     include TestDigest
-    ALGO = MD5
+    ALGO = Digest::MD5
     DATA = {
       Data1 => "900150983cd24fb0d6963f7d28e17f72",
       Data2 => "8215ef0796a20bcaaae116d3876c664a",
     }
-  end if defined?(MD5)
+  end if defined?(Digest::MD5)
 
   class TestSHA1 < Test::Unit::TestCase
     include TestDigest
-    ALGO = SHA1
+    ALGO = Digest::SHA1
     DATA = {
       Data1 => "a9993e364706816aba3e25717850c26c9cd0d89d",
       Data2 => "84983e441c3bd26ebaae4aa1f95129e5e54670f1",
     }
-  end if defined?(SHA1)
+  end if defined?(Digest::SHA1)
 
   class TestSHA256 < Test::Unit::TestCase
     include TestDigest
-    ALGO = SHA256
+    ALGO = Digest::SHA256
     DATA = {
       Data1 => "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad",
       Data2 => "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1",
     }
-  end if defined?(SHA256)
+  end if defined?(Digest::SHA256)
 
   class TestSHA384 < Test::Unit::TestCase
     include TestDigest
-    ALGO = SHA384
+    ALGO = Digest::SHA384
     DATA = {
       Data1 => "cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7",
       Data2 => "3391fdddfc8dc7393707a65b1b4709397cf8b1d162af05abfe8f450de5f36bc6b0455a8520bc4e6f5fe95b1fe3c8452b",
     }
-  end if defined?(SHA384)
+  end if defined?(Digest::SHA384)
 
   class TestSHA512 < Test::Unit::TestCase
     include TestDigest
-    ALGO = SHA512
+    ALGO = Digest::SHA512
     DATA = {
       Data1 => "ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f",
       Data2 => "204a8fc6dda82f0a0ced7beb8e08a41657c16ef468b228a8279be331a703c33596fd15c13b1b07f9aa1d3bea57789ca031ad85c7a71dd70354ec631238ca3445",
     }
-  end if defined?(SHA512)
+  end if defined?(Digest::SHA512)
 
   class TestRMD160 < Test::Unit::TestCase
     include TestDigest
-    ALGO = RMD160
+    ALGO = Digest::RMD160
     DATA = {
       Data1 => "8eb208f7e05d987a9b044a8e98c6b087f15a0bfc",
       Data2 => "12a053384a9c0c88e405a06c27dcf49ada62eb2b",
     }
-  end if defined?(RMD160)
+  end if defined?(Digest::RMD160)
 end
-- 
cgit v1.2.3