diff options
author | Sergey Parizhskiy <parizhskiy@gmail.com> | 2011-11-28 17:33:23 +0200 |
---|---|---|
committer | Sergey Parizhskiy <parizhskiy@gmail.com> | 2011-11-28 17:33:23 +0200 |
commit | e2e2d6298ebd9c67d0dc14c1e3481a59a4edf5d2 (patch) | |
tree | 83297628700ed0dc8ac8bdfb60aae8645a517c32 /activesupport/test/class_cache_test.rb | |
parent | 493cf44682c19bd69eb2463d260c3bf29c7a23d7 (diff) | |
parent | 6d05c793cafe79860bcbb469d6c46c83c531ab34 (diff) | |
download | rails-e2e2d6298ebd9c67d0dc14c1e3481a59a4edf5d2.tar.gz rails-e2e2d6298ebd9c67d0dc14c1e3481a59a4edf5d2.tar.bz2 rails-e2e2d6298ebd9c67d0dc14c1e3481a59a4edf5d2.zip |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activesupport/test/class_cache_test.rb')
-rw-r--r-- | activesupport/test/class_cache_test.rb | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/activesupport/test/class_cache_test.rb b/activesupport/test/class_cache_test.rb index 752c0ee478..b96f476ce6 100644 --- a/activesupport/test/class_cache_test.rb +++ b/activesupport/test/class_cache_test.rb @@ -10,45 +10,58 @@ module ActiveSupport def test_empty? assert @cache.empty? - @cache[ClassCacheTest] = ClassCacheTest + @cache.store(ClassCacheTest) assert !@cache.empty? end def test_clear! assert @cache.empty? - @cache[ClassCacheTest] = ClassCacheTest + @cache.store(ClassCacheTest) assert !@cache.empty? @cache.clear! assert @cache.empty? end def test_set_key - @cache[ClassCacheTest] = ClassCacheTest + @cache.store(ClassCacheTest) assert @cache.key?(ClassCacheTest.name) end - def test_set_rejects_strings - @cache[ClassCacheTest.name] = ClassCacheTest - assert @cache.empty? - end - def test_get_with_class - @cache[ClassCacheTest] = ClassCacheTest - assert_equal ClassCacheTest, @cache[ClassCacheTest] + @cache.store(ClassCacheTest) + assert_equal ClassCacheTest, @cache.get(ClassCacheTest) end def test_get_with_name - @cache[ClassCacheTest] = ClassCacheTest - assert_equal ClassCacheTest, @cache[ClassCacheTest.name] + @cache.store(ClassCacheTest) + assert_equal ClassCacheTest, @cache.get(ClassCacheTest.name) end def test_get_constantizes assert @cache.empty? - assert_equal ClassCacheTest, @cache[ClassCacheTest.name] + assert_equal ClassCacheTest, @cache.get(ClassCacheTest.name) end - def test_get_is_an_alias - assert_equal @cache[ClassCacheTest], @cache.get(ClassCacheTest.name) + def test_get_constantizes_fails_on_invalid_names + assert @cache.empty? + assert_raise NameError do + @cache.get("OmgTotallyInvalidConstantName") + end + end + + def test_get_alias + assert @cache.empty? + assert_equal @cache[ClassCacheTest.name], @cache.get(ClassCacheTest.name) + end + + def test_safe_get_constantizes + assert @cache.empty? + assert_equal ClassCacheTest, @cache.safe_get(ClassCacheTest.name) + end + + def test_safe_get_constantizes_doesnt_fail_on_invalid_names + assert @cache.empty? + assert_equal nil, @cache.safe_get("OmgTotallyInvalidConstantName") end def test_new_rejects_strings |