6 files changed, 135 insertions, 47 deletions
diff --git a/activesupport/test/core_ext/date_time_ext_test.rb b/activesupport/test/core_ext/date_time_ext_test.rb
index 2c08b46791..74319ecd09 100644
--- a/activesupport/test/core_ext/date_time_ext_test.rb
+++ b/activesupport/test/core_ext/date_time_ext_test.rb
@@ -338,6 +338,7 @@ class DateTimeExtCalculationsTest < ActiveSupport::TestCase
   def test_to_f
     assert_equal 946684800.0, DateTime.civil(2000).to_f
     assert_equal 946684800.0, DateTime.civil(1999,12,31,19,0,0,Rational(-5,24)).to_f
+    assert_equal 946684800.5, DateTime.civil(1999,12,31,19,0,0.5,Rational(-5,24)).to_f
   end
 
   def test_to_i
diff --git a/activesupport/test/core_ext/digest/uuid_test.rb b/activesupport/test/core_ext/digest/uuid_test.rb
new file mode 100644
index 0000000000..08e0a1d6e1
--- /dev/null
+++ b/activesupport/test/core_ext/digest/uuid_test.rb
@@ -0,0 +1,24 @@
+require 'abstract_unit'
+require 'active_support/core_ext/digest/uuid'
+
+class DigestUUIDExt < ActiveSupport::TestCase
+  def test_v3_uuids
+    assert_equal "3d813cbb-47fb-32ba-91df-831e1593ac29", Digest::UUID.uuid_v3(Digest::UUID::DNS_NAMESPACE, "www.widgets.com")
+    assert_equal "86df55fb-428e-3843-8583-ba3c05f290bc", Digest::UUID.uuid_v3(Digest::UUID::URL_NAMESPACE, "http://www.widgets.com")
+    assert_equal "8c29ab0e-a2dc-3482-b5eb-20cb2e2387a1", Digest::UUID.uuid_v3(Digest::UUID::OID_NAMESPACE, "1.2.3")
+    assert_equal "ee49149d-53a4-304a-890b-468229f6afc3", Digest::UUID.uuid_v3(Digest::UUID::X500_NAMESPACE, "cn=John Doe, ou=People, o=Acme, Inc., c=US")
+  end
+
+  def test_v5_uuids
+    assert_equal "21f7f8de-8051-5b89-8680-0195ef798b6a", Digest::UUID.uuid_v5(Digest::UUID::DNS_NAMESPACE, "www.widgets.com")
+    assert_equal "4e570fd8-186d-5a74-90f0-4d28e34673a1", Digest::UUID.uuid_v5(Digest::UUID::URL_NAMESPACE, "http://www.widgets.com")
+    assert_equal "42d5e23b-3a02-5135-85c6-52d1102f1f00", Digest::UUID.uuid_v5(Digest::UUID::OID_NAMESPACE, "1.2.3")
+    assert_equal "fd5b2ddf-bcfe-58b6-90d6-db50f74db527", Digest::UUID.uuid_v5(Digest::UUID::X500_NAMESPACE, "cn=John Doe, ou=People, o=Acme, Inc., c=US")
+  end
+
+  def test_invalid_hash_class
+    assert_raise ArgumentError do
+      Digest::UUID.uuid_from_hash(Digest::SHA2, Digest::UUID::OID_NAMESPACE, '1.2.3')
+    end
+  end
+end
diff --git a/activesupport/test/core_ext/hash/transform_keys_test.rb b/activesupport/test/core_ext/hash/transform_keys_test.rb
new file mode 100644
index 0000000000..a7e12117f3
--- /dev/null
+++ b/activesupport/test/core_ext/hash/transform_keys_test.rb
@@ -0,0 +1,32 @@
+require 'abstract_unit'
+require 'active_support/core_ext/hash/keys'
+
+class TransformKeysTest < ActiveSupport::TestCase
+  test "transform_keys returns a new hash with the keys computed from the block" do
+    original = { a: 'a', b: 'b' }
+    mapped = original.transform_keys { |k| "#{k}!".to_sym }
+
+    assert_equal({ a: 'a', b: 'b' }, original)
+    assert_equal({ a!: 'a', b!: 'b' }, mapped)
+  end
+
+  test "transform_keys! modifies the keys of the original" do
+    original = { a: 'a', b: 'b' }
+    mapped = original.transform_keys! { |k| "#{k}!".to_sym }
+
+    assert_equal({ a!: 'a', b!: 'b' }, original)
+    assert_same original, mapped
+  end
+
+  test "transform_keys returns an Enumerator if no block is given" do
+    original = { a: 'a', b: 'b' }
+    enumerator = original.transform_keys
+    assert_equal Enumerator, enumerator.class
+  end
+
+  test "transform_keys is chainable with Enumerable methods" do
+    original = { a: 'a', b: 'b' }
+    mapped = original.transform_keys.with_index { |k, i| [k, i].join.to_sym }
+    assert_equal({ a0: 'a', b1: 'b' }, mapped)
+  end
+end
diff --git a/activesupport/test/core_ext/hash/transform_values_test.rb b/activesupport/test/core_ext/hash/transform_values_test.rb
new file mode 100644
index 0000000000..45ed11fef7
--- /dev/null
+++ b/activesupport/test/core_ext/hash/transform_values_test.rb
@@ -0,0 +1,61 @@
+require 'abstract_unit'
+require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/hash/transform_values'
+
+class TransformValuesTest < ActiveSupport::TestCase
+  test "transform_values returns a new hash with the values computed from the block" do
+    original = { a: 'a', b: 'b' }
+    mapped = original.transform_values { |v| v + '!' }
+
+    assert_equal({ a: 'a', b: 'b' }, original)
+    assert_equal({ a: 'a!', b: 'b!' }, mapped)
+  end
+
+  test "transform_values! modifies the values of the original" do
+    original = { a: 'a', b: 'b' }
+    mapped = original.transform_values! { |v| v + '!' }
+
+    assert_equal({ a: 'a!', b: 'b!' }, original)
+    assert_same original, mapped
+  end
+
+  test "indifferent access is still indifferent after mapping values" do
+    original = { a: 'a', b: 'b' }.with_indifferent_access
+    mapped = original.transform_values { |v| v + '!' }
+
+    assert_equal 'a!', mapped[:a]
+    assert_equal 'a!', mapped['a']
+  end
+
+  # This is to be consistent with the behavior of Ruby's built in methods
+  # (e.g. #select, #reject) as of 2.2
+  test "default values do not persist during mapping" do
+    original = Hash.new('foo')
+    original[:a] = 'a'
+    mapped = original.transform_values { |v| v + '!' }
+
+    assert_equal 'a!', mapped[:a]
+    assert_nil mapped[:b]
+  end
+
+  test "default procs do not persist after mapping" do
+    original = Hash.new { 'foo' }
+    original[:a] = 'a'
+    mapped = original.transform_values { |v| v + '!' }
+
+    assert_equal 'a!', mapped[:a]
+    assert_nil mapped[:b]
+  end
+
+  test "transform_values returns an Enumerator if no block is given" do
+    original = { a: 'a', b: 'b' }
+    enumerator = original.transform_values
+    assert_equal Enumerator, enumerator.class
+  end
+
+  test "transform_values is chainable with Enumerable methods" do
+    original = { a: 'a', b: 'b' }
+    mapped = original.transform_values.with_index { |v, i| [v, i].join }
+    assert_equal({ a: 'a0', b: 'b1' }, mapped)
+  end
+end
diff --git a/activesupport/test/core_ext/kernel_test.rb b/activesupport/test/core_ext/kernel_test.rb
index d8bf81d02b..a87af0007c 100644
--- a/activesupport/test/core_ext/kernel_test.rb
+++ b/activesupport/test/core_ext/kernel_test.rb
@@ -30,14 +30,6 @@ class KernelTest < ActiveSupport::TestCase
   end
 
 
-  def test_silence_stderr
-    old_stderr_position = STDERR.tell
-    silence_stderr { STDERR.puts 'hello world' }
-    assert_equal old_stderr_position, STDERR.tell
-  rescue Errno::ESPIPE
-    # Skip if we can't STDERR.tell
-  end
-
   def test_silence_stream
     old_stream_position = STDOUT.tell
     silence_stream(STDOUT) { STDOUT.puts 'hello world' }
@@ -56,9 +48,11 @@ class KernelTest < ActiveSupport::TestCase
 
   def test_quietly
     old_stdout_position, old_stderr_position = STDOUT.tell, STDERR.tell
-    quietly do
-      puts 'see me, feel me'
-      STDERR.puts 'touch me, heal me'
+    assert_deprecated do
+      quietly do
+        puts 'see me, feel me'
+        STDERR.puts 'touch me, heal me'
+      end
     end
     assert_equal old_stdout_position, STDOUT.tell
     assert_equal old_stderr_position, STDERR.tell
@@ -66,10 +60,6 @@ class KernelTest < ActiveSupport::TestCase
     # Skip if we can't STDERR.tell
   end
 
-  def test_silence_stderr_with_return_value
-    assert_equal 1, silence_stderr { 1 }
-  end
-
   def test_class_eval
     o = Object.new
     class << o; @x = 1; end
@@ -77,10 +67,18 @@ class KernelTest < ActiveSupport::TestCase
   end
 
   def test_capture
-    assert_equal 'STDERR', capture(:stderr) { $stderr.print 'STDERR' }
-    assert_equal 'STDOUT', capture(:stdout) { print 'STDOUT' }
-    assert_equal "STDERR\n", capture(:stderr) { system('echo STDERR 1>&2') }
-    assert_equal "STDOUT\n", capture(:stdout) { system('echo STDOUT') }
+    assert_deprecated do
+      assert_equal 'STDERR', capture(:stderr) { $stderr.print 'STDERR' }
+    end
+    assert_deprecated do
+      assert_equal 'STDOUT', capture(:stdout) { print 'STDOUT' }
+    end
+    assert_deprecated do
+      assert_equal "STDERR\n", capture(:stderr) { system('echo STDERR 1>&2') }
+    end
+    assert_deprecated do
+      assert_equal "STDOUT\n", capture(:stdout) { system('echo STDOUT') }
+    end
   end
 end
 
diff --git a/activesupport/test/core_ext/securerandom_test.rb b/activesupport/test/core_ext/securerandom_test.rb
deleted file mode 100644
index 71980f6910..0000000000
--- a/activesupport/test/core_ext/securerandom_test.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'abstract_unit'
-require 'active_support/core_ext/securerandom'
-
-class SecureRandomExt < ActiveSupport::TestCase
-  def test_v3_uuids
-    assert_equal "3d813cbb-47fb-32ba-91df-831e1593ac29", SecureRandom.uuid_v3(SecureRandom::UUID_DNS_NAMESPACE, "www.widgets.com")
-    assert_equal "86df55fb-428e-3843-8583-ba3c05f290bc", SecureRandom.uuid_v3(SecureRandom::UUID_URL_NAMESPACE, "http://www.widgets.com")
-    assert_equal "8c29ab0e-a2dc-3482-b5eb-20cb2e2387a1", SecureRandom.uuid_v3(SecureRandom::UUID_OID_NAMESPACE, "1.2.3")
-    assert_equal "ee49149d-53a4-304a-890b-468229f6afc3", SecureRandom.uuid_v3(SecureRandom::UUID_X500_NAMESPACE, "cn=John Doe, ou=People, o=Acme, Inc., c=US")
-  end
-
-  def test_v5_uuids
-    assert_equal "21f7f8de-8051-5b89-8680-0195ef798b6a", SecureRandom.uuid_v5(SecureRandom::UUID_DNS_NAMESPACE, "www.widgets.com")
-    assert_equal "4e570fd8-186d-5a74-90f0-4d28e34673a1", SecureRandom.uuid_v5(SecureRandom::UUID_URL_NAMESPACE, "http://www.widgets.com")
-    assert_equal "42d5e23b-3a02-5135-85c6-52d1102f1f00", SecureRandom.uuid_v5(SecureRandom::UUID_OID_NAMESPACE, "1.2.3")
-    assert_equal "fd5b2ddf-bcfe-58b6-90d6-db50f74db527", SecureRandom.uuid_v5(SecureRandom::UUID_X500_NAMESPACE, "cn=John Doe, ou=People, o=Acme, Inc., c=US")
-  end
-
-  def test_uuid_v4_alias
-    assert_equal SecureRandom.method(:uuid_v4), SecureRandom.method(:uuid)
-  end
-
-  def test_invalid_hash_class
-    assert_raise ArgumentError do
-      SecureRandom.uuid_from_hash(Digest::SHA2, SecureRandom::UUID_OID_NAMESPACE, '1.2.3')
-    end
-  end
-end