Remove deprecations from Active Support.

4 files changed, 0 insertions, 347 deletions

diff --git a/activesupport/test/flush_cache_on_private_memoization_test.rb b/activesupport/test/flush_cache_on_private_memoization_test.rb
deleted file mode 100644
index bc488cc743..0000000000
--- a/activesupport/test/flush_cache_on_private_memoization_test.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require 'abstract_unit'
-require 'test/unit'
-
-class FlushCacheOnPrivateMemoizationTest < Test::Unit::TestCase
-  ActiveSupport::Deprecation.silence do
-    extend ActiveSupport::Memoizable
-  end
-
-  def test_public
-    assert_method_unmemoizable :pub
-  end
-
-  def test_protected
-    assert_method_unmemoizable :prot
-  end
-
-  def test_private
-    assert_method_unmemoizable :priv
-  end
-
-  def pub; rand end
-  memoize :pub
-
-  protected
-
-  def prot; rand end
-  memoize :prot
-
-  private
-
-  def priv; rand end
-  memoize :priv
-
-  def assert_method_unmemoizable(meth, message=nil)
-    full_message = build_message(message, "<?> not unmemoizable.\n", meth)
-    assert_block(full_message) do
-      a = send meth
-      b = send meth
-      unmemoize_all
-      c = send meth
-      a == b && a != c
-    end
-  end
-
-end
diff --git a/activesupport/test/memoizable_test.rb b/activesupport/test/memoizable_test.rb
deleted file mode 100644
index e333b9a78c..0000000000
--- a/activesupport/test/memoizable_test.rb
+++ /dev/null
@@ -1,290 +0,0 @@
-require 'abstract_unit'
-
-class MemoizableTest < ActiveSupport::TestCase
-  class Person
-    ActiveSupport::Deprecation.silence do
-      extend ActiveSupport::Memoizable
-    end
-
-    attr_reader :name_calls, :age_calls, :is_developer_calls, :name_query_calls
-
-    def initialize
-      @name_calls = 0
-      @age_calls = 0
-      @is_developer_calls = 0
-      @name_query_calls = 0
-    end
-
-    def name
-      @name_calls += 1
-      "Josh"
-    end
-
-    def name?
-      @name_query_calls += 1
-      true
-    end
-    memoize :name?
-
-    def update(name)
-      "Joshua"
-    end
-    memoize :update
-
-    def age
-      @age_calls += 1
-      nil
-    end
-
-    memoize :name, :age
-
-    protected
-
-    def memoize_protected_test
-      'protected'
-    end
-    memoize :memoize_protected_test
-
-    private
-
-    def is_developer?
-      @is_developer_calls += 1
-      "Yes"
-    end
-    memoize :is_developer?
-  end
-
-  class Company
-    attr_reader :name_calls
-    def initialize
-      @name_calls = 0
-    end
-
-    def name
-      @name_calls += 1
-      "37signals"
-    end
-  end
-
-  module Rates
-    ActiveSupport::Deprecation.silence do
-      extend ActiveSupport::Memoizable
-    end
-
-    attr_reader :sales_tax_calls
-    def sales_tax(price)
-      @sales_tax_calls ||= 0
-      @sales_tax_calls += 1
-      price * 0.1025
-    end
-    memoize :sales_tax
-  end
-
-  class Calculator
-    ActiveSupport::Deprecation.silence do
-      extend ActiveSupport::Memoizable
-    end
-    include Rates
-
-    attr_reader :fib_calls
-    def initialize
-      @fib_calls = 0
-    end
-
-    def fib(n)
-      @fib_calls += 1
-
-      if n == 0 || n == 1
-        n
-      else
-        fib(n - 1) + fib(n - 2)
-      end
-    end
-    memoize :fib
-
-    def add_or_subtract(i, j, add)
-      if add
-        i + j
-      else
-        i - j
-      end
-    end
-    memoize :add_or_subtract
-
-    def counter
-      @count ||= 0
-      @count += 1
-    end
-    memoize :counter
-  end
-
-  def setup
-    @person = Person.new
-    @calculator = Calculator.new
-  end
-
-  def test_memoization
-    assert_equal "Josh", @person.name
-    assert_equal 1, @person.name_calls
-
-    3.times { assert_equal "Josh", @person.name }
-    assert_equal 1, @person.name_calls
-  end
-
-  def test_memoization_with_punctuation
-    assert_equal true, @person.name?
-
-    assert_nothing_raised(NameError) do
-      @person.memoize_all
-      @person.unmemoize_all
-    end
-  end
-
-  def test_memoization_flush_with_punctuation
-    assert_equal true, @person.name?
-    @person.flush_cache(:name?)
-    3.times { assert_equal true, @person.name? }
-    assert_equal 2, @person.name_query_calls
-  end
-
-  def test_memoization_with_nil_value
-    assert_equal nil, @person.age
-    assert_equal 1, @person.age_calls
-
-    3.times { assert_equal nil, @person.age }
-    assert_equal 1, @person.age_calls
-  end
-
-  def test_reloadable
-    assert_equal 1, @calculator.counter
-    assert_equal 2, @calculator.counter(:reload)
-    assert_equal 2, @calculator.counter
-    assert_equal 3, @calculator.counter(true)
-    assert_equal 3, @calculator.counter
-  end
-
-  def test_flush_cache
-    assert_equal 1, @calculator.counter
-
-    assert @calculator.instance_variable_get(:@_memoized_counter).any?
-    @calculator.flush_cache(:counter)
-    assert @calculator.instance_variable_get(:@_memoized_counter).empty?
-
-    assert_equal 2, @calculator.counter
-  end
-
-  def test_unmemoize_all
-    assert_equal 1, @calculator.counter
-
-    assert @calculator.instance_variable_get(:@_memoized_counter).any?
-    @calculator.unmemoize_all
-    assert @calculator.instance_variable_get(:@_memoized_counter).empty?
-
-    assert_equal 2, @calculator.counter
-  end
-
-  def test_memoize_all
-    @calculator.memoize_all
-    assert @calculator.instance_variable_defined?(:@_memoized_counter)
-  end
-
-  def test_memoization_cache_is_different_for_each_instance
-    assert_equal 1, @calculator.counter
-    assert_equal 2, @calculator.counter(:reload)
-    assert_equal 1, Calculator.new.counter
-  end
-
-  def test_memoized_is_not_affected_by_freeze
-    @person.freeze
-    assert_equal "Josh", @person.name
-    assert_equal "Joshua", @person.update("Joshua")
-  end
-
-  def test_memoization_with_args
-    assert_equal 55, @calculator.fib(10)
-    assert_equal 11, @calculator.fib_calls
-  end
-
-  def test_reloadable_with_args
-    assert_equal 55, @calculator.fib(10)
-    assert_equal 11, @calculator.fib_calls
-    assert_equal 55, @calculator.fib(10, :reload)
-    assert_equal 12, @calculator.fib_calls
-    assert_equal 55, @calculator.fib(10, true)
-    assert_equal 13, @calculator.fib_calls
-  end
-
-  def test_memoization_with_boolean_arg
-    assert_equal 4, @calculator.add_or_subtract(2, 2, true)
-    assert_equal 2, @calculator.add_or_subtract(4, 2, false)
-  end
-
-  def test_object_memoization
-    [Company.new, Company.new, Company.new].each do |company|
-      ActiveSupport::Deprecation.silence do
-        company.extend ActiveSupport::Memoizable
-      end
-      company.memoize :name
-
-      assert_equal "37signals", company.name
-      assert_equal 1, company.name_calls
-      assert_equal "37signals", company.name
-      assert_equal 1, company.name_calls
-    end
-  end
-
-  def test_memoized_module_methods
-    assert_equal 1.025, @calculator.sales_tax(10)
-    assert_equal 1, @calculator.sales_tax_calls
-    assert_equal 1.025, @calculator.sales_tax(10)
-    assert_equal 1, @calculator.sales_tax_calls
-    assert_equal 2.5625, @calculator.sales_tax(25)
-    assert_equal 2, @calculator.sales_tax_calls
-  end
-
-  def test_object_memoized_module_methods
-    company = Company.new
-    company.extend(Rates)
-
-    assert_equal 1.025, company.sales_tax(10)
-    assert_equal 1, company.sales_tax_calls
-    assert_equal 1.025, company.sales_tax(10)
-    assert_equal 1, company.sales_tax_calls
-    assert_equal 2.5625, company.sales_tax(25)
-    assert_equal 2, company.sales_tax_calls
-  end
-
-  def test_double_memoization
-    assert_raise(RuntimeError) { Person.memoize :name }
-    person = Person.new
-    ActiveSupport::Deprecation.silence do
-      person.extend ActiveSupport::Memoizable
-    end
-    assert_raise(RuntimeError) { person.memoize :name }
-
-    company = Company.new
-    ActiveSupport::Deprecation.silence do
-      company.extend ActiveSupport::Memoizable
-    end
-    company.memoize :name
-    assert_raise(RuntimeError) { company.memoize :name }
-  end
-
-  def test_protected_method_memoization
-    person = Person.new
-
-    assert_raise(NoMethodError) { person.memoize_protected_test }
-    assert_equal "protected", person.send(:memoize_protected_test)
-  end
-
-  def test_private_method_memoization
-    person = Person.new
-
-    assert_raise(NoMethodError) { person.is_developer? }
-    assert_equal "Yes", person.send(:is_developer?)
-    assert_equal 1, person.is_developer_calls
-    assert_equal "Yes", person.send(:is_developer?)
-    assert_equal 1, person.is_developer_calls
-  end
-
-end
diff --git a/activesupport/test/message_encryptor_test.rb b/activesupport/test/message_encryptor_test.rb
index 3e6a5c6602..db97c1b80b 100644
--- a/activesupport/test/message_encryptor_test.rb
+++ b/activesupport/test/message_encryptor_test.rb
@@ -61,12 +61,6 @@ class MessageEncryptorTest < ActiveSupport::TestCase
     assert_equal encryptor.decrypt_and_verify(message), { "foo" => 123, "bar" => "2010-01-01T00:00:00Z" }
   end
 
-  def test_digest_algorithm_as_second_parameter_deprecation
-    assert_deprecated(/options hash/) do
-      ActiveSupport::MessageEncryptor.new(SecureRandom.hex(64), 'aes-256-cbc')
-    end
-  end
-
   private
 
   def assert_not_decrypted(value)
diff --git a/activesupport/test/message_verifier_test.rb b/activesupport/test/message_verifier_test.rb
index 35747abe5b..5adff41653 100644
--- a/activesupport/test/message_verifier_test.rb
+++ b/activesupport/test/message_verifier_test.rb
@@ -50,12 +50,6 @@ class MessageVerifierTest < ActiveSupport::TestCase
     assert_equal verifier.verify(message), { "foo" => 123, "bar" => "2010-01-01T00:00:00Z" }
   end
   
-  def test_digest_algorithm_as_second_parameter_deprecation
-    assert_deprecated(/options hash/) do
-      ActiveSupport::MessageVerifier.new("secret", "SHA1")
-    end
-  end
-
   def assert_not_verified(message)
     assert_raise(ActiveSupport::MessageVerifier::InvalidSignature) do
       @verifier.verify(message)