tzinfo 1.1.0 → 1.2.0

data/test/tc_timezone.rb

@@ -1,30 +1,8 @@
-#--
-# 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
 
-class TCTimezone < Test::Unit::TestCase
+class TCTimezone < Minitest::Test
 
   class BlockCalled < StandardError
   end
@@ -312,6 +290,8 @@ class TCTimezone < Test::Unit::TestCase
     assert_raises(UnknownTimezone) { tz.now }
     assert_raises(UnknownTimezone) { tz.current_period_and_time }
     assert_raises(UnknownTimezone) { tz.transitions_up_to(DateTime.new(2006,1,1,1,0,0)) }
+    assert_raises(UnknownTimezone) { tz.canonical_identifier }
+    assert_raises(UnknownTimezone) { tz.canonical_zone }
   end
   
   def test_new_nil
@@ -327,6 +307,8 @@ class TCTimezone < Test::Unit::TestCase
     assert_raises(UnknownTimezone) { tz.now }
     assert_raises(UnknownTimezone) { tz.current_period_and_time }
     assert_raises(UnknownTimezone) { tz.transitions_up_to(DateTime.new(2006,1,1,1,0,0)) }
+    assert_raises(UnknownTimezone) { tz.canonical_identifier }
+    assert_raises(UnknownTimezone) { tz.canonical_zone }
   end
   
   def test_new_arg
@@ -489,6 +471,7 @@ class TCTimezone < Test::Unit::TestCase
     
     assert_equal(period, dt_period)
     assert_equal(period, dt2_period)
+    assert_equal(period, dt3_period)
     assert_equal(period, t_period)
     assert_equal(period, t2_period)
     assert_equal(period, t3_period)
@@ -535,16 +518,6 @@ class TCTimezone < Test::Unit::TestCase
   end
   
   def test_period_for_local_not_found
-    o1 = TimezoneOffset.new(-18000, 0, :EST)
-    o2 = TimezoneOffset.new(-18000, 3600, :EDT)
-    
-    t1 = TestTimezoneTransition.new(o1, o2, 1067148000)
-    t2 = TestTimezoneTransition.new(o2, o1, 1081062000)
-    t3 = TestTimezoneTransition.new(o1, o2, 1099202400)
-    
-    p1 = TimezonePeriod.new(t1, t2)
-    p2 = TimezonePeriod.new(t2, t3)
-    
     dt = DateTime.new(2004,4,4,2,0,0)
     dt2 = DateTime.new(2004,4,4,2,0,Rational(987,1000))
     t = Time.utc(2004,4,4,2,30,0)
@@ -849,6 +822,28 @@ class TCTimezone < Test::Unit::TestCase
     assert(TestTimezone.new('Europe/London', nil, [period], tu2).local_to_utc(tu2).utc?)
   end
   
+  def test_local_to_utc_utc_local_returns_utc
+    # Check that UTC time instances are always returned even if the system
+    # is using UTC as the time zone.
+    
+    # Note that this will only test will only work correctly on platforms where
+    # setting the TZ environment variable has an effect. If setting TZ has no
+    # effect, then this test will still pass.
+    
+    old_tz = ENV['TZ']
+    begin
+      ENV['TZ'] = 'UTC'
+      
+      tz = Timezone.get('America/New_York')
+      
+      t = tz.local_to_utc(Time.local(2014, 1, 11, 17, 18, 41))
+      assert_equal(Time.utc(2014, 1, 11, 22, 18, 41), t)      
+      assert(t.utc?)
+    ensure
+      ENV['TZ'] = old_tz
+    end
+  end
+  
   def test_local_to_utc_invalid
     dt = DateTime.new(2004,4,4,2,30,0)
     tz = TestTimezone.new('America/New_York', nil, [], dt)        
@@ -892,16 +887,6 @@ class TCTimezone < Test::Unit::TestCase
   end
   
   def test_local_to_utc_not_found
-    o1 = TimezoneOffset.new(-18000, 0, :EST)
-    o2 = TimezoneOffset.new(-18000, 3600, :EDT)
-    
-    t1 = TestTimezoneTransition.new(o1, o2, 1067148000)
-    t2 = TestTimezoneTransition.new(o2, o1, 1081062000)
-    t3 = TestTimezoneTransition.new(o1, o2, 1099202400)
-    
-    p1 = TimezonePeriod.new(t1, t2)
-    p2 = TimezonePeriod.new(t2, t3)
-    
     dt = DateTime.new(2004,4,4,2,0,0)
     t = Time.utc(2004,4,4,2,30,0)
     i = Time.utc(2004,4,4,2,59,59).to_i
@@ -1065,9 +1050,6 @@ class TCTimezone < Test::Unit::TestCase
     dt = DateTime.new(2004,10,31,1,30,0)    
     tz = TestTimezone.new('America/New_York', nil, [p1, p2], dt)
     
-    dt = DateTime.new(2004,10,31,1,30,0)
-    tz = Timezone.get('America/New_York')
-    
     assert_raises(AmbiguousTime) { tz.local_to_utc(dt) {|periods| nil} }    
     assert_raises(AmbiguousTime) { tz.local_to_utc(dt) {|periods| periods} }     
     assert_raises(AmbiguousTime) { tz.local_to_utc(dt) {|periods| []} }    
@@ -1173,8 +1155,6 @@ class TCTimezone < Test::Unit::TestCase
   end
   
   def test_offsets_up_to_utc_to_not_greater_than_utc_from
-    o = TimezoneOffset.new(600, 0, :LMT)
-    
     assert_raises(ArgumentError) do
       OffsetsUpToTestTimezone.new('Test/Zone', Time.utc(2012,8,1,0,0,0), Time.utc(2012,8,1,0,0,0), []).
         offsets_up_to(Time.utc(2012,8,1,0,0,0), Time.utc(2012,8,1,0,0,0))
@@ -1222,6 +1202,10 @@ class TCTimezone < Test::Unit::TestCase
     assert_equal(1, TestTimezone.new('Europe/Paris') <=> TestTimezone.new('America/New_York'))    
   end
   
+  def test_compare_non_comparable
+    assert_nil(TestTimezone.new('Europe/London') <=> Object.new)
+  end
+  
   def test_equality
     assert_equal(true, TestTimezone.new('Europe/London') == TestTimezone.new('Europe/London'))
     assert_equal(false, TestTimezone.new('Europe/London') == TestTimezone.new('Europe/london'))

data/test/tc_timezone_definition.rb

@@ -1,30 +1,8 @@
-#--
-# Copyright (c) 2006-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
 
-class TCTimezoneDefinition < Test::Unit::TestCase
+class TCTimezoneDefinition < Minitest::Test
 
   module DataTest
     include TimezoneDefinition

data/test/tc_timezone_index_definition.rb

@@ -1,30 +1,8 @@
-#--
-# Copyright (c) 2006-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
 
-class TCTimezoneIndexDefinition < Test::Unit::TestCase
+class TCTimezoneIndexDefinition < Minitest::Test
   
   module TimezonesTest1
     include TimezoneIndexDefinition

data/test/tc_timezone_info.rb

@@ -1,30 +1,8 @@
-#--
-# Copyright (c) 2006-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
 
-class TCTimezoneInfo < Test::Unit::TestCase
+class TCTimezoneInfo < Minitest::Test
   
   def test_identifier
     ti = TimezoneInfo.new('Test/Zone')

data/test/tc_timezone_london.rb

@@ -1,30 +1,8 @@
-#--
-# 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
 
-class TCTimezoneLondon < Test::Unit::TestCase
+class TCTimezoneLondon < Minitest::Test
   def test_2004
     #Europe/London  Sun Mar 28 00:59:59 2004 UTC = Sun Mar 28 00:59:59 2004 GMT isdst=0 gmtoff=0
     #Europe/London  Sun Mar 28 01:00:00 2004 UTC = Sun Mar 28 02:00:00 2004 BST isdst=1 gmtoff=3600

data/test/tc_timezone_melbourne.rb

@@ -1,30 +1,8 @@
-#--
-# 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
 
-class TCTimezoneMelbourne < Test::Unit::TestCase
+class TCTimezoneMelbourne < Minitest::Test
   def test_2004
     #Australia/Melbourne  Sat Mar 27 15:59:59 2004 UTC = Sun Mar 28 02:59:59 2004 EST isdst=1 gmtoff=39600
     #Australia/Melbourne  Sat Mar 27 16:00:00 2004 UTC = Sun Mar 28 02:00:00 2004 EST isdst=0 gmtoff=36000

data/test/tc_timezone_new_york.rb

@@ -1,30 +1,8 @@
-#--
-# 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
 
-class TCTimezoneNewYork < Test::Unit::TestCase
+class TCTimezoneNewYork < Minitest::Test
   def test_2004
     #America/New_York  Sun Apr  4 06:59:59 2004 UTC = Sun Apr  4 01:59:59 2004 EST isdst=0 gmtoff=-18000
     #America/New_York  Sun Apr  4 07:00:00 2004 UTC = Sun Apr  4 03:00:00 2004 EDT isdst=1 gmtoff=-14400

data/test/tc_timezone_offset.rb

@@ -1,30 +1,8 @@
-#--
-# Copyright (c) 2006-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
 
-class TCTimezoneOffset < Test::Unit::TestCase
+class TCTimezoneOffset < Minitest::Test
   
   def test_utc_offset
     o1 = TimezoneOffset.new(18000, 0, :TEST)

data/test/tc_timezone_period.rb

@@ -1,30 +1,8 @@
-#--
-# 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
 
-class TCTimezonePeriod < Test::Unit::TestCase
+class TCTimezonePeriod < Minitest::Test
   
   class TestTimezoneTransition < TimezoneTransition
     def initialize(offset, previous_offset, at)
@@ -558,13 +536,13 @@ class TCTimezonePeriod < Test::Unit::TestCase
     t4 = TestTimezoneTransition.new(o1, o2, 1149541200)
     
     p1 = TimezonePeriod.new(t1, t3)    
-    p2 = TimezonePeriod.new(t3, nil)
-    p3 = TimezonePeriod.new(nil, t3)
+    p2 = TimezonePeriod.new(t2, nil)
+    p3 = TimezonePeriod.new(nil, t4)
     p4 = TimezonePeriod.new(nil, nil, o1)
 
     assert_equal(t1.hash ^ t3.hash, p1.hash)
-    assert_equal(t3.hash ^ nil.hash, p2.hash)
-    assert_equal(nil.hash ^ t3.hash, p3.hash)
+    assert_equal(t2.hash ^ nil.hash, p2.hash)
+    assert_equal(nil.hash ^ t4.hash, p3.hash)
     assert_equal(nil.hash ^ nil.hash ^ o1.hash, p4.hash)    
   end
 end

data/test/tc_timezone_proxy.rb

@@ -1,30 +1,8 @@
-#--
-# 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
 
-class TCTimezoneProxy < Test::Unit::TestCase
+class TCTimezoneProxy < Minitest::Test
   def test_not_exist
     proxy = TimezoneProxy.new('Nothing/Special')
     assert_equal('Nothing/Special', proxy.identifier)
@@ -36,17 +14,18 @@ class TCTimezoneProxy < Test::Unit::TestCase
     assert_raises(InvalidTimezoneIdentifier) { proxy.local_to_utc(DateTime.new(2006,1,1,0,0,0)) }
     assert_raises(InvalidTimezoneIdentifier) { proxy.period_for_utc(DateTime.new(2006,1,1,0,0,0)) }
     assert_raises(InvalidTimezoneIdentifier) { proxy.period_for_local(DateTime.new(2006,1,1,0,0,0)) }
+    assert_raises(InvalidTimezoneIdentifier) { proxy.canonical_identifier }
+    assert_raises(InvalidTimezoneIdentifier) { proxy.canonical_zone }
   end
   
   def test_valid
     proxy = TimezoneProxy.new('Europe/London')
     assert_equal('Europe/London', proxy.identifier)
     
-    # Test nothing raised
-    proxy.now
-    proxy.current_period
-    proxy.current_period_and_time
-    proxy.current_time_and_period
+    assert_nothing_raised { proxy.now }
+    assert_nothing_raised { proxy.current_period }
+    assert_nothing_raised { proxy.current_period_and_time }
+    assert_nothing_raised { proxy.current_time_and_period }
     
     real = Timezone.get('Europe/London')
     
@@ -60,6 +39,8 @@ class TCTimezoneProxy < Test::Unit::TestCase
     assert_equal(real.friendly_identifier(true), proxy.friendly_identifier(true))
     assert_equal(real.friendly_identifier(false), proxy.friendly_identifier(false))
     assert_equal(real.friendly_identifier, proxy.friendly_identifier)
+    assert_equal(real.canonical_identifier, proxy.canonical_identifier)
+    assert_same(real.canonical_zone, proxy.canonical_zone)
     
     assert_equal('Europe/London', proxy.identifier)
     
@@ -69,6 +50,31 @@ class TCTimezoneProxy < Test::Unit::TestCase
     assert_equal(0, proxy <=> real)
   end
   
+  def test_canonical_linked
+    # Test that the implementation of canonical_zone and canonical_identifier
+    # are actually calling the real timezone and not just returning it and
+    # its identifier.
+    
+    real = Timezone.get('UTC')
+    proxy = TimezoneProxy.new('UTC')
+    
+    # ZoneinfoDataSource doesn't return LinkedTimezoneInfo instances for any 
+    # timezone.
+    if real.kind_of?(LinkedTimezone)
+      assert_equal('Etc/UTC', proxy.canonical_identifier)
+      assert_same(Timezone.get('Etc/UTC'), proxy.canonical_zone)
+    else    
+      if DataSource.get.kind_of?(RubyDataSource)
+        # Not got a LinkedTimezone despite using a DataSource that supports it.
+        # Raise an exception as this shouldn't happen.
+        raise 'Non-LinkedTimezone instance returned for UTC using RubyDataSource'
+      end
+      
+      assert_equal('UTC', proxy.canonical_identifier)
+      assert_same(Timezone.get('UTC'), proxy.canonical_zone)
+    end
+  end
+  
   def test_equals
     assert_equal(true, TimezoneProxy.new('Europe/London') == TimezoneProxy.new('Europe/London'))
     assert_equal(false, TimezoneProxy.new('Europe/London') == TimezoneProxy.new('Europe/Paris'))