diff options
Diffstat (limited to 'activesupport/test/caching_tools_test.rb')
-rw-r--r-- | activesupport/test/caching_tools_test.rb | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/activesupport/test/caching_tools_test.rb b/activesupport/test/caching_tools_test.rb index 9f3e42e496..c9890e4d13 100644 --- a/activesupport/test/caching_tools_test.rb +++ b/activesupport/test/caching_tools_test.rb @@ -1,11 +1,9 @@ -require 'test/unit' -require File.dirname(__FILE__)+'/../lib/active_support/caching_tools' +require File.dirname(__FILE__) + '/abstract_unit' class HashCachingTests < Test::Unit::TestCase - def cached(&proc) - return @cached if @cached - + return @cached if defined?(@cached) + @cached_class = Class.new(&proc) @cached_class.class_eval do extend ActiveSupport::CachingTools::HashCaching @@ -13,14 +11,14 @@ class HashCachingTests < Test::Unit::TestCase end @cached = @cached_class.new end - + def test_cache_access_should_call_method cached do def slow_method(a) raise "I should be here: #{a}"; end end assert_raises(RuntimeError) { cached.slow_method_cache[1] } end - + def test_cache_access_should_actually_cache cached do def slow_method(a) @@ -37,7 +35,7 @@ class HashCachingTests < Test::Unit::TestCase assert_equal 11, cached.slow_method_cache[10] assert_equal 12, cached.slow_method_cache[11] end - + def test_cache_should_be_clearable cached do def slow_method(a) @@ -48,18 +46,18 @@ class HashCachingTests < Test::Unit::TestCase assert_equal 1, cached.slow_method_cache[:a] assert_equal 2, cached.slow_method_cache[:b] assert_equal 3, cached.slow_method_cache[:c] - + assert_equal 1, cached.slow_method_cache[:a] assert_equal 2, cached.slow_method_cache[:b] assert_equal 3, cached.slow_method_cache[:c] - + cached.slow_method_cache.clear - + assert_equal 4, cached.slow_method_cache[:a] assert_equal 5, cached.slow_method_cache[:b] assert_equal 6, cached.slow_method_cache[:c] end - + def test_deep_caches_should_work_too cached do def slow_method(a, b, c) @@ -70,12 +68,11 @@ class HashCachingTests < Test::Unit::TestCase assert_equal 7, cached.slow_method_cache[1][2][4] assert_equal 7, cached.slow_method_cache[1][2][4] assert_equal 7, cached.slow_method_cache[4][2][1] - + assert_equal({ 1 => {1 => {1 => 3}, 2 => {4 => 7}}, 4 => {2 => {1 => 7}}}, cached.slow_method_cache ) end - end |