6 files changed, 0 insertions, 133 deletions
diff --git a/activesupport/test/core_ext/array_ext_test.rb b/activesupport/test/core_ext/array_ext_test.rb
index 384064d81f..6cd0eb39b7 100644
--- a/activesupport/test/core_ext/array_ext_test.rb
+++ b/activesupport/test/core_ext/array_ext_test.rb
@@ -359,36 +359,6 @@ class ArrayExtractOptionsTests < ActiveSupport::TestCase
   end
 end
 
-class ArrayUniqByTests < ActiveSupport::TestCase
-  def test_uniq_by
-    ActiveSupport::Deprecation.silence do
-      assert_equal [1,2], [1,2,3,4].uniq_by { |i| i.odd? }
-      assert_equal [1,2], [1,2,3,4].uniq_by(&:even?)
-      assert_equal((-5..0).to_a, (-5..5).to_a.uniq_by{ |i| i**2 })
-    end
-  end
-
-  def test_uniq_by!
-    a = [1,2,3,4]
-    ActiveSupport::Deprecation.silence do
-      a.uniq_by! { |i| i.odd? }
-    end
-    assert_equal [1,2], a
-
-    a = [1,2,3,4]
-    ActiveSupport::Deprecation.silence do
-      a.uniq_by! { |i| i.even? }
-    end
-    assert_equal [1,2], a
-
-    a = (-5..5).to_a
-    ActiveSupport::Deprecation.silence do
-      a.uniq_by! { |i| i**2 }
-    end
-    assert_equal((-5..0).to_a, a)
-  end
-end
-
 class ArrayWrapperTests < ActiveSupport::TestCase
   class FakeCollection
     def to_ary
diff --git a/activesupport/test/core_ext/date_ext_test.rb b/activesupport/test/core_ext/date_ext_test.rb
index aa5e4461fd..c32056f672 100644
--- a/activesupport/test/core_ext/date_ext_test.rb
+++ b/activesupport/test/core_ext/date_ext_test.rb
@@ -363,10 +363,3 @@ class DateExtBehaviorTest < ActiveSupport::TestCase
   end
 end
 
-class DateExtConversionsTest < ActiveSupport::TestCase
-  def test_to_time_in_current_zone_is_deprecated
-    assert_deprecated(/to_time_in_current_zone/) do
-      Date.new(2012,6,7).to_time_in_current_zone
-    end
-  end
-end
diff --git a/activesupport/test/core_ext/proc_test.rb b/activesupport/test/core_ext/proc_test.rb
deleted file mode 100644
index c4d5592196..0000000000
--- a/activesupport/test/core_ext/proc_test.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'abstract_unit'
-require 'active_support/core_ext/proc'
-
-class ProcTests < ActiveSupport::TestCase
-  def test_bind_returns_method_with_changed_self
-    assert_deprecated do
-      block = Proc.new { self }
-      assert_equal self, block.call
-      bound_block = block.bind("hello")
-      assert_not_equal block, bound_block
-      assert_equal "hello", bound_block.call
-    end
-  end
-end
diff --git a/activesupport/test/deprecation/basic_object_test.rb b/activesupport/test/deprecation/basic_object_test.rb
deleted file mode 100644
index 4b5bed9eb1..0000000000
--- a/activesupport/test/deprecation/basic_object_test.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'abstract_unit'
-require 'active_support/deprecation'
-require 'active_support/basic_object'
-
-
-class BasicObjectTest < ActiveSupport::TestCase
-  test 'BasicObject warns about deprecation when inherited from' do
-    warn = 'ActiveSupport::BasicObject is deprecated! Use ActiveSupport::ProxyObject instead.'
-    ActiveSupport::Deprecation.expects(:warn).with(warn).once
-    Class.new(ActiveSupport::BasicObject)
-  end
-end
-\ No newline at end of file
diff --git a/activesupport/test/deprecation/buffered_logger_test.rb b/activesupport/test/deprecation/buffered_logger_test.rb
deleted file mode 100644
index bf11a4732c..0000000000
--- a/activesupport/test/deprecation/buffered_logger_test.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'abstract_unit'
-require 'active_support/buffered_logger'
-
-class BufferedLoggerTest < ActiveSupport::TestCase
-
-  def test_can_be_subclassed
-    warn = 'ActiveSupport::BufferedLogger is deprecated! Use ActiveSupport::Logger instead.'
-
-    ActiveSupport::Deprecation.expects(:warn).with(warn).once
-
-    Class.new(ActiveSupport::BufferedLogger)
-  end
-
-  def test_issues_deprecation_when_instantiated
-    warn = 'ActiveSupport::BufferedLogger is deprecated! Use ActiveSupport::Logger instead.'
-
-    ActiveSupport::Deprecation.expects(:warn).with(warn).once
-
-    ActiveSupport::BufferedLogger.new(STDOUT)
-  end
-
-end
diff --git a/activesupport/test/test_test.rb b/activesupport/test/test_test.rb
index 68f9ec6c00..0c8cc1f883 100644
--- a/activesupport/test/test_test.rb
+++ b/activesupport/test/test_test.rb
@@ -87,54 +87,6 @@ class AssertDifferenceTest < ActiveSupport::TestCase
   end
 end
 
-class AssertBlankTest < ActiveSupport::TestCase
-  BLANK = [ EmptyTrue.new, nil, false, '', '   ', "  \n\t  \r ", [], {} ]
-  NOT_BLANK = [ EmptyFalse.new, Object.new, true, 0, 1, 'x', [nil], { nil => 0 } ]
-
-  def test_assert_blank_true
-    BLANK.each { |value|
-      assert_deprecated { assert_blank value }
-    }
-  end
-
-  def test_assert_blank_false
-    NOT_BLANK.each { |v|
-      assert_deprecated {
-        begin
-          assert_blank v
-          fail 'should not get to here'
-        rescue Exception => e
-          assert_match(/is not blank/, e.message)
-        end
-      }
-    }
-  end
-end
-
-class AssertPresentTest < ActiveSupport::TestCase
-  BLANK = [ EmptyTrue.new, nil, false, '', '   ', "  \n\t  \r ", [], {} ]
-  NOT_BLANK = [ EmptyFalse.new, Object.new, true, 0, 1, 'x', [nil], { nil => 0 } ]
-
-  def test_assert_present_true
-    NOT_BLANK.each { |v|
-      assert_deprecated { assert_present v }
-    }
-  end
-
-  def test_assert_present_false
-    BLANK.each { |v|
-      assert_deprecated {
-        begin
-          assert_present v
-          fail 'should not get to here'
-        rescue Exception => e
-          assert_match(/is blank/, e.message)
-        end
-      }
-    }
-  end
-end
-
 class AlsoDoingNothingTest < ActiveSupport::TestCase
 end