Removed deprecated methods and related tests from ActiveSupport

5 files changed, 0 insertions, 367 deletions

diff --git a/activesupport/test/benchmarkable_test.rb b/activesupport/test/benchmarkable_test.rb
index 766956f50f..06f5172e1f 100644
--- a/activesupport/test/benchmarkable_test.rb
+++ b/activesupport/test/benchmarkable_test.rb
@@ -26,17 +26,6 @@ class BenchmarkableTest < ActiveSupport::TestCase
     assert_last_logged 'test_run'
   end
 
-  def test_with_message_and_deprecated_level
-    i_was_run = false
-
-    assert_deprecated do
-      benchmark('debug_run', :debug) { i_was_run = true }
-    end
-
-    assert i_was_run
-    assert_last_logged 'debug_run'
-  end
-
   def test_within_level
     logger.level = ActiveSupport::BufferedLogger::DEBUG
     benchmark('included_debug_run', :level => :debug) { }
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 476d55fffd..ed5ccb44de 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -531,26 +531,6 @@ class FileStoreTest < ActiveSupport::TestCase
   include CacheDeleteMatchedBehavior
   include CacheIncrementDecrementBehavior
 
-  def test_deprecated_expires_in_on_read
-    ActiveSupport::Deprecation.silence do
-      old_cache = ActiveSupport::Cache.lookup_store(:file_store, cache_dir)
-
-      time = Time.local(2008, 4, 24)
-      Time.stubs(:now).returns(time)
-
-      old_cache.write("foo", "bar")
-      assert_equal 'bar', old_cache.read('foo', :expires_in => 60)
-
-      Time.stubs(:now).returns(time + 30)
-      assert_equal 'bar', old_cache.read('foo', :expires_in => 60)
-
-      Time.stubs(:now).returns(time + 61)
-      assert_equal 'bar', old_cache.read('foo')
-      assert_nil old_cache.read('foo', :expires_in => 60)
-      assert_nil old_cache.read('foo')
-    end
-  end
-
   def test_key_transformation
     key = @cache.send(:key_file_path, "views/index?id=1")
     assert_equal "views/index?id=1", @cache.send(:file_path_key, key)
@@ -628,18 +608,6 @@ class MemoryStoreTest < ActiveSupport::TestCase
   end
 end
 
-class SynchronizedStoreTest < ActiveSupport::TestCase
-  def setup
-    ActiveSupport::Deprecation.silence do
-      @cache = ActiveSupport::Cache.lookup_store(:memory_store, :expires_in => 60)
-    end
-  end
-
-  include CacheStoreBehavior
-  include CacheDeleteMatchedBehavior
-  include CacheIncrementDecrementBehavior
-end
-
 uses_memcached 'memcached backed store' do
   class MemCacheStoreTest < ActiveSupport::TestCase
     def setup
@@ -672,18 +640,6 @@ uses_memcached 'memcached backed store' do
       end
     end
   end
-
-  class CompressedMemCacheStore < ActiveSupport::TestCase
-    def setup
-      ActiveSupport::Deprecation.silence do
-        @cache = ActiveSupport::Cache.lookup_store(:compressed_mem_cache_store, :expires_in => 60)
-        @cache.clear
-      end
-    end
-
-    include CacheStoreBehavior
-    include CacheIncrementDecrementBehavior
-  end
 end
 
 class CacheStoreLoggerTest < ActiveSupport::TestCase
diff --git a/activesupport/test/class_cache_test.rb b/activesupport/test/class_cache_test.rb
index fc2d54515d..752c0ee478 100644
--- a/activesupport/test/class_cache_test.rb
+++ b/activesupport/test/class_cache_test.rb
@@ -51,20 +51,6 @@ module ActiveSupport
         assert_equal @cache[ClassCacheTest], @cache.get(ClassCacheTest.name)
       end
 
-      def test_new
-        assert_deprecated do
-          @cache.new ClassCacheTest
-        end
-        assert @cache.key?(ClassCacheTest.name)
-      end
-
-      def test_new_rejects_strings_when_called_on_a_new_string
-        assert_deprecated do
-          @cache.new ClassCacheTest.name
-        end
-        assert !@cache.key?(ClassCacheTest.name)
-      end
-
       def test_new_rejects_strings
         @cache.store ClassCacheTest.name
         assert !@cache.key?(ClassCacheTest.name)
@@ -74,35 +60,6 @@ module ActiveSupport
         x = @cache.store ClassCacheTest
         assert_equal @cache, x
       end
-
-      def test_new_returns_proxy
-        v = nil
-        assert_deprecated do
-          v = @cache.new ClassCacheTest.name
-        end
-
-        assert_deprecated do
-          assert_equal ClassCacheTest, v.get
-        end
-      end
-
-      def test_anonymous_class_fail
-        assert_raises(ArgumentError) do
-          assert_deprecated do
-            @cache.new Class.new
-          end
-        end
-
-        assert_raises(ArgumentError) do
-          x = Class.new
-          @cache[x] = x
-        end
-
-        assert_raises(ArgumentError) do
-          x = Class.new
-          @cache.store x
-        end
-      end
     end
   end
 end
diff --git a/activesupport/test/core_ext/class/class_inheritable_attributes_test.rb b/activesupport/test/core_ext/class/class_inheritable_attributes_test.rb
deleted file mode 100644
index 020dfce56a..0000000000
--- a/activesupport/test/core_ext/class/class_inheritable_attributes_test.rb
+++ /dev/null
@@ -1,230 +0,0 @@
-require 'abstract_unit'
-require 'active_support/core_ext/class/inheritable_attributes'
-
-class ClassInheritableAttributesTest < Test::Unit::TestCase
-  def setup
-    ActiveSupport::Deprecation.silenced = true
-    @klass = Class.new
-  end
-
-  def teardown
-    ActiveSupport::Deprecation.silenced = false
-  end
-
-  def test_reader_declaration
-    assert_nothing_raised do
-      @klass.class_inheritable_reader :a
-      assert_respond_to @klass, :a
-      assert_respond_to @klass.new, :a
-    end
-  end
-
-  def test_writer_declaration
-    assert_nothing_raised do
-      @klass.class_inheritable_writer :a
-      assert_respond_to @klass, :a=
-      assert_respond_to @klass.new, :a=
-    end
-  end
-
-  def test_writer_declaration_without_instance_writer
-    assert_nothing_raised do
-      @klass.class_inheritable_writer :a, :instance_writer => false
-      assert_respond_to @klass, :a=
-      assert !@klass.new.respond_to?(:a=)
-    end
-  end
-
-  def test_accessor_declaration
-    assert_nothing_raised do
-      @klass.class_inheritable_accessor :a
-      assert_respond_to @klass, :a
-      assert_respond_to @klass.new, :a
-      assert_respond_to @klass, :a=
-      assert_respond_to @klass.new, :a=
-    end
-  end
-
-  def test_accessor_declaration_without_instance_writer
-    assert_nothing_raised do
-      @klass.class_inheritable_accessor :a, :instance_writer => false
-      assert_respond_to @klass, :a
-      assert_respond_to @klass.new, :a
-      assert_respond_to @klass, :a=
-      assert !@klass.new.respond_to?(:a=)
-    end
-  end
-
-  def test_array_declaration
-    assert_nothing_raised do
-      @klass.class_inheritable_array :a
-      assert_respond_to @klass, :a
-      assert_respond_to @klass.new, :a
-      assert_respond_to @klass, :a=
-      assert_respond_to @klass.new, :a=
-    end
-  end
-
-  def test_array_declaration_without_instance_writer
-    assert_nothing_raised do
-      @klass.class_inheritable_array :a, :instance_writer => false
-      assert_respond_to @klass, :a
-      assert_respond_to @klass.new, :a
-      assert_respond_to @klass, :a=
-      assert !@klass.new.respond_to?(:a=)
-    end
-  end
-
-  def test_hash_declaration
-    assert_nothing_raised do
-      @klass.class_inheritable_hash :a
-      assert_respond_to @klass, :a
-      assert_respond_to @klass.new, :a
-      assert_respond_to @klass, :a=
-      assert_respond_to @klass.new, :a=
-    end
-  end
-
-  def test_hash_declaration_without_instance_writer
-    assert_nothing_raised do
-      @klass.class_inheritable_hash :a, :instance_writer => false
-      assert_respond_to @klass, :a
-      assert_respond_to @klass.new, :a
-      assert_respond_to @klass, :a=
-      assert !@klass.new.respond_to?(:a=)
-    end
-  end
-
-  def test_reader
-    @klass.class_inheritable_reader :a
-    assert_nil @klass.a
-    assert_nil @klass.new.a
-
-    @klass.send(:write_inheritable_attribute, :a, 'a')
-
-    assert_equal 'a', @klass.a
-    assert_equal 'a', @klass.new.a
-    assert_equal @klass.a, @klass.new.a
-    assert_equal @klass.a.object_id, @klass.new.a.object_id
-  end
-
-  def test_writer
-    @klass.class_inheritable_reader :a
-    @klass.class_inheritable_writer :a
-
-    assert_nil @klass.a
-    assert_nil @klass.new.a
-
-    @klass.a = 'a'
-    assert_equal 'a', @klass.a
-    @klass.new.a = 'A'
-    assert_equal 'A', @klass.a
-  end
-
-  def test_array
-    @klass.class_inheritable_array :a
-
-    assert_nil @klass.a
-    assert_nil @klass.new.a
-
-    @klass.a = %w(a b c)
-    assert_equal %w(a b c), @klass.a
-    assert_equal %w(a b c), @klass.new.a
-
-    @klass.new.a = %w(A B C)
-    assert_equal %w(a b c A B C), @klass.a
-    assert_equal %w(a b c A B C), @klass.new.a
-  end
-
-  def test_hash
-    @klass.class_inheritable_hash :a
-
-    assert_nil @klass.a
-    assert_nil @klass.new.a
-
-    @klass.a = { :a => 'a' }
-    assert_equal({ :a => 'a' }, @klass.a)
-    assert_equal({ :a => 'a' }, @klass.new.a)
-
-    @klass.new.a = { :b => 'b' }
-    assert_equal({ :a => 'a', :b => 'b' }, @klass.a)
-    assert_equal({ :a => 'a', :b => 'b' }, @klass.new.a)
-  end
-
-  def test_inheritance
-    @klass.class_inheritable_accessor :a
-    @klass.a = 'a'
-
-    @sub = eval("class FlogMe < @klass; end; FlogMe")
-
-    @klass.class_inheritable_accessor :b
-
-    assert_respond_to @sub, :a
-    assert_respond_to @sub, :b
-    assert_equal @klass.a, @sub.a
-    assert_equal @klass.b, @sub.b
-    assert_equal 'a', @sub.a
-    assert_nil @sub.b
-
-    @klass.b = 'b'
-    assert_not_equal @klass.b, @sub.b
-    assert_equal 'b', @klass.b
-    assert_nil @sub.b
-
-    @sub.a = 'A'
-    assert_not_equal @klass.a, @sub.a
-    assert_equal 'a', @klass.a
-    assert_equal 'A', @sub.a
-
-    @sub.b = 'B'
-    assert_not_equal @klass.b, @sub.b
-    assert_equal 'b', @klass.b
-    assert_equal 'B', @sub.b
-  end
-
-  def test_array_inheritance
-    @klass.class_inheritable_accessor :a
-    @klass.a = []
-
-    @sub = eval("class SubbyArray < @klass; end; SubbyArray")
-
-    assert_equal [], @klass.a
-    assert_equal [], @sub.a
-
-    @sub.a << :first
-
-    assert_equal [:first], @sub.a
-    assert_equal [], @klass.a
-  end
-
-  def test_array_inheritance_
-    @klass.class_inheritable_accessor :a
-    @klass.a = {}
-
-    @sub = eval("class SubbyHash < @klass; end; SubbyHash")
-
-    assert_equal Hash.new, @klass.a
-    assert_equal Hash.new, @sub.a
-
-    @sub.a[:first] = :first
-
-    assert_equal 1, @sub.a.keys.size
-    assert_equal 0, @klass.a.keys.size
-  end
-
-  def test_reset_inheritable_attributes
-    @klass.class_inheritable_accessor :a
-    @klass.a = 'a'
-
-    @sub = eval("class Inheriting < @klass; end; Inheriting")
-
-    assert_equal 'a', @klass.a
-    assert_equal 'a', @sub.a
-
-    @klass.reset_inheritable_attributes
-    @sub = eval("class NotInheriting < @klass; end; NotInheriting")
-
-    assert_nil @klass.a
-    assert_nil @sub.a
-  end
-end
diff --git a/activesupport/test/core_ext/module/attr_accessor_with_default_test.rb b/activesupport/test/core_ext/module/attr_accessor_with_default_test.rb
deleted file mode 100644
index 0ecd16b051..0000000000
--- a/activesupport/test/core_ext/module/attr_accessor_with_default_test.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require 'abstract_unit'
-require 'active_support/core_ext/module/attr_accessor_with_default'
-
-class AttrAccessorWithDefaultTest < ActiveSupport::TestCase
-  def setup
-    @target = Class.new do
-      def helper
-        'helper'
-      end
-    end
-    @instance = @target.new
-  end
-
-  def test_default_arg
-    assert_deprecated do
-      @target.attr_accessor_with_default :foo, :bar
-    end
-    assert_equal(:bar, @instance.foo)
-    @instance.foo = nil
-    assert_nil(@instance.foo)
-  end
-
-  def test_default_proc
-    assert_deprecated do
-      @target.attr_accessor_with_default(:foo) {helper.upcase}
-    end
-    assert_equal('HELPER', @instance.foo)
-    @instance.foo = nil
-    assert_nil(@instance.foo)
-  end
-
-  def test_invalid_args
-    assert_raise(ArgumentError) do
-      assert_deprecated do
-        @target.attr_accessor_with_default :foo
-      end
-    end
-  end
-end