tzinfo 0.3.61 → 1.0.0

data/test/tc_timezone_period.rb

@@ -1,6 +1,26 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo'
+#--
+# Copyright (c) 2005-2013 Philip Ross
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils')
 
 include TZInfo
 
@@ -14,19 +34,20 @@ class TCTimezonePeriod < Test::Unit::TestCase
       
     p = TimezonePeriod.new(start_t, end_t)
     
-    assert_equal(start_t, p.start_transition)
-    assert_equal(end_t, p.end_transition)
-    assert_equal(dst, p.offset)
     assert_equal(DateTime.new(2006,1,1,0,0,0), p.utc_start)
+    assert_equal(Time.utc(2006,1,1,0,0,0), p.utc_start_time)
     assert_equal(DateTime.new(2006,1,2,0,0,0), p.utc_end)
+    assert_equal(Time.utc(2006,1,2,0,0,0), p.utc_end_time)
     assert_equal(-7200, p.utc_offset)
     assert_equal(3600, p.std_offset)
     assert_equal(-3600, p.utc_total_offset)
     assert_equal(Rational(-3600, 86400), p.utc_total_offset_rational)
     assert_equal(:TEST, p.zone_identifier)
     assert_equal(:TEST, p.abbreviation)    
-    assert_equal(DateTime.new(2005,12,31,23,0,0), p.local_start)    
+    assert_equal(DateTime.new(2005,12,31,23,0,0), p.local_start)
+    assert_equal(Time.utc(2005,12,31,23,0,0), p.local_start_time)
     assert_equal(DateTime.new(2006,1,1,23,0,0), p.local_end)
+    assert_equal(Time.utc(2006,1,1,23,0,0), p.local_end_time)
   end
   
   def test_initialize_start_end_offset
@@ -46,19 +67,20 @@ class TCTimezonePeriod < Test::Unit::TestCase
       
     p = TimezonePeriod.new(start_t, nil)
     
-    assert_equal(start_t, p.start_transition)
-    assert_nil(p.end_transition)
-    assert_equal(dst, p.offset)
     assert_equal(DateTime.new(2006,1,1,0,0,0), p.utc_start)
+    assert_equal(Time.utc(2006,1,1,0,0,0), p.utc_start_time)
     assert_nil(p.utc_end)
+    assert_nil(p.utc_end_time)
     assert_equal(-7200, p.utc_offset)
     assert_equal(3600, p.std_offset)
     assert_equal(-3600, p.utc_total_offset)
     assert_equal(Rational(-3600, 86400), p.utc_total_offset_rational)
     assert_equal(:TEST, p.zone_identifier)
     assert_equal(:TEST, p.abbreviation)    
-    assert_equal(DateTime.new(2005,12,31,23,0,0), p.local_start)    
+    assert_equal(DateTime.new(2005,12,31,23,0,0), p.local_start)
+    assert_equal(Time.utc(2005,12,31,23,0,0), p.local_start_time)
     assert_nil(p.local_end)
+    assert_nil(p.local_end_time)
   end
   
   def test_initialize_start_offset
@@ -77,19 +99,20 @@ class TCTimezonePeriod < Test::Unit::TestCase
       
     p = TimezonePeriod.new(nil, end_t)
     
-    assert_nil(p.start_transition)
-    assert_equal(end_t, p.end_transition)
-    assert_equal(dst, p.offset)
     assert_nil(p.utc_start)
+    assert_nil(p.utc_start_time)
     assert_equal(DateTime.new(2006,1,2,0,0,0), p.utc_end)
+    assert_equal(Time.utc(2006,1,2,0,0,0), p.utc_end_time)
     assert_equal(-7200, p.utc_offset)
     assert_equal(3600, p.std_offset)
     assert_equal(-3600, p.utc_total_offset)
     assert_equal(Rational(-3600, 86400), p.utc_total_offset_rational)
     assert_equal(:TEST, p.zone_identifier)
     assert_equal(:TEST, p.abbreviation)    
-    assert_nil(p.local_start)    
+    assert_nil(p.local_start)
+    assert_nil(p.local_start_time)
     assert_equal(DateTime.new(2006,1,1,23,0,0), p.local_end)
+    assert_equal(Time.utc(2006,1,1,23,0,0), p.local_end_time)
   end
   
   def test_initialize_end_offset
@@ -110,19 +133,20 @@ class TCTimezonePeriod < Test::Unit::TestCase
       
     p = TimezonePeriod.new(nil, nil, special)
     
-    assert_nil(p.start_transition)
-    assert_nil(p.end_transition)
-    assert_equal(special, p.offset)
     assert_nil(p.utc_start)
+    assert_nil(p.utc_start_time)
     assert_nil(p.utc_end)
+    assert_nil(p.utc_end_time)
     assert_equal(0, p.utc_offset)
     assert_equal(0, p.std_offset)
     assert_equal(0, p.utc_total_offset)
     assert_equal(Rational(0, 86400), p.utc_total_offset_rational)
     assert_equal(:SPECIAL, p.zone_identifier)
     assert_equal(:SPECIAL, p.abbreviation)    
-    assert_nil(p.local_start)    
-    assert_nil(p.local_end)  
+    assert_nil(p.local_start)
+    assert_nil(p.local_start_time)
+    assert_nil(p.local_end)
+    assert_nil(p.local_end_time)
   end
   
   def test_dst    
@@ -352,7 +376,9 @@ class TCTimezonePeriod < Test::Unit::TestCase
     p3 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(7200, 3600, :TEST))
         
     assert_equal(DateTime.new(2005,1,19,22,0,0), p1.to_local(DateTime.new(2005,1,20,1,0,0)))
+    assert_equal(DateTime.new(2005,1,19,22,0,0 + Rational(512,1000)), p1.to_local(DateTime.new(2005,1,20,1,0,0 + Rational(512,1000))))
     assert_equal(Time.utc(2005,1,19,21,0,0), p2.to_local(Time.utc(2005,1,20,1,0,0)))
+    assert_equal(Time.utc(2005,1,19,21,0,0,512000), p2.to_local(Time.utc(2005,1,20,1,0,0,512000)))
     assert_equal(1106193600, p3.to_local(1106182800))
   end
   
@@ -362,7 +388,9 @@ class TCTimezonePeriod < Test::Unit::TestCase
     p3 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(7200, 3600, :TEST))
         
     assert_equal(DateTime.new(2005,1,20,4,0,0), p1.to_utc(DateTime.new(2005,1,20,1,0,0)))
+    assert_equal(DateTime.new(2005,1,20,4,0,0 + Rational(571,1000)), p1.to_utc(DateTime.new(2005,1,20,1,0,0 + Rational(571,1000))))
     assert_equal(Time.utc(2005,1,20,5,0,0), p2.to_utc(Time.utc(2005,1,20,1,0,0)))
+    assert_equal(Time.utc(2005,1,20,5,0,0,571000), p2.to_utc(Time.utc(2005,1,20,1,0,0,571000)))
     assert_equal(1106172000, p3.to_utc(1106182800))
   end
   
@@ -373,7 +401,12 @@ class TCTimezonePeriod < Test::Unit::TestCase
     
     p1 = TimezonePeriod.new(t1, nil)
     
-    assert_equal(DateTime.new(1969,12,31,23,0,0), p1.local_start)    
+    assert_equal(DateTime.new(1969,12,31,23,0,0), p1.local_start)
+    
+    # Conversion to Time will fail on systems that don't support negative times.
+    if RubyCoreSupport.time_supports_negative
+      assert_equal(Time.utc(1969,12,31,23,0,0), p1.local_start_time)
+    end
   end
   
   def test_time_boundary_end
@@ -384,6 +417,11 @@ class TCTimezonePeriod < Test::Unit::TestCase
     p1 = TimezonePeriod.new(nil, t1)
     
     assert_equal(DateTime.new(2038,1,19,4,0,0), p1.local_end)
+    
+    # Conversion to Time will fail on systems that don't support 64-bit times
+    if RubyCoreSupport.time_supports_64bit
+      assert_equal(Time.utc(2038,1,19,4,0,0), p1.local_end_time)
+    end
   end
   
   def test_equality
@@ -506,4 +544,4 @@ class TCTimezonePeriod < Test::Unit::TestCase
     assert_equal(nil.hash ^ t3.hash, p3.hash)
     assert_equal(nil.hash ^ nil.hash ^ o1.hash, p4.hash)    
   end
-end
+end

data/test/tc_timezone_proxy.rb

@@ -1,6 +1,26 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo'
+#--
+# Copyright (c) 2005-2013 Philip Ross
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils')
 
 include TZInfo
 
@@ -84,4 +104,4 @@ class TCTimezoneProxy < Test::Unit::TestCase
     assert_kind_of(TimezoneProxy, tp2)
     assert_equal('Europe/London', tp2.identifier)
   end
-end
+end