Make TimeWithZone work with tzinfo 0.2.x: use TZInfo::Timezone#zone_identifier alias for #abbreviation, silence warnings on tests. Raise LoadError when TZInfo version is < 0.2 by sniffing for TZInfo::TimeOrDateTime constant. Move all tzinfo-dependent TimeZone tests into uses_tzinfo block

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9071 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

6 files changed, 243 insertions, 174 deletions

diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index a569a57f62..651da81eb1 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Make TimeWithZone work with tzinfo 0.2.x: use TZInfo::Timezone#zone_identifier alias for #abbreviation, silence warnings on tests. Raise LoadError when TZInfo version is < 0.2 by sniffing for TZInfo::TimeOrDateTime constant. Move all tzinfo-dependent TimeZone tests into uses_tzinfo block [Geoff Buesing]
+
 * Time, DateTime and TimeWithZone #in_time_zone defaults to Time.zone. Removing now unneeded #in_current_time_zone [Geoff Buesing]
 
 * TZInfo caches Timezone instances in its own internal hash cache, so TimeZone::MAPPING doesn't need to cache them as well [Geoff Buesing]
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb
index 82af1653ef..5933fc9667 100644
--- a/activesupport/lib/active_support/time_with_zone.rb
+++ b/activesupport/lib/active_support/time_with_zone.rb
@@ -63,7 +63,7 @@ module ActiveSupport
   
     # Time uses #zone to display the time zone abbreviation, so we're duck-typing it
     def zone
-      period.abbreviation.to_s
+      period.zone_identifier.to_s
     end
   
     def inspect
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index 085fab9731..91f0394472 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -177,6 +177,7 @@ class TimeZone
 
   begin # the following methods depend on the tzinfo gem
     require_library_or_gem "tzinfo" unless Object.const_defined?(:TZInfo)
+    raise LoadError unless TZInfo.const_defined?(:TimeOrDateTime)
     
     # Method for creating new ActiveSupport::TimeWithZone instance in time zone of +self+ from given values. Example:
     #
@@ -253,7 +254,7 @@ class TimeZone
   rescue LoadError # Tzinfo gem is not available
     # re-raise LoadError only when a tzinfo-dependent method is called:
     %w(local at parse now today utc_to_local local_to_utc period_for_utc period_for_local tzinfo).each do |method|
-      define_method(method) {|*args| raise LoadError, "TZInfo gem is required for TimeZone##{method}. `gem install tzinfo` and try again."}
+      define_method(method) {|*args| raise LoadError, "TZInfo version >= 0.2 is required for TimeZone##{method}(). `gem install tzinfo` and try again."}
     end
   end
 
diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb
index c2fd943ca0..fc20ac0285 100644
--- a/activesupport/test/abstract_unit.rb
+++ b/activesupport/test/abstract_unit.rb
@@ -23,7 +23,7 @@ end
 # Wrap tests that use TZInfo and skip if unavailable.
 unless defined? uses_tzinfo
   def uses_tzinfo(test_name, &block)
-    uses_gem('tzinfo', test_name, &block)
+    uses_gem('tzinfo', test_name, '>= 0.2.0', &block)
   end
 end
 
diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb
index 8a868b9c62..3bc1e3920a 100644
--- a/activesupport/test/core_ext/time_with_zone_test.rb
+++ b/activesupport/test/core_ext/time_with_zone_test.rb
@@ -15,7 +15,9 @@ uses_tzinfo 'TimeWithZoneTest' do
     end
   
     def test_time
-      assert_equal Time.utc(1999, 12, 31, 19), @twz.time
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_equal Time.utc(1999, 12, 31, 19), @twz.time
+      end
     end
   
     def test_time_zone
@@ -42,8 +44,10 @@ uses_tzinfo 'TimeWithZoneTest' do
     end
       
     def test_formatted_offset
-      assert_equal '-05:00', @twz.formatted_offset
-      assert_equal '-04:00', ActiveSupport::TimeWithZone.new(Time.utc(2000, 6), @time_zone).formatted_offset #dst
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_equal '-05:00', @twz.formatted_offset
+        assert_equal '-04:00', ActiveSupport::TimeWithZone.new(Time.utc(2000, 6), @time_zone).formatted_offset #dst
+      end
     end
       
     def test_dst?
@@ -54,44 +58,64 @@ uses_tzinfo 'TimeWithZoneTest' do
     end
       
     def test_zone
-      assert_equal 'EST', @twz.zone
-      assert_equal 'EDT', ActiveSupport::TimeWithZone.new(Time.utc(2000, 6), @time_zone).zone #dst
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_equal 'EST', @twz.zone
+        assert_equal 'EDT', ActiveSupport::TimeWithZone.new(Time.utc(2000, 6), @time_zone).zone #dst
+      end
     end
       
     def test_to_json
-      assert_equal "\"1999/12/31 19:00:00 -0500\"", @twz.to_json
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_equal "\"1999/12/31 19:00:00 -0500\"", @twz.to_json
+      end
     end
       
     def test_strftime
-      assert_equal '1999-12-31 19:00:00 EST -0500', @twz.strftime('%Y-%m-%d %H:%M:%S %Z %z')
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_equal '1999-12-31 19:00:00 EST -0500', @twz.strftime('%Y-%m-%d %H:%M:%S %Z %z')
+      end
     end
       
     def test_inspect
-      assert_equal 'Fri, 31 Dec 1999 19:00:00 EST -05:00', @twz.inspect
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_equal 'Fri, 31 Dec 1999 19:00:00 EST -05:00', @twz.inspect
+      end
     end
       
     def test_to_s
-      assert_equal '1999-12-31 19:00:00 -0500', @twz.to_s
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_equal '1999-12-31 19:00:00 -0500', @twz.to_s
+      end
     end
       
     def test_to_s_db
-      assert_equal '2000-01-01 00:00:00', @twz.to_s(:db)
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_equal '2000-01-01 00:00:00', @twz.to_s(:db)
+      end
     end
       
     def test_xmlschema
-      assert_equal "1999-12-31T19:00:00-05:00", @twz.xmlschema
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_equal "1999-12-31T19:00:00-05:00", @twz.xmlschema
+      end
     end
     
     def test_to_yaml
-      assert_equal "--- 1999-12-31 19:00:00 -05:00\n", @twz.to_yaml
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_equal "--- 1999-12-31 19:00:00 -05:00\n", @twz.to_yaml
+      end
     end
     
     def test_httpdate
-      assert_equal 'Sat, 01 Jan 2000 00:00:00 GMT', @twz.httpdate
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_equal 'Sat, 01 Jan 2000 00:00:00 GMT', @twz.httpdate
+      end
     end
     
     def test_rfc2822
-      assert_equal "Fri, 31 Dec 1999 19:00:00 -0500", @twz.rfc2822
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_equal "Fri, 31 Dec 1999 19:00:00 -0500", @twz.rfc2822
+      end
     end
     
     def test_compare_with_time
@@ -123,31 +147,43 @@ uses_tzinfo 'TimeWithZoneTest' do
     end
       
     def test_plus_with_integer
-      assert_equal Time.utc(1999, 12, 31, 19, 0 ,5), (@twz + 5).time
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_equal Time.utc(1999, 12, 31, 19, 0 ,5), (@twz + 5).time
+      end
     end
       
     def test_plus_with_integer_when_self_wraps_datetime
-      datetime = DateTime.civil(2000, 1, 1, 0)
-      twz = ActiveSupport::TimeWithZone.new(datetime, @time_zone)
-      assert_equal DateTime.civil(1999, 12, 31, 19, 0 ,5), (twz + 5).time
+      silence_warnings do # silence warnings raised by tzinfo gem
+        datetime = DateTime.civil(2000, 1, 1, 0)
+        twz = ActiveSupport::TimeWithZone.new(datetime, @time_zone)
+        assert_equal DateTime.civil(1999, 12, 31, 19, 0 ,5), (twz + 5).time
+      end
     end
       
     def test_plus_with_duration
-      assert_equal Time.utc(2000, 1, 5, 19, 0 ,0), (@twz + 5.days).time
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_equal Time.utc(2000, 1, 5, 19, 0 ,0), (@twz + 5.days).time
+      end
     end
       
     def test_minus_with_integer
-      assert_equal Time.utc(1999, 12, 31, 18, 59 ,55), (@twz - 5).time
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_equal Time.utc(1999, 12, 31, 18, 59 ,55), (@twz - 5).time
+      end
     end
     
     def test_minus_with_integer_when_self_wraps_datetime
-      datetime = DateTime.civil(2000, 1, 1, 0)
-      twz = ActiveSupport::TimeWithZone.new(datetime, @time_zone)
-      assert_equal DateTime.civil(1999, 12, 31, 18, 59 ,55), (twz - 5).time
+      silence_warnings do # silence warnings raised by tzinfo gem
+        datetime = DateTime.civil(2000, 1, 1, 0)
+        twz = ActiveSupport::TimeWithZone.new(datetime, @time_zone)
+        assert_equal DateTime.civil(1999, 12, 31, 18, 59 ,55), (twz - 5).time
+      end
     end
       
     def test_minus_with_duration
-      assert_equal Time.utc(1999, 12, 26, 19, 0 ,0), (@twz - 5.days).time
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_equal Time.utc(1999, 12, 26, 19, 0 ,0), (@twz - 5.days).time
+      end
     end
     
     def test_minus_with_time
@@ -162,39 +198,45 @@ uses_tzinfo 'TimeWithZoneTest' do
     end
     
     def test_plus_and_minus_enforce_spring_dst_rules
-      utc = Time.utc(2006,4,2,6,59,59) # == Apr 2 2006 01:59:59 EST; i.e., 1 second before daylight savings start
-      twz = ActiveSupport::TimeWithZone.new(utc, @time_zone)
-      assert_equal Time.utc(2006,4,2,1,59,59), twz.time
-      assert_equal false, twz.dst?
-      assert_equal 'EST', twz.zone
-      twz = twz + 1
-      assert_equal Time.utc(2006,4,2,3), twz.time # adding 1 sec springs forward to 3:00AM EDT
-      assert_equal true, twz.dst?
-      assert_equal 'EDT', twz.zone
-      twz = twz - 1 # subtracting 1 second takes goes back to 1:59:59AM EST
-      assert_equal Time.utc(2006,4,2,1,59,59), twz.time
-      assert_equal false, twz.dst?
-      assert_equal 'EST', twz.zone
+      silence_warnings do # silence warnings raised by tzinfo gem
+        utc = Time.utc(2006,4,2,6,59,59) # == Apr 2 2006 01:59:59 EST; i.e., 1 second before daylight savings start
+        twz = ActiveSupport::TimeWithZone.new(utc, @time_zone)
+        assert_equal Time.utc(2006,4,2,1,59,59), twz.time
+        assert_equal false, twz.dst?
+        assert_equal 'EST', twz.zone
+        twz = twz + 1
+        assert_equal Time.utc(2006,4,2,3), twz.time # adding 1 sec springs forward to 3:00AM EDT
+        assert_equal true, twz.dst?
+        assert_equal 'EDT', twz.zone
+        twz = twz - 1 # subtracting 1 second takes goes back to 1:59:59AM EST
+        assert_equal Time.utc(2006,4,2,1,59,59), twz.time
+        assert_equal false, twz.dst?
+        assert_equal 'EST', twz.zone
+      end
     end
     
     def test_plus_and_minus_enforce_fall_dst_rules
-      utc = Time.utc(2006,10,29,5,59,59) # == Oct 29 2006 01:59:59 EST; i.e., 1 second before daylight savings end
-      twz = ActiveSupport::TimeWithZone.new(utc, @time_zone)
-      assert_equal Time.utc(2006,10,29,1,59,59), twz.time
-      assert_equal true, twz.dst?
-      assert_equal 'EDT', twz.zone
-      twz = twz + 1
-      assert_equal Time.utc(2006,10,29,1), twz.time # adding 1 sec falls back from 1:59:59 EDT to 1:00AM EST
-      assert_equal false, twz.dst?
-      assert_equal 'EST', twz.zone
-      twz = twz - 1
-      assert_equal Time.utc(2006,10,29,1,59,59), twz.time # subtracting 1 sec goes back to 1:59:59AM EDT
-      assert_equal true, twz.dst?
-      assert_equal 'EDT', twz.zone
+      silence_warnings do # silence warnings raised by tzinfo gem
+        utc = Time.utc(2006,10,29,5,59,59) # == Oct 29 2006 01:59:59 EST; i.e., 1 second before daylight savings end
+        twz = ActiveSupport::TimeWithZone.new(utc, @time_zone)
+        assert_equal Time.utc(2006,10,29,1,59,59), twz.time
+        assert_equal true, twz.dst?
+        assert_equal 'EDT', twz.zone
+        twz = twz + 1
+        assert_equal Time.utc(2006,10,29,1), twz.time # adding 1 sec falls back from 1:59:59 EDT to 1:00AM EST
+        assert_equal false, twz.dst?
+        assert_equal 'EST', twz.zone
+        twz = twz - 1
+        assert_equal Time.utc(2006,10,29,1,59,59), twz.time # subtracting 1 sec goes back to 1:59:59AM EDT
+        assert_equal true, twz.dst?
+        assert_equal 'EDT', twz.zone
+      end
     end
     
     def test_to_a
-      assert_equal [45, 30, 5, 1, 2, 2000, 2, 32, false, "HST"], ActiveSupport::TimeWithZone.new( Time.utc(2000, 2, 1, 15, 30, 45), TimeZone['Hawaii'] ).to_a
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_equal [45, 30, 5, 1, 2, 2000, 2, 32, false, "HST"], ActiveSupport::TimeWithZone.new( Time.utc(2000, 2, 1, 15, 30, 45), TimeZone['Hawaii'] ).to_a
+      end
     end
     
     def test_to_f
@@ -214,7 +256,9 @@ uses_tzinfo 'TimeWithZoneTest' do
     end
     
     def test_to_datetime
-      assert_equal DateTime.civil(1999, 12, 31, 19, 0, 0, Rational(-18_000, 86_400)),  @twz.to_datetime
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_equal DateTime.civil(1999, 12, 31, 19, 0, 0, Rational(-18_000, 86_400)),  @twz.to_datetime
+      end
     end
       
     def test_acts_like_time
@@ -234,52 +278,66 @@ uses_tzinfo 'TimeWithZoneTest' do
     end
       
     def test_method_missing_with_time_return_value
-      assert_instance_of ActiveSupport::TimeWithZone, @twz.months_since(1)
-      assert_equal Time.utc(2000, 1, 31, 19, 0 ,0), @twz.months_since(1).time
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_instance_of ActiveSupport::TimeWithZone, @twz.months_since(1)
+        assert_equal Time.utc(2000, 1, 31, 19, 0 ,0), @twz.months_since(1).time
+      end
     end
     
     def test_marshal_dump_and_load
-      marshal_str = Marshal.dump(@twz)
-      mtime = Marshal.load(marshal_str)
-      assert_equal Time.utc(2000, 1, 1, 0), mtime.utc
-      assert_equal TimeZone['Eastern Time (US & Canada)'], mtime.time_zone
-      assert_equal Time.utc(1999, 12, 31, 19), mtime.time
+      silence_warnings do # silence warnings raised by tzinfo gem
+        marshal_str = Marshal.dump(@twz)
+        mtime = Marshal.load(marshal_str)
+        assert_equal Time.utc(2000, 1, 1, 0), mtime.utc
+        assert_equal TimeZone['Eastern Time (US & Canada)'], mtime.time_zone
+        assert_equal Time.utc(1999, 12, 31, 19), mtime.time
+      end
     end
       
     def test_method_missing_with_non_time_return_value
-      twz = ActiveSupport::TimeWithZone.new(Time.utc(1999,12,31,19,18,17,500), @time_zone)
-      assert_equal 1999, twz.year
-      assert_equal 12, twz.month
-      assert_equal 31, twz.day
-      assert_equal 14, twz.hour
-      assert_equal 18, twz.min
-      assert_equal 17, twz.sec
-      assert_equal 500, twz.usec
+      silence_warnings do # silence warnings raised by tzinfo gem
+        twz = ActiveSupport::TimeWithZone.new(Time.utc(1999,12,31,19,18,17,500), @time_zone)
+        assert_equal 1999, twz.year
+        assert_equal 12, twz.month
+        assert_equal 31, twz.day
+        assert_equal 14, twz.hour
+        assert_equal 18, twz.min
+        assert_equal 17, twz.sec
+        assert_equal 500, twz.usec
+      end
     end
     
     def test_utc_to_local_conversion_saves_period_in_instance_variable
-      assert_nil @twz.instance_variable_get('@period')
-      @twz.time
-      assert_kind_of TZInfo::TimezonePeriod, @twz.instance_variable_get('@period')
+      silence_warnings do # silence warnings raised by tzinfo gem
+        assert_nil @twz.instance_variable_get('@period')
+        @twz.time
+        assert_kind_of TZInfo::TimezonePeriod, @twz.instance_variable_get('@period')
+      end
     end
     
     def test_instance_created_with_local_time_returns_correct_utc_time
-      twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(1999, 12, 31, 19))
-      assert_equal Time.utc(2000), twz.utc
+      silence_warnings do # silence warnings raised by tzinfo gem
+        twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(1999, 12, 31, 19))
+        assert_equal Time.utc(2000), twz.utc
+      end
     end
     
     def test_instance_created_with_local_time_enforces_spring_dst_rules
-      twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,4,2,2)) # first second of DST
-      assert_equal Time.utc(2006,4,2,3), twz.time # springs forward to 3AM
-      assert_equal true, twz.dst?
-      assert_equal 'EDT', twz.zone
+      silence_warnings do # silence warnings raised by tzinfo gem
+        twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,4,2,2)) # first second of DST
+        assert_equal Time.utc(2006,4,2,3), twz.time # springs forward to 3AM
+        assert_equal true, twz.dst?
+        assert_equal 'EDT', twz.zone
+      end
     end
     
     def test_instance_created_with_local_time_enforces_fall_dst_rules
-      twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,10,29,1)) # 1AM can be either DST or non-DST; we'll pick DST
-      assert_equal Time.utc(2006,10,29,1), twz.time
-      assert_equal true, twz.dst?
-      assert_equal 'EDT', twz.zone
+      silence_warnings do # silence warnings raised by tzinfo gem
+        twz = ActiveSupport::TimeWithZone.new(nil, @time_zone, Time.utc(2006,10,29,1)) # 1AM can be either DST or non-DST; we'll pick DST
+        assert_equal Time.utc(2006,10,29,1), twz.time
+        assert_equal true, twz.dst?
+        assert_equal 'EDT', twz.zone
+      end
     end
     
     def test_ruby_19_weekday_name_query_methods
diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb
index 1a97594ccf..8dc71b5ba8 100644
--- a/activesupport/test/time_zone_test.rb
+++ b/activesupport/test/time_zone_test.rb
@@ -91,8 +91,105 @@ class TimeZoneTest < Test::Unit::TestCase
       end
     
       def test_today
-        TZInfo::DataTimezone.any_instance.stubs(:now).returns(Time.utc(2000))
-        assert_equal Date.new(2000), TimeZone['Eastern Time (US & Canada)'].today
+        Time.stubs(:now).returns(Time.utc(2000, 1, 1, 4, 59, 59)) # 1 sec before midnight Jan 1 EST
+        assert_equal Date.new(1999, 12, 31), TimeZone['Eastern Time (US & Canada)'].today
+        Time.stubs(:now).returns(Time.utc(2000, 1, 1, 5)) # midnight Jan 1 EST
+        assert_equal Date.new(2000, 1, 1), TimeZone['Eastern Time (US & Canada)'].today
+        Time.stubs(:now).returns(Time.utc(2000, 1, 2, 4, 59, 59)) # 1 sec before midnight Jan 2 EST
+        assert_equal Date.new(2000, 1, 1), TimeZone['Eastern Time (US & Canada)'].today
+        Time.stubs(:now).returns(Time.utc(2000, 1, 2, 5)) # midnight Jan 2 EST
+        assert_equal Date.new(2000, 1, 2), TimeZone['Eastern Time (US & Canada)'].today
+      end
+    end
+    
+    def test_local
+      silence_warnings do # silence warnings raised by tzinfo gem
+        time = TimeZone["Hawaii"].local(2007, 2, 5, 15, 30, 45)
+        assert_equal Time.utc(2007, 2, 5, 15, 30, 45), time.time
+        assert_equal TimeZone["Hawaii"], time.time_zone
+      end
+    end
+
+    def test_local_with_old_date
+      silence_warnings do # silence warnings raised by tzinfo gem
+        time = TimeZone["Hawaii"].local(1850, 2, 5, 15, 30, 45)
+        assert_equal [45,30,15,5,2,1850], time.to_a[0,6]
+        assert_equal TimeZone["Hawaii"], time.time_zone
+      end
+    end
+
+    def test_local_enforces_spring_dst_rules
+      zone = TimeZone['Eastern Time (US & Canada)']
+      twz = zone.local(2006,4,2,1,59,59) # 1 second before DST start
+      assert_equal Time.utc(2006,4,2,1,59,59), twz.time
+      assert_equal Time.utc(2006,4,2,6,59,59), twz.utc
+      assert_equal false, twz.dst?
+      assert_equal 'EST', twz.zone
+      twz2 = zone.local(2006,4,2,2) # 2AM does not exist because at 2AM, time springs forward to 3AM
+      assert_equal Time.utc(2006,4,2,3), twz2.time # twz is created for 3AM
+      assert_equal Time.utc(2006,4,2,7), twz2.utc
+      assert_equal true, twz2.dst?
+      assert_equal 'EDT', twz2.zone
+      twz3 = zone.local(2006,4,2,2,30) # 2:30AM does not exist because at 2AM, time springs forward to 3AM
+      assert_equal Time.utc(2006,4,2,3,30), twz3.time # twz is created for 3:30AM
+      assert_equal Time.utc(2006,4,2,7,30), twz3.utc
+      assert_equal true, twz3.dst?
+      assert_equal 'EDT', twz3.zone
+    end
+
+    def test_local_enforces_fall_dst_rules
+      # 1AM during fall DST transition is ambiguous, it could be either DST or non-DST 1AM
+      # Mirroring Time.local behavior, this method selects the DST time
+      zone = TimeZone['Eastern Time (US & Canada)']
+      twz = zone.local(2006,10,29,1)
+      assert_equal Time.utc(2006,10,29,1), twz.time
+      assert_equal Time.utc(2006,10,29,5), twz.utc
+      assert_equal true, twz.dst? 
+      assert_equal 'EDT', twz.zone
+    end
+
+    def test_at
+      zone = TimeZone['Eastern Time (US & Canada)']
+      secs = 946684800.0
+      twz = zone.at(secs)
+      assert_equal Time.utc(1999,12,31,19), twz.time
+      assert_equal Time.utc(2000), twz.utc
+      assert_equal zone, twz.time_zone
+      assert_equal secs, twz.to_f
+    end
+
+    def test_at_with_old_date
+      zone = TimeZone['Eastern Time (US & Canada)']
+      secs = DateTime.civil(1850).to_f
+      twz = zone.at(secs)
+      assert_equal [1850, 1, 1, 0], [twz.utc.year, twz.utc.mon, twz.utc.day, twz.utc.hour]
+      assert_equal zone, twz.time_zone
+      assert_equal secs, twz.to_f
+    end
+
+    def test_parse
+      zone = TimeZone['Eastern Time (US & Canada)']
+      twz = zone.parse('1999-12-31 19:00:00')
+      assert_equal Time.utc(1999,12,31,19), twz.time
+      assert_equal Time.utc(2000), twz.utc
+      assert_equal zone, twz.time_zone
+    end
+
+    def test_parse_with_old_date
+      silence_warnings do # silence warnings raised by tzinfo gem
+        zone = TimeZone['Eastern Time (US & Canada)']
+        twz = zone.parse('1850-12-31 19:00:00')
+        assert_equal [0,0,19,31,12,1850], twz.to_a[0,6]
+        assert_equal zone, twz.time_zone
+      end
+    end
+
+    uses_mocha 'TestParseWithIncompleteDate' do
+      def test_parse_with_incomplete_date
+        zone = TimeZone['Eastern Time (US & Canada)']
+        zone.stubs(:now).returns zone.local(1999,12,31)
+        twz = zone.parse('19:00:00')
+        assert_equal Time.utc(1999,12,31,19), twz.time
       end
     end
   end
@@ -150,95 +247,6 @@ class TimeZoneTest < Test::Unit::TestCase
     assert !TimeZone.us_zones.include?(TimeZone["Kuala Lumpur"])
   end 
   
-  def test_local
-    time = TimeZone["Hawaii"].local(2007, 2, 5, 15, 30, 45)
-    assert_equal Time.utc(2007, 2, 5, 15, 30, 45), time.time
-    assert_equal TimeZone["Hawaii"], time.time_zone
-  end
-  
-  def test_local_with_old_date
-    silence_warnings do # silence warnings raised by tzinfo gem
-      time = TimeZone["Hawaii"].local(1850, 2, 5, 15, 30, 45)
-      assert_equal [45,30,15,5,2,1850], time.to_a[0,6]
-      assert_equal TimeZone["Hawaii"], time.time_zone
-    end
-  end
-  
-  def test_local_enforces_spring_dst_rules
-    zone = TimeZone['Eastern Time (US & Canada)']
-    twz = zone.local(2006,4,2,1,59,59) # 1 second before DST start
-    assert_equal Time.utc(2006,4,2,1,59,59), twz.time
-    assert_equal Time.utc(2006,4,2,6,59,59), twz.utc
-    assert_equal false, twz.dst?
-    assert_equal 'EST', twz.zone
-    twz2 = zone.local(2006,4,2,2) # 2AM does not exist because at 2AM, time springs forward to 3AM
-    assert_equal Time.utc(2006,4,2,3), twz2.time # twz is created for 3AM
-    assert_equal Time.utc(2006,4,2,7), twz2.utc
-    assert_equal true, twz2.dst?
-    assert_equal 'EDT', twz2.zone
-    twz3 = zone.local(2006,4,2,2,30) # 2:30AM does not exist because at 2AM, time springs forward to 3AM
-    assert_equal Time.utc(2006,4,2,3,30), twz3.time # twz is created for 3:30AM
-    assert_equal Time.utc(2006,4,2,7,30), twz3.utc
-    assert_equal true, twz3.dst?
-    assert_equal 'EDT', twz3.zone
-  end
-  
-  def test_local_enforces_fall_dst_rules
-    # 1AM during fall DST transition is ambiguous, it could be either DST or non-DST 1AM
-    # Mirroring Time.local behavior, this method selects the DST time
-    zone = TimeZone['Eastern Time (US & Canada)']
-    twz = zone.local(2006,10,29,1)
-    assert_equal Time.utc(2006,10,29,1), twz.time
-    assert_equal Time.utc(2006,10,29,5), twz.utc
-    assert_equal true, twz.dst? 
-    assert_equal 'EDT', twz.zone
-  end
-  
-  def test_at
-    zone = TimeZone['Eastern Time (US & Canada)']
-    secs = 946684800.0
-    twz = zone.at(secs)
-    assert_equal Time.utc(1999,12,31,19), twz.time
-    assert_equal Time.utc(2000), twz.utc
-    assert_equal zone, twz.time_zone
-    assert_equal secs, twz.to_f
-  end
-  
-  def test_at_with_old_date
-    zone = TimeZone['Eastern Time (US & Canada)']
-    secs = DateTime.civil(1850).to_f
-    twz = zone.at(secs)
-    assert_equal [1850, 1, 1, 0], [twz.utc.year, twz.utc.mon, twz.utc.day, twz.utc.hour]
-    assert_equal zone, twz.time_zone
-    assert_equal secs, twz.to_f
-  end
-  
-  def test_parse
-    zone = TimeZone['Eastern Time (US & Canada)']
-    twz = zone.parse('1999-12-31 19:00:00')
-    assert_equal Time.utc(1999,12,31,19), twz.time
-    assert_equal Time.utc(2000), twz.utc
-    assert_equal zone, twz.time_zone
-  end
-  
-  def test_parse_with_old_date
-    silence_warnings do # silence warnings raised by tzinfo gem
-      zone = TimeZone['Eastern Time (US & Canada)']
-      twz = zone.parse('1850-12-31 19:00:00')
-      assert_equal [0,0,19,31,12,1850], twz.to_a[0,6]
-      assert_equal zone, twz.time_zone
-    end
-  end
-  
-  uses_mocha 'TestParseWithIncompleteDate' do
-    def test_parse_with_incomplete_date
-      zone = TimeZone['Eastern Time (US & Canada)']
-      zone.stubs(:now).returns zone.local(1999,12,31)
-      twz = zone.parse('19:00:00')
-      assert_equal Time.utc(1999,12,31,19), twz.time
-    end
-  end
-
   protected
     def with_env_tz(new_tz = 'US/Eastern')
       old_tz, ENV['TZ'] = ENV['TZ'], new_tz