tzinfo 1.1.0 → 1.2.0

data/lib/tzinfo/zoneinfo_timezone_info.rb

@@ -1,25 +1,3 @@
-#--
-# Copyright (c) 2008-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.
-#++
-
 module TZInfo
   # An InvalidZoneinfoFile exception is raised if an attempt is made to load an
   # invalid zoneinfo file.

data/test/tc_country.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 TCCountry < Test::Unit::TestCase
+class TCCountry < Minitest::Test
   def setup
     @orig_data_source = DataSource.get
     Country.send :init_countries
@@ -105,7 +83,7 @@ class TCCountry < Test::Unit::TestCase
     
   def test_new_nil
     assert_raises(InvalidCountryCode) {
-      c = Country.new(nil)
+      Country.new(nil)
     }        
   end
   
@@ -180,6 +158,10 @@ class TCCountry < Test::Unit::TestCase
     assert_equal(1, Country.get('US') <=> Country.get('FR'))
   end
   
+  def test_compare_non_comparable
+    assert_nil(Country.get('GB') <=> Object.new)
+  end
+  
   def test_equality
     assert_equal(true, Country.get('GB') == Country.get('GB'))
     assert_equal(false, Country.get('GB') == Country.get('US'))

data/test/tc_country_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 TCCountryIndexDefinition < Test::Unit::TestCase
+class TCCountryIndexDefinition < Minitest::Test
 
   module CountriesTest1     
     include CountryIndexDefinition

data/test/tc_country_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 TCCountryInfo < Test::Unit::TestCase
+class TCCountryInfo < Minitest::Test
   
   def test_code
     ci = CountryInfo.new('ZZ', 'Zzz') {|c| }

data/test/tc_country_timezone.rb

@@ -1,139 +1,159 @@
-#--
-# 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 TCCountryTimezone < Test::Unit::TestCase
-  def test_identifier
-    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)    
+class TCCountryTimezone < Minitest::Test
+  def test_identifier_new!
+    ct = CountryTimezone.new!('Europe/London', 2059, 40, -5, 16)    
     assert_equal('Europe/London', ct.identifier)
-  end    
+  end
   
-  def test_latitude
-    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
+  def test_identifier_new
+    ct = CountryTimezone.new('Europe/London', Rational(2059, 40), Rational(-5, 16))    
+    assert_equal('Europe/London', ct.identifier)
+  end
+  
+  def test_latitude_new!
+    ct = CountryTimezone.new!('Europe/London', 2059, 40, -5, 16)
     assert_equal(Rational(2059, 40), ct.latitude)
   end
   
-  def test_longitude
-    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
+  def test_latitude_new
+    ct = CountryTimezone.new('Europe/London', Rational(2059, 40), Rational(-5, 16))
+    assert_equal(Rational(2059, 40), ct.latitude)
+  end
+  
+  def test_longitude_new!
+    ct = CountryTimezone.new!('Europe/London', 2059, 40, -5, 16)
+    assert_equal(Rational(-5, 16), ct.longitude)
+  end
+  
+  def test_longitude_new
+    ct = CountryTimezone.new('Europe/London', Rational(2059, 40), Rational(-5, 16))
     assert_equal(Rational(-5, 16), ct.longitude)
   end
   
-  def test_description_omit
-    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
+  def test_description_omit_new!
+    ct = CountryTimezone.new!('Europe/London', 2059, 40, -5, 16)
     assert_nil(ct.description)
   end
   
-  def test_description_nil
-    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16, nil)
+  def test_description_omit_new
+    ct = CountryTimezone.new('Europe/London', Rational(2059, 40), Rational(-5, 16))
     assert_nil(ct.description)
   end
   
-  def test_description
-    ct = CountryTimezone.new('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time')
+  def test_description_nil_new!
+    ct = CountryTimezone.new!('Europe/London', 2059, 40, -5, 16, nil)
+    assert_nil(ct.description)
+  end
+  
+  def test_description_nil_new
+    ct = CountryTimezone.new('Europe/London', Rational(2059, 40), Rational(-5, 16), nil)
+    assert_nil(ct.description)
+  end
+  
+  def test_description_new!
+    ct = CountryTimezone.new!('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time')
+    assert_equal('Eastern Time', ct.description)
+  end
+  
+  def test_description_new
+    ct = CountryTimezone.new('America/New_York', Rational(48857, 1200), Rational(-266423, 3600), 'Eastern Time')
     assert_equal('Eastern Time', ct.description)
   end
   
   def test_timezone    
-    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
+    ct = CountryTimezone.new('Europe/London', Rational(2059, 40), Rational(-5, 16))
     assert_kind_of(TimezoneProxy, ct.timezone)
     assert_equal('Europe/London', ct.timezone.identifier)
   end
   
   def test_description_or_friendly_idenfier_no_description
-    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
+    ct = CountryTimezone.new('Europe/London', Rational(2059, 40), Rational(-5, 16))
     assert_equal('London', ct.description_or_friendly_identifier)
   end
   
   def test_description_or_friendly_idenfier_description
-    ct = CountryTimezone.new('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time')
+    ct = CountryTimezone.new('America/New_York', Rational(48857, 1200), Rational(-266423, 3600), 'Eastern Time')
     assert_equal('Eastern Time', ct.description_or_friendly_identifier)
   end
   
   def test_equality_1
-    ct1 = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
-    ct2 = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
-    ct3 = CountryTimezone.new('Europe/London', 2059, 40, -5, 16, 'Description')
-    ct4 = CountryTimezone.new('Europe/LondonB', 2059, 40, -5, 16)
-    ct5 = CountryTimezone.new('Europe/London', 2060, 40, -5, 16)
-    ct6 = CountryTimezone.new('Europe/London', 2059, 40, -6, 16)
+    ct1 = CountryTimezone.new!('Europe/London', 2059, 40, -5, 16)
+    ct2 = CountryTimezone.new!('Europe/London', 2059, 40, -5, 16)
+    ct3 = CountryTimezone.new('Europe/London', Rational(2059, 40), Rational(-5, 16))
+    ct4 = CountryTimezone.new!('Europe/London', 2059, 40, -5, 16, 'Description')
+    ct5 = CountryTimezone.new!('Europe/LondonB', 2059, 40, -5, 16)
+    ct6 = CountryTimezone.new!('Europe/London', 2060, 40, -5, 16)
+    ct7 = CountryTimezone.new!('Europe/London', 2059, 40, -6, 16)
     
     assert_equal(true, ct1 == ct1)
     assert_equal(true, ct1 == ct2)
-    assert_equal(false, ct1 == ct3)
+    assert_equal(true, ct1 == ct3)
     assert_equal(false, ct1 == ct4)
     assert_equal(false, ct1 == ct5)
     assert_equal(false, ct1 == ct6)
+    assert_equal(false, ct1 == ct7)
   end
   
   def test_equality_2
-    ct1 = CountryTimezone.new('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time')
-    ct2 = CountryTimezone.new('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time2')
+    ct1 = CountryTimezone.new!('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time')
+    ct2 = CountryTimezone.new!('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time2')
     
     assert_equal(true, ct1 == ct1)
     assert_equal(false, ct1 == ct2)    
   end
   
   def test_equality_non_country_timezone
-    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
+    ct = CountryTimezone.new('Europe/London', Rational(2059, 40), Rational(-5, 16))
     
     assert_equal(false, ct == Object.new)
   end
   
   def test_eql_1
-    ct1 = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
-    ct2 = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
-    ct3 = CountryTimezone.new('Europe/London', 2059, 40, -5, 16, 'Description')
-    ct4 = CountryTimezone.new('Europe/LondonB', 2059, 40, -5, 16)
-    ct5 = CountryTimezone.new('Europe/London', 2060, 40, -5, 16)
-    ct6 = CountryTimezone.new('Europe/London', 2059, 40, -6, 16)
+    ct1 = CountryTimezone.new!('Europe/London', 2059, 40, -5, 16)
+    ct2 = CountryTimezone.new!('Europe/London', 2059, 40, -5, 16)
+    ct3 = CountryTimezone.new('Europe/London', Rational(2059, 40), Rational(-5, 16))
+    ct4 = CountryTimezone.new!('Europe/London', 2059, 40, -5, 16, 'Description')
+    ct5 = CountryTimezone.new!('Europe/LondonB', 2059, 40, -5, 16)
+    ct6 = CountryTimezone.new!('Europe/London', 2060, 40, -5, 16)
+    ct7 = CountryTimezone.new!('Europe/London', 2059, 40, -6, 16)
     
     assert_equal(true, ct1.eql?(ct1))
     assert_equal(true, ct1.eql?(ct2))
-    assert_equal(false, ct1.eql?(ct3))
+    assert_equal(true, ct1.eql?(ct3))
     assert_equal(false, ct1.eql?(ct4))
     assert_equal(false, ct1.eql?(ct5))
     assert_equal(false, ct1.eql?(ct6))
+    assert_equal(false, ct1.eql?(ct7))
   end
   
   def test_eql_2
-    ct1 = CountryTimezone.new('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time')
-    ct2 = CountryTimezone.new('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time2')
+    ct1 = CountryTimezone.new!('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time')
+    ct2 = CountryTimezone.new!('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time2')
     
     assert_equal(true, ct1.eql?(ct1))
     assert_equal(false, ct1.eql?(ct2))    
   end
   
   def test_eql_non_country_timezone
-    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
+    ct = CountryTimezone.new('Europe/London', Rational(2059, 40), Rational(-5, 16))
     
     assert_equal(false, ct.eql?(Object.new))
   end
   
-  def test_hash
-    ct1 = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
-    ct2 = CountryTimezone.new('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time')
+  def test_hash_new!
+    ct1 = CountryTimezone.new!('Europe/London', 2059, 40, -5, 16)
+    ct2 = CountryTimezone.new!('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time')
+    
+    assert_equal('Europe/London'.hash ^ 2059.hash ^ 40.hash ^ -5.hash ^ 16.hash ^ nil.hash, ct1.hash)
+    assert_equal('America/New_York'.hash ^ 48857.hash ^ 1200.hash ^ -266423.hash ^ 3600.hash ^ 'Eastern Time'.hash, ct2.hash)
+  end
+  
+  def test_hash_new
+    ct1 = CountryTimezone.new('Europe/London', Rational(2059, 40), Rational(-5, 16))
+    ct2 = CountryTimezone.new('America/New_York', Rational(48857, 1200), Rational(-266423, 3600), 'Eastern Time')
     
     assert_equal('Europe/London'.hash ^ 2059.hash ^ 40.hash ^ -5.hash ^ 16.hash ^ nil.hash, ct1.hash)
     assert_equal('America/New_York'.hash ^ 48857.hash ^ 1200.hash ^ -266423.hash ^ 3600.hash ^ 'Eastern Time'.hash, ct2.hash)

data/test/tc_data_source.rb

@@ -1,31 +1,9 @@
-#--
-# Copyright (c) 2012-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')
 require 'tmpdir'
 
 include TZInfo
 
-class TCDataSource < Test::Unit::TestCase
+class TCDataSource < Minitest::Test
   class InitDataSource < DataSource
   end
   
@@ -162,6 +140,26 @@ class TCDataSource < Test::Unit::TestCase
     end
   end
   
+  def test_set_standard_zoneinfo_explicit_alternate_iso3166
+    Dir.mktmpdir('tzinfo_test_dir') do |dir|
+      zoneinfo_dir = File.join(dir, 'zoneinfo')
+      tab_dir = File.join(dir, 'tab')
+      
+      FileUtils.mkdir(zoneinfo_dir)
+      FileUtils.mkdir(tab_dir)
+    
+      FileUtils.touch(File.join(zoneinfo_dir, 'zone.tab'))
+      
+      iso3166_file = File.join(tab_dir, 'iso3166.tab')
+      FileUtils.touch(iso3166_file)
+      
+      DataSource.set(:zoneinfo, zoneinfo_dir, iso3166_file)
+      data_source = DataSource.get
+      assert_kind_of(ZoneinfoDataSource, data_source)
+      assert_equal(zoneinfo_dir, data_source.zoneinfo_dir)
+    end
+  end
+  
   def test_set_standard_zoneinfo_search_not_found
     Dir.mktmpdir('tzinfo_test_dir') do |dir|
       ZoneinfoDataSource.search_path = [dir]
@@ -186,7 +184,7 @@ class TCDataSource < Test::Unit::TestCase
   
   def test_set_standard_zoneinfo_wrong_arg_count
     assert_raises(ArgumentError) do
-      DataSource.set(:zoneinfo, 1, 2)
+      DataSource.set(:zoneinfo, 1, 2, 3)
     end
     
     assert_kind_of(InitDataSource, DataSource.get)

data/test/tc_data_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 TCDataTimezone < Test::Unit::TestCase
+class TCDataTimezone < Minitest::Test
   
   class TestTimezoneInfo < TimezoneInfo
     attr_reader :utc
@@ -107,5 +85,15 @@ class TCDataTimezone < Test::Unit::TestCase
     assert_same(transitions, tz.transitions_up_to(utc_to, utc_from))
     assert_same(utc_to, tti.utc_to)
     assert_same(utc_from, tti.utc_from)
-  end    
+  end
+  
+  def test_canonical_identifier
+    tz = DataTimezone.new(TestTimezoneInfo.new('Test/Zone', nil, [], []))
+    assert_equal('Test/Zone', tz.canonical_identifier)    
+  end
+  
+  def test_canonical_zone
+    tz = DataTimezone.new(TestTimezoneInfo.new('Test/Zone', nil, [], []))
+    assert_same(tz, tz.canonical_zone)
+  end
 end