4 files changed, 46 insertions, 55 deletions
diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb
index 64fcb4af09..70c393dd46 100644
--- a/activesupport/test/core_ext/time_with_zone_test.rb
+++ b/activesupport/test/core_ext/time_with_zone_test.rb
@@ -70,7 +70,7 @@ class TimeWithZoneTest < Test::Unit::TestCase
   
   def test_to_json_with_use_standard_json_time_format_config_set_to_true
     old, ActiveSupport.use_standard_json_time_format = ActiveSupport.use_standard_json_time_format, true
-    assert_equal "\"2000-01-01T00:00:00Z\"", @twz.to_json
+    assert_equal "\"1999-12-31T19:00:00-05:00\"", @twz.to_json
   ensure
     ActiveSupport.use_standard_json_time_format = old
   end
diff --git a/activesupport/test/deprecation_test.rb b/activesupport/test/deprecation_test.rb
index 11357e250f..ebfa405947 100644
--- a/activesupport/test/deprecation_test.rb
+++ b/activesupport/test/deprecation_test.rb
@@ -149,13 +149,3 @@ class DeprecationTest < Test::Unit::TestCase
     assert_nil @last_message
   end
 end
-
-class DeprecatedIvarTest < Test::Unit::TestCase
-
-  def test_deprecated_ivar
-    @action = ActiveSupport::Deprecation::DeprecatedInstanceVariable.new("fubar", :foobar)
-
-    assert_deprecated(/Instance variable @foobar is deprecated! Call instance method foobar instead/) { assert_equal "fubar", @action }
-  end
-
-end
diff --git a/activesupport/test/ordered_hash_test.rb b/activesupport/test/ordered_hash_test.rb
new file mode 100644
index 0000000000..14be48724e
--- /dev/null
+++ b/activesupport/test/ordered_hash_test.rb
@@ -0,0 +1,45 @@
+require 'abstract_unit'
+
+class OrderedHashTest < Test::Unit::TestCase
+  def setup
+    @keys =   %w( blue   green  red    pink   orange )
+    @values = %w( 000099 009900 aa0000 cc0066 cc6633 )
+    @ordered_hash = ActiveSupport::OrderedHash.new
+
+    @keys.each_with_index do |key, index|
+      @ordered_hash[key] = @values[index]
+    end
+  end
+
+  def test_order
+    assert_equal @keys,   @ordered_hash.keys
+    assert_equal @values, @ordered_hash.values
+  end
+
+  def test_access
+    assert @keys.zip(@values).all? { |k, v| @ordered_hash[k] == v }
+  end
+
+  def test_assignment
+    key, value = 'purple', '5422a8'
+
+    @ordered_hash[key] = value
+    assert_equal @keys.length + 1, @ordered_hash.length
+    assert_equal key, @ordered_hash.keys.last
+    assert_equal value, @ordered_hash.values.last
+    assert_equal value, @ordered_hash[key]
+  end
+
+  def test_delete
+    key, value = 'white', 'ffffff'
+    bad_key = 'black'
+
+    @ordered_hash[key] = value
+    assert_equal @keys.length + 1, @ordered_hash.length
+
+    assert_equal value, @ordered_hash.delete(key)
+    assert_equal @keys.length, @ordered_hash.length
+
+    assert_nil @ordered_hash.delete(bad_key)
+  end
+end
diff --git a/activesupport/test/ordered_options_test.rb b/activesupport/test/ordered_options_test.rb
index 3d537a0ae4..fb7a58d0b0 100644
--- a/activesupport/test/ordered_options_test.rb
+++ b/activesupport/test/ordered_options_test.rb
@@ -1,49 +1,5 @@
 require 'abstract_unit'
 
-class OrderedHashTest < Test::Unit::TestCase
-  def setup
-    @keys =   %w( blue   green  red    pink   orange )
-    @values = %w( 000099 009900 aa0000 cc0066 cc6633 )
-    @ordered_hash = ActiveSupport::OrderedHash.new
-
-    @keys.each_with_index do |key, index|
-      @ordered_hash[key] = @values[index]
-    end
-  end
-
-  def test_order
-    assert_equal @keys,   @ordered_hash.keys
-    assert_equal @values, @ordered_hash.values
-  end
-
-  def test_access
-    assert @keys.zip(@values).all? { |k, v| @ordered_hash[k] == v }
-  end
-
-  def test_assignment
-    key, value = 'purple', '5422a8'
-
-    @ordered_hash[key] = value
-    assert_equal @keys.length + 1, @ordered_hash.length
-    assert_equal key, @ordered_hash.keys.last
-    assert_equal value, @ordered_hash.values.last
-    assert_equal value, @ordered_hash[key]
-  end
-  
-  def test_delete
-    key, value = 'white', 'ffffff'
-    bad_key = 'black'
-    
-    @ordered_hash[key] = value
-    assert_equal @keys.length + 1, @ordered_hash.length
-    
-    assert_equal value, @ordered_hash.delete(key)
-    assert_equal @keys.length, @ordered_hash.length
-    
-    assert_nil @ordered_hash.delete(bad_key)
-  end
-end
-
 class OrderedOptionsTest < Test::Unit::TestCase
   def test_usage
     a = OrderedOptions.new