aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-01-11 21:37:02 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-01-11 21:37:02 +0000
commit876a1a1fa304ae99f22ee1a8d4962fc1173d4372 (patch)
treed2796c1839def18e65dd4b8c17ef8f15d2c3cf9c /activesupport/test
parentfe8fb574c06156ca7eef7367c85bd12991948806 (diff)
downloadrails-876a1a1fa304ae99f22ee1a8d4962fc1173d4372.tar.gz
rails-876a1a1fa304ae99f22ee1a8d4962fc1173d4372.tar.bz2
rails-876a1a1fa304ae99f22ee1a8d4962fc1173d4372.zip
Added Byte operations to Numeric, so 5.5.megabytes + 200.kilobytes #461 [Marcel Molina]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@393 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/test')
-rw-r--r--activesupport/test/core_ext/hash_ext_test.rb35
-rw-r--r--activesupport/test/misc_test.rb32
2 files changed, 33 insertions, 34 deletions
diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb
index f481cf0242..52a28c1553 100644
--- a/activesupport/test/core_ext/hash_ext_test.rb
+++ b/activesupport/test/core_ext/hash_ext_test.rb
@@ -1,7 +1,38 @@
require 'test/unit'
-require File.dirname(__FILE__) + '/../../lib/core_ext/hash_ext'
+require File.dirname(__FILE__) + '/../../lib/core_ext/hash'
class HashExtTest < Test::Unit::TestCase
+
+ def setup
+ @strings = { 'a' => 1, 'b' => 2 }
+ @symbols = { :a => 1, :b => 2 }
+ @mixed = { :a => 1, 'b' => 2 }
+ end
+
+ def test_methods
+ h = {}
+ assert_respond_to h, :symbolize_keys
+ assert_respond_to h, :symbolize_keys!
+ assert_respond_to h, :to_options
+ assert_respond_to h, :to_options!
+ end
+
+ def test_symbolize_keys
+ assert_equal @symbols, @symbols.symbolize_keys
+ assert_equal @symbols, @strings.symbolize_keys
+ assert_equal @symbols, @mixed.symbolize_keys
+
+ assert_raises(NoMethodError) { { [] => 1 }.symbolize_keys }
+ end
+
+ def test_symbolize_keys!
+ assert_equal @symbols, @symbols.dup.symbolize_keys!
+ assert_equal @symbols, @strings.dup.symbolize_keys!
+ assert_equal @symbols, @mixed.dup.symbolize_keys!
+
+ assert_raises(NoMethodError) { { [] => 1 }.symbolize_keys! }
+ end
+
def test_assert_valid_keys
assert_nothing_raised do
{ :failure => "stuff", :funny => "business" }.assert_valid_keys([ :failure, :funny ])
@@ -11,4 +42,4 @@ class HashExtTest < Test::Unit::TestCase
{ :failore => "stuff", :funny => "business" }.assert_valid_keys([ :failure, :funny ])
end
end
-end \ No newline at end of file
+end
diff --git a/activesupport/test/misc_test.rb b/activesupport/test/misc_test.rb
index 2a6c40709a..5a2d1d33e8 100644
--- a/activesupport/test/misc_test.rb
+++ b/activesupport/test/misc_test.rb
@@ -17,35 +17,3 @@ class MiscTest < Test::Unit::TestCase
end
end
end
-
-class HashOptionsTest < Test::Unit::TestCase
- def setup
- @strings = { 'a' => 1, 'b' => 2 }
- @symbols = { :a => 1, :b => 2 }
- @mixed = { :a => 1, 'b' => 2 }
- end
-
- def test_methods
- h = {}
- assert_respond_to h, :symbolize_keys
- assert_respond_to h, :symbolize_keys!
- assert_respond_to h, :to_options
- assert_respond_to h, :to_options!
- end
-
- def test_symbolize_keys
- assert_equal @symbols, @symbols.symbolize_keys
- assert_equal @symbols, @strings.symbolize_keys
- assert_equal @symbols, @mixed.symbolize_keys
-
- assert_raises(NoMethodError) { { [] => 1 }.symbolize_keys }
- end
-
- def test_symbolize_keys!
- assert_equal @symbols, @symbols.dup.symbolize_keys!
- assert_equal @symbols, @strings.dup.symbolize_keys!
- assert_equal @symbols, @mixed.dup.symbolize_keys!
-
- assert_raises(NoMethodError) { { [] => 1 }.symbolize_keys! }
- end
-end