tzinfo 0.3.62 → 1.0.0

data/test/tc_data_source.rb

@@ -0,0 +1,194 @@
+#--
+# 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 InitDataSource < DataSource
+  end
+  
+  class DummyDataSource < DataSource
+  end
+  
+  def setup
+    @orig_data_source = DataSource.get
+    DataSource.set(InitDataSource.new)
+    @orig_search_path = ZoneinfoDataSource.search_path.clone
+  end
+  
+  def teardown
+    DataSource.set(@orig_data_source)
+    ZoneinfoDataSource.search_path = @orig_search_path
+  end
+  
+  def test_get
+    data_source = DataSource.get
+    assert_kind_of(InitDataSource, data_source)
+  end
+  
+  def test_get_default_ruby_only    
+    code = <<-EOF
+      require 'tmpdir'
+      
+      begin
+        Dir.mktmpdir('tzinfo_test_dir') do |dir|
+          TZInfo::ZoneinfoDataSource.search_path = [dir]
+          
+          puts TZInfo::DataSource.get.class
+        end
+      rescue Exception => e
+        puts "Unexpected exception: \#{e}"
+      end
+    EOF
+    
+    assert_sub_process_returns(['TZInfo::RubyDataSource'], code, [TZINFO_TEST_DATA_DIR])
+  end
+  
+  def test_get_default_zoneinfo_only
+    code = <<-EOF
+      require 'tmpdir'
+      
+      begin
+        Dir.mktmpdir('tzinfo_test_dir') do |dir|
+          TZInfo::ZoneinfoDataSource.search_path = [dir, '#{TZINFO_TEST_ZONEINFO_DIR}']
+          
+          puts TZInfo::DataSource.get.class
+          puts TZInfo::DataSource.get.zoneinfo_dir
+        end
+      rescue Exception => e
+        puts "Unexpected exception: \#{e}"
+      end
+    EOF
+    
+    assert_sub_process_returns(
+      ['TZInfo::ZoneinfoDataSource', TZINFO_TEST_ZONEINFO_DIR], 
+      code)
+  end
+  
+  def test_get_default_ruby_and_zoneinfo
+    code = <<-EOF
+      begin
+        TZInfo::ZoneinfoDataSource.search_path = ['#{TZINFO_TEST_ZONEINFO_DIR}']
+          
+        puts TZInfo::DataSource.get.class
+      rescue Exception => e
+        puts "Unexpected exception: \#{e}"
+      end
+    EOF
+    
+    assert_sub_process_returns(['TZInfo::RubyDataSource'], code, [TZINFO_TEST_DATA_DIR])
+  end
+  
+  def test_get_default_no_data
+    code = <<-EOF
+      require 'tmpdir'
+      
+      begin
+        Dir.mktmpdir('tzinfo_test_dir') do |dir|
+          TZInfo::ZoneinfoDataSource.search_path = [dir]
+          
+          begin
+            data_source = TZInfo::DataSource.get
+            puts "No exception raised, returned \#{data_source} instead"
+          rescue Exception => e
+            puts e.class
+          end
+        end
+      rescue Exception => e
+        puts "Unexpected exception: \#{e}"
+      end
+    EOF
+    
+    assert_sub_process_returns(['TZInfo::DataSourceNotFound'], code)
+  end
+  
+  def test_set_instance
+    DataSource.set(DummyDataSource.new)
+    data_source = DataSource.get
+    assert_kind_of(DummyDataSource, data_source)
+  end
+  
+  def test_set_standard_ruby
+    DataSource.set(:ruby)
+    data_source = DataSource.get
+    assert_kind_of(RubyDataSource, data_source)
+  end
+  
+  def test_set_standard_zoneinfo_search
+    Dir.mktmpdir('tzinfo_test_dir') do |dir|
+      FileUtils.touch(File.join(dir, 'iso3166.tab'))
+      FileUtils.touch(File.join(dir, 'zone.tab'))
+              
+      ZoneinfoDataSource.search_path = [dir]
+      
+      DataSource.set(:zoneinfo)
+      data_source = DataSource.get
+      assert_kind_of(ZoneinfoDataSource, data_source)
+      assert_equal(dir, data_source.zoneinfo_dir)      
+    end
+  end
+  
+  def test_set_standard_zoneinfo_explicit
+    Dir.mktmpdir('tzinfo_test_dir') do |dir|
+      FileUtils.touch(File.join(dir, 'iso3166.tab'))
+      FileUtils.touch(File.join(dir, 'zone.tab'))      
+      
+      DataSource.set(:zoneinfo, dir)
+      data_source = DataSource.get
+      assert_kind_of(ZoneinfoDataSource, data_source)
+      assert_equal(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]
+      
+      assert_raises(ZoneinfoDirectoryNotFound) do
+        DataSource.set(:zoneinfo)
+      end
+      
+      assert_kind_of(InitDataSource, DataSource.get)
+    end
+  end
+  
+  def test_set_standard_zoneinfo_explicit_invalid
+    Dir.mktmpdir('tzinfo_test_dir') do |dir|
+      assert_raises(InvalidZoneinfoDirectory) do
+        DataSource.set(:zoneinfo, dir)
+      end
+      
+      assert_kind_of(InitDataSource, DataSource.get)      
+    end
+  end
+  
+  def test_set_standard_zoneinfo_wrong_arg_count
+    assert_raises(ArgumentError) do
+      DataSource.set(:zoneinfo, 1, 2)
+    end
+    
+    assert_kind_of(InitDataSource, DataSource.get)
+  end
+end

data/test/tc_data_timezone.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
 

data/test/tc_data_timezone_info.rb

@@ -1,282 +1,40 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo'
+#--
+# Copyright (c) 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 TCDataTimezoneInfo < Test::Unit::TestCase
   
   def test_identifier
-    dti = DataTimezoneInfo.new('Test/Zone')
-    assert_equal('Test/Zone', dti.identifier)
-  end
-
-  def test_offset
-    dti = DataTimezoneInfo.new('Test/Zone')
-    
-    # Test nothing raised
-    dti.offset :o1, -18000, 3600, :TEST
-  end
-  
-  def test_offset_already_defined
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, 3600, 0, :TEST
-    dti.offset :o2, 1800, 0, :TEST2
-    
-    assert_raises(ArgumentError) { dti.offset :o1, 3600, 3600, :TESTD }
-  end
-  
-  def test_transition_time
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, -18000, 3600, :TEST
-    
-    # Test nothing raised
-    dti.transition 2006, 6, :o1, 1149368400
-  end
-  
-  def test_transition_datetime
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, -18000, 3600, :TEST
-    
-    # Test nothing raised
-    dti.transition 2006, 6, :o1, 19631123, 8
-  end
-  
-  def test_transition_invalid_offset
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, -18000, 3600, :TEST
-    
-    dti.transition 2006, 6, :o1, 1149368400
-    
-    assert_raises(ArgumentError) { dti.transition 2006, 6, :o2, 1149454800 }    
-  end
-  
-  def test_transition_no_offsets
-    dti = DataTimezoneInfo.new('Test/Zone')
-    
-    assert_raises(ArgumentError) { dti.transition 2006, 6, :o1, 1149368400 }
-  end
-  
-  def test_transition_invalid_order_month
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, -18000, 3600, :TEST
-    
-    dti.transition 2006, 6, :o1, 1149368400
-    
-    assert_raises(ArgumentError) { dti.transition 2006, 5, :o2, 1146690000 }
-  end
-  
-  def test_transition_invalid_order_year
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, -18000, 3600, :TEST
-    
-    dti.transition 2006, 6, :o1, 1149368400
-    
-    assert_raises(ArgumentError) { dti.transition 2005, 7, :o2, 1120424400 }
-  end   
-  
-  def test_period_for_utc
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, -17900,    0, :TESTLMT
-    dti.offset :o2, -18000, 3600, :TESTD
-    dti.offset :o3, -18000,    0, :TESTS
-    dti.offset :o4, -21600, 3600, :TESTD
-    
-    dti.transition 2000,  4, :o2, Time.utc(2000, 4,1,1,0,0).to_i
-    dti.transition 2000, 10, :o3, Time.utc(2000,10,1,1,0,0).to_i
-    dti.transition 2001,  3, :o2, 58847269, 24                    # (2001, 3,1,1,0,0)
-    dti.transition 2001,  4, :o4, Time.utc(2001, 4,1,1,0,0).to_i
-    dti.transition 2001, 10, :o3, Time.utc(2001,10,1,1,0,0).to_i
-    dti.transition 2002, 10, :o3, Time.utc(2002,10,1,1,0,0).to_i
-    dti.transition 2003,  2, :o2, Time.utc(2003, 2,1,1,0,0).to_i
-    dti.transition 2003,  3, :o3, Time.utc(2003, 3,1,1,0,0).to_i
-    
-    o1 = TimezoneOffsetInfo.new(-17900, 0,    :TESTLMT)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :TESTD)
-    o3 = TimezoneOffsetInfo.new(-18000, 0,    :TESTS)
-    o4 = TimezoneOffsetInfo.new(-21600, 3600, :TESTD)
-    
-    t1 = TimezoneTransitionInfo.new(o2, o1, Time.utc(2000, 4,1,1,0,0).to_i)
-    t2 = TimezoneTransitionInfo.new(o3, o2, Time.utc(2000,10,1,1,0,0).to_i)
-    t3 = TimezoneTransitionInfo.new(o2, o3, Time.utc(2001, 3,1,1,0,0).to_i)
-    t4 = TimezoneTransitionInfo.new(o4, o2, Time.utc(2001, 4,1,1,0,0).to_i)
-    t5 = TimezoneTransitionInfo.new(o3, o4, Time.utc(2001,10,1,1,0,0).to_i)
-    t6 = TimezoneTransitionInfo.new(o3, o3, Time.utc(2002,10,1,1,0,0).to_i)
-    t7 = TimezoneTransitionInfo.new(o2, o3, Time.utc(2003, 2,1,1,0,0).to_i)
-    t8 = TimezoneTransitionInfo.new(o3, o2, Time.utc(2003, 3,1,1,0,0).to_i)     
-    
-    assert_equal(TimezonePeriod.new(nil, t1), dti.period_for_utc(DateTime.new(1960, 1,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(nil, t1), dti.period_for_utc(DateTime.new(1999,12,1,0, 0, 0)))
-    assert_equal(TimezonePeriod.new(nil, t1), dti.period_for_utc(Time.utc(    2000, 4,1,0,59,59)))
-    assert_equal(TimezonePeriod.new(t1, t2),  dti.period_for_utc(DateTime.new(2000, 4,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(t1, t2),  dti.period_for_utc(Time.utc(    2000,10,1,0,59,59).to_i))      
-    assert_equal(TimezonePeriod.new(t2, t3),  dti.period_for_utc(Time.utc(    2000,10,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(t2, t3),  dti.period_for_utc(Time.utc(    2001, 3,1,0,59,59)))
-    assert_equal(TimezonePeriod.new(t3, t4),  dti.period_for_utc(Time.utc(    2001, 3,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(t3, t4),  dti.period_for_utc(Time.utc(    2001, 4,1,0,59,59)))
-    assert_equal(TimezonePeriod.new(t4, t5),  dti.period_for_utc(Time.utc(    2001, 4,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(t4, t5),  dti.period_for_utc(Time.utc(    2001,10,1,0,59,59)))
-    assert_equal(TimezonePeriod.new(t5, t6),  dti.period_for_utc(Time.utc(    2001,10,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(t5, t6),  dti.period_for_utc(Time.utc(    2002, 2,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(t5, t6),  dti.period_for_utc(Time.utc(    2002,10,1,0,59,59)))
-    assert_equal(TimezonePeriod.new(t6, t7),  dti.period_for_utc(Time.utc(    2002,10,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(t6, t7),  dti.period_for_utc(Time.utc(    2003, 2,1,0,59,59)))
-    assert_equal(TimezonePeriod.new(t7, t8),  dti.period_for_utc(Time.utc(    2003, 2,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(t7, t8),  dti.period_for_utc(Time.utc(    2003, 3,1,0,59,59)))
-    assert_equal(TimezonePeriod.new(t8, nil), dti.period_for_utc(Time.utc(    2003, 3,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(t8, nil), dti.period_for_utc(Time.utc(    2004, 1,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(t8, nil), dti.period_for_utc(DateTime.new(2050, 1,1,1, 0, 0)))        
-  end
-    
-  def test_period_for_utc_no_transitions
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, -17900, 0, :TESTLMT
-    dti.offset :o2, -18000, 0, :TEST
-    
-    o1 = TimezoneOffsetInfo.new(-17900, 0, :TESTLMT)
-    
-    assert_equal(TimezonePeriod.new(nil, nil, o1), dti.period_for_utc(DateTime.new(2005,1,1,0,0,0)))
-    assert_equal(TimezonePeriod.new(nil, nil, o1), dti.period_for_utc(Time.utc(2005,1,1,0,0,0)))
-    assert_equal(TimezonePeriod.new(nil, nil, o1), dti.period_for_utc(Time.utc(2005,1,1,0,0,0).to_i))       
-  end
-    
-  def test_period_for_utc_no_offsets
-    dti = DataTimezoneInfo.new('Test/Zone')
-    
-    assert_raises(NoOffsetsDefined) { dti.period_for_utc(DateTime.new(2005,1,1,0,0,0)) }
-    assert_raises(NoOffsetsDefined) { dti.period_for_utc(Time.utc(2005,1,1,0,0,0)) }
-    assert_raises(NoOffsetsDefined) { dti.period_for_utc(Time.utc(2005,1,1,0,0,0).to_i) }
+    ti = DataTimezoneInfo.new('Test/Zone')
+    assert_equal('Test/Zone', ti.identifier)
   end
   
-  def test_periods_for_local
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, -17900,    0, :TESTLMT
-    dti.offset :o2, -18000, 3600, :TESTD
-    dti.offset :o3, -18000,    0, :TESTS
-    dti.offset :o4, -21600, 3600, :TESTD
-    
-    dti.transition 2000,  4, :o2, 58839277, 24                   # 2000,4,2,1,0,0
-    dti.transition 2000, 10, :o3, Time.utc(2000,10,2,1,0,0).to_i
-    dti.transition 2001,  3, :o2, Time.utc(2001, 3,2,1,0,0).to_i
-    dti.transition 2001,  4, :o4, Time.utc(2001, 4,2,1,0,0).to_i
-    dti.transition 2001, 10, :o3, Time.utc(2001,10,2,1,0,0).to_i
-    dti.transition 2002, 10, :o3, 58861189, 24                   # 2002,10,2,1,0,0
-    dti.transition 2003,  2, :o2, Time.utc(2003, 2,2,1,0,0).to_i
-    
-    o1 = TimezoneOffsetInfo.new(-17900,    0, :TESTLMT)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :TESTD)
-    o3 = TimezoneOffsetInfo.new(-18000,    0, :TESTS)
-    o4 = TimezoneOffsetInfo.new(-21600, 3600, :TESTD)
-    
-    t1 = TimezoneTransitionInfo.new(o2, o1, Time.utc(2000, 4,2,1,0,0).to_i)
-    t2 = TimezoneTransitionInfo.new(o3, o2, Time.utc(2000,10,2,1,0,0).to_i)
-    t3 = TimezoneTransitionInfo.new(o2, o3, Time.utc(2001, 3,2,1,0,0).to_i)
-    t4 = TimezoneTransitionInfo.new(o4, o2, Time.utc(2001, 4,2,1,0,0).to_i)
-    t5 = TimezoneTransitionInfo.new(o3, o4, Time.utc(2001,10,2,1,0,0).to_i)
-    t6 = TimezoneTransitionInfo.new(o3, o3, Time.utc(2002,10,2,1,0,0).to_i)
-    t7 = TimezoneTransitionInfo.new(o2, o3, Time.utc(2003, 2,2,1,0,0).to_i)
-    
-    
-    assert_equal([TimezonePeriod.new(nil, t1)], dti.periods_for_local(DateTime.new(1960, 1, 1, 1, 0, 0)))
-    assert_equal([TimezonePeriod.new(nil, t1)], dti.periods_for_local(DateTime.new(1999,12, 1, 0, 0, 0)))
-    assert_equal([TimezonePeriod.new(nil, t1)], dti.periods_for_local(Time.utc(    2000, 1, 1,10, 0, 0)))
-    assert_equal([TimezonePeriod.new(nil, t1)], dti.periods_for_local(Time.utc(    2000, 4, 1,20, 1,39)))
-    assert_equal([],                            dti.periods_for_local(Time.utc(    2000, 4, 1,20, 1,40)))
-    assert_equal([],                            dti.periods_for_local(Time.utc(    2000, 4, 1,20,59,59)))
-    assert_equal([TimezonePeriod.new(t1,  t2)], dti.periods_for_local(Time.utc(    2000, 4, 1,21, 0, 0)))
-    assert_equal([TimezonePeriod.new(t1,  t2)], dti.periods_for_local(DateTime.new(2000,10, 1,19,59,59)))
-    assert_equal([TimezonePeriod.new(t1,  t2),
-                  TimezonePeriod.new(t2,  t3)], dti.periods_for_local(Time.utc(    2000,10, 1,20, 0, 0).to_i))   
-    assert_equal([TimezonePeriod.new(t1,  t2),
-                  TimezonePeriod.new(t2,  t3)], dti.periods_for_local(DateTime.new(2000,10, 1,20,59,59)))
-    assert_equal([TimezonePeriod.new(t2,  t3)], dti.periods_for_local(Time.utc(    2000,10, 1,21, 0, 0)))
-    assert_equal([TimezonePeriod.new(t2,  t3)], dti.periods_for_local(Time.utc(    2001, 3, 1,19,59,59)))
-    assert_equal([],                            dti.periods_for_local(Time.utc(    2001, 3, 1,20, 0, 0)))
-    assert_equal([],                            dti.periods_for_local(DateTime.new(2001, 3, 1,20, 30, 0)))
-    assert_equal([],                            dti.periods_for_local(Time.utc(    2001, 3, 1,20,59,59).to_i))
-    assert_equal([TimezonePeriod.new(t3,  t4)], dti.periods_for_local(Time.utc(    2001, 3, 1,21, 0, 0)))
-    assert_equal([TimezonePeriod.new(t3,  t4)], dti.periods_for_local(Time.utc(    2001, 4, 1,19,59,59)))
-    assert_equal([TimezonePeriod.new(t3,  t4),
-                  TimezonePeriod.new(t4,  t5)], dti.periods_for_local(DateTime.new(2001, 4, 1,20, 0, 0)))
-    assert_equal([TimezonePeriod.new(t3,  t4),
-                  TimezonePeriod.new(t4,  t5)], dti.periods_for_local(Time.utc(    2001, 4, 1,20,59,59)))                  
-    assert_equal([TimezonePeriod.new(t4,  t5)], dti.periods_for_local(Time.utc(    2001, 4, 1,21, 0, 0)))
-    assert_equal([TimezonePeriod.new(t4,  t5)], dti.periods_for_local(Time.utc(    2001,10, 1,19,59,59)))
-    assert_equal([TimezonePeriod.new(t5,  t6)], dti.periods_for_local(Time.utc(    2001,10, 1,20, 0, 0)))
-    assert_equal([TimezonePeriod.new(t5,  t6)], dti.periods_for_local(Time.utc(    2002, 2, 1,20, 0, 0)))
-    assert_equal([TimezonePeriod.new(t5,  t6)], dti.periods_for_local(Time.utc(    2002,10, 1,19,59,59)))
-    assert_equal([TimezonePeriod.new(t6,  t7)], dti.periods_for_local(Time.utc(    2002,10, 1,20, 0, 0)))
-    assert_equal([TimezonePeriod.new(t6,  t7)], dti.periods_for_local(Time.utc(    2003, 2, 1,19,59,59)))
-    assert_equal([],                            dti.periods_for_local(Time.utc(    2003, 2, 1,20, 0, 0)))
-    assert_equal([],                            dti.periods_for_local(Time.utc(    2003, 2, 1,20,59,59)))
-    assert_equal([TimezonePeriod.new(t7, nil)], dti.periods_for_local(Time.utc(    2003, 2, 1,21, 0, 0)))
-    assert_equal([TimezonePeriod.new(t7, nil)], dti.periods_for_local(Time.utc(    2004, 2, 1,20, 0, 0)))
-    assert_equal([TimezonePeriod.new(t7, nil)], dti.periods_for_local(DateTime.new(2040, 2, 1,20, 0, 0)))
-  end
-      
-  def test_periods_for_local_warsaw
-    dti = DataTimezoneInfo.new('Test/Europe/Warsaw')
-    dti.offset :o1, 5040,    0, :LMT
-    dti.offset :o2, 5040,    0, :WMT
-    dti.offset :o3, 3600,    0, :CET
-    dti.offset :o4, 3600, 3600, :CEST
-    
-    dti.transition 1879, 12, :o2, 288925853, 120  # 1879,12,31,22,36,0
-    dti.transition 1915,  8, :o3, 290485733, 120  # 1915, 8, 4,22,36,0
-    dti.transition 1916,  4, :o4,  29051813,  12  # 1916, 4,30,22, 0,0
-    
-    o1 = TimezoneOffsetInfo.new(5040,    0, :LMT)
-    o2 = TimezoneOffsetInfo.new(5040,    0, :WMT)
-    o3 = TimezoneOffsetInfo.new(3600,    0, :CET)
-    o4 = TimezoneOffsetInfo.new(3600, 3600, :CEST)
-    
-    t1 = TimezoneTransitionInfo.new(o2, o1, 288925853, 120)
-    t2 = TimezoneTransitionInfo.new(o3, o2, 290485733, 120)
-    t3 = TimezoneTransitionInfo.new(o4, o3,  29051813,  12)
-    
-    assert_equal([TimezonePeriod.new(t1, t2),
-                  TimezonePeriod.new(t2, t3)], dti.periods_for_local(DateTime.new(1915,8,4,23,40,0)))      
-  end
-    
-  def test_periods_for_local_boundary
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, -3600, 0, :TESTD
-    dti.offset :o2, -3600, 0, :TESTS
-    
-    dti.transition 2000, 7, :o2, Time.utc(2000,7,1,0,0,0).to_i
-    
-    o1 = TimezoneOffsetInfo.new(-3600, 0, :TESTD)
-    o2 = TimezoneOffsetInfo.new(-3600, 0, :TESTS)
-    
-    t1 = TimezoneTransitionInfo.new(o2, o1, Time.utc(2000,7,1,0,0,0).to_i)
-                
-    # 2000-07-01 00:00:00 UTC is 2000-06-30 23:00:00 UTC-1
-    # hence to find periods for local times between 2000-06-30 23:00:00
-    # and 2000-07-01 00:00:00 a search has to be carried out in the next half
-    # year to the one containing the date we are looking for
-    
-    assert_equal([TimezonePeriod.new(nil, t1)], dti.periods_for_local(Time.utc(2000,6,30,22,59,59)))
-    assert_equal([TimezonePeriod.new(t1, nil)], dti.periods_for_local(Time.utc(2000,6,30,23, 0, 0)))
-    assert_equal([TimezonePeriod.new(t1, nil)], dti.periods_for_local(Time.utc(2000,7, 1, 0, 0, 0)))    
-  end
-    
-  def test_periods_for_local_no_transitions
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, -17900, 0, :TESTLMT
-    dti.offset :o2, -18000, 0, :TEST
-    
-    o1 = TimezoneOffsetInfo.new(-17900, 0, :TESTLMT)
-    
-    assert_equal([TimezonePeriod.new(nil, nil, o1)], dti.periods_for_local(DateTime.new(2005,1,1,0,0,0)))
-    assert_equal([TimezonePeriod.new(nil, nil, o1)], dti.periods_for_local(Time.utc(2005,1,1,0,0,0)))
-    assert_equal([TimezonePeriod.new(nil, nil, o1)], dti.periods_for_local(Time.utc(2005,1,1,0,0,0).to_i))       
-  end
-    
-  def test_periods_for_local_no_offsets
-    dti = DataTimezoneInfo.new('Test/Zone')
-    
-    assert_raises(NoOffsetsDefined) { dti.periods_for_local(DateTime.new(2005,1,1,0,0,0)) }
-    assert_raises(NoOffsetsDefined) { dti.periods_for_local(Time.utc(2005,1,1,0,0,0)) }
-    assert_raises(NoOffsetsDefined) { dti.periods_for_local(Time.utc(2005,1,1,0,0,0).to_i) }
+  def test_construct_timezone
+    ti = DataTimezoneInfo.new('Test/Zone')
+    tz = ti.create_timezone
+    assert_kind_of(DataTimezone, tz)
+    assert_equal('Test/Zone', tz.identifier)
   end
 end

data/test/tc_info_timezone.rb

@@ -1,6 +1,26 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo'
+#--
+# 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
 

data/test/tc_linked_timezone.rb

@@ -1,7 +1,26 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require File.join(File.dirname(__FILE__), 'test_utils')
-require 'tzinfo'
+#--
+# 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
 

data/test/tc_linked_timezone_info.rb

@@ -1,6 +1,26 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo'
+#--
+# 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
 
@@ -15,4 +35,11 @@ class TCLinkedTimezoneInfo < Test::Unit::TestCase
     lti = LinkedTimezoneInfo.new('Test/Zone', 'Test/Linked')
     assert_equal('Test/Linked', lti.link_to_identifier)
   end
+  
+  def test_construct_timezone
+    lti = LinkedTimezoneInfo.new('Test/Zone', 'Europe/London')
+    tz = lti.create_timezone
+    assert_kind_of(LinkedTimezone, tz)
+    assert_equal('Test/Zone', tz.identifier)
+  end
 end

data/test/tc_offset_rationals.rb

@@ -1,6 +1,26 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo'
+#--
+# 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