tzinfo 0.3.62 → 1.0.0

data/test/tc_timezone.rb

@@ -1,8 +1,26 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-$:.unshift File.join(File.dirname(__FILE__), "in_load_path")
-require 'test/unit'
-require File.join(File.dirname(__FILE__), 'test_utils')
-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
 
@@ -45,10 +63,13 @@ class TCTimezone < Test::Unit::TestCase
   
   def setup
     @orig_default_dst = Timezone.default_dst
+    @orig_data_source = DataSource.get
+    Timezone.send :class_variable_set, :@@loaded_zones, {}
   end
   
   def teardown
     Timezone.default_dst = @orig_default_dst
+    DataSource.set(@orig_data_source)
   end
   
   def test_default_dst_initial_value
@@ -76,7 +97,13 @@ class TCTimezone < Test::Unit::TestCase
   def test_get_valid_2
     tz = Timezone.get('UTC')
     
-    assert_kind_of(LinkedTimezone, tz)    
+    # ZoneinfoDataSource doesn't return LinkedTimezoneInfo for any timezone.
+    if DataSource.get.load_timezone_info('UTC').kind_of?(LinkedTimezoneInfo)
+      assert_kind_of(LinkedTimezone, tz)  
+    else
+      assert_kind_of(DataTimezone, tz)
+    end
+    
     assert_equal('UTC', tz.identifier)
   end
   
@@ -98,29 +125,13 @@ class TCTimezone < Test::Unit::TestCase
   end
   
   def test_get_invalid
-    assert_raises(InvalidTimezoneIdentifier) { Timezone.get('../definitions/UTC') }
-  end
-
-  def test_get_directory_traversal
-    assert_raises(InvalidTimezoneIdentifier) { Timezone.get("foo\n/../../../payload") }
+    assert_raises(InvalidTimezoneIdentifier) { Timezone.get('../Definitions/UTC') }
   end
   
   def test_get_nil
     assert_raises(InvalidTimezoneIdentifier) { Timezone.get(nil) }
   end
   
-  def test_get_plus
-    tz = Timezone.get('Etc/GMT+1')
-    
-    assert_equal('Etc/GMT+1', tz.identifier)
-  end
-  
-  def test_get_minus
-    tz = Timezone.get('Etc/GMT-1')
-    
-    assert_equal('Etc/GMT-1', tz.identifier)
-  end
-  
   def test_get_case    
     Timezone.get('Europe/Prague')
     assert_raises(InvalidTimezoneIdentifier) { Timezone.get('Europe/prague') }
@@ -153,15 +164,10 @@ class TCTimezone < Test::Unit::TestCase
     end
   end
   
-  # Disable test in Ruby 1.9 and Ruby 2.0. See:
-  # http://groups.google.com/group/ruby-talk-google/browse_thread/thread/170a7205555cedfc
-  # It doesn't appear to be possible to require a file from the load path in Ruby 1.9.
-  if RUBY_VERSION !~ /\A(1\.9|2)\./
-    def test_get_tainted_not_loaded
-      safe_test do
-        tz = Timezone.get('Europe/Amsterdam'.taint)
-        assert_equal('Europe/Amsterdam', tz.identifier)
-      end
+  def test_get_tainted_not_previously_loaded
+    safe_test do
+      tz = Timezone.get('Europe/Amsterdam'.taint)
+      assert_equal('Europe/Amsterdam', tz.identifier)
     end
   end
   
@@ -204,35 +210,35 @@ class TCTimezone < Test::Unit::TestCase
   
   def test_all
     all = Timezone.all
-    expected = Indexes::Timezones.timezones.collect {|identifier| Timezone.get_proxy(identifier)}
+    expected = DataSource.get.timezone_identifiers.collect {|identifier| Timezone.get_proxy(identifier)}
     assert_equal(expected, all)
   end
   
   def test_all_identifiers
     all = Timezone.all_identifiers
-    assert_equal(Indexes::Timezones.timezones, all)
+    assert_equal(DataSource.get.timezone_identifiers, all)
   end
   
   def test_all_data_zones
     all_data = Timezone.all_data_zones
-    expected = Indexes::Timezones.data_timezones.collect {|identifier| Timezone.get_proxy(identifier)}
+    expected = DataSource.get.data_timezone_identifiers.collect {|identifier| Timezone.get_proxy(identifier)}
     assert_equal(expected, all_data)
   end
   
   def test_all_data_zone_identifiers
     all_data = Timezone.all_data_zone_identifiers
-    assert_equal(Indexes::Timezones.data_timezones, all_data)
+    assert_equal(DataSource.get.data_timezone_identifiers, all_data)
   end
   
   def test_all_linked_zones
     all_linked = Timezone.all_linked_zones
-    expected = Indexes::Timezones.linked_timezones.collect {|identifier| Timezone.get_proxy(identifier)}
+    expected = DataSource.get.linked_timezone_identifiers.collect {|identifier| Timezone.get_proxy(identifier)}
     assert_equal(expected, all_linked)
   end
   
   def test_all_linked_zone_identifiers
     all_linked = Timezone.all_linked_zone_identifiers
-    assert_equal(Indexes::Timezones.linked_timezones, all_linked)
+    assert_equal(DataSource.get.linked_timezone_identifiers, all_linked)
   end
   
   def test_all_country_zones
@@ -330,8 +336,10 @@ class TCTimezone < Test::Unit::TestCase
   def test_period_for_local
     dt = DateTime.new(2005,2,18,16,24,23)
     dt2 = DateTime.new(2005,2,18,16,24,23).new_offset(Rational(5,24))
+    dt3 = DateTime.new(2005,2,18,16,24,23 + Rational(789, 1000))
     t = Time.utc(2005,2,18,16,24,23)
     t2 = Time.local(2005,2,18,16,24,23)
+    t3 = Time.utc(2005,2,18,16,24,23,789000)
     ts = t.to_i
     
     o1 = TimezoneOffsetInfo.new(0, 0, :GMT)
@@ -343,15 +351,18 @@ class TCTimezone < Test::Unit::TestCase
     
     dt_period = TestTimezone.new('Europe/London', nil, [period], dt).period_for_local(dt)
     dt2_period = TestTimezone.new('Europe/London', nil, [period], dt2).period_for_local(dt2)
+    dt3_period = TestTimezone.new('Europe/London', nil, [period], dt3).period_for_local(dt3)
     t_period = TestTimezone.new('Europe/London', nil, [period], t).period_for_local(t)
     t2_period = TestTimezone.new('Europe/London', nil, [period], t2).period_for_local(t2)
-    ts_period = TestTimezone.new('Europe/London', nil, [period], ts).period_for_local(ts)        
+    t3_period = TestTimezone.new('Europe/London', nil, [period], t3).period_for_local(t3)
+    ts_period = TestTimezone.new('Europe/London', nil, [period], ts).period_for_local(ts)
     
     assert_equal(period, dt_period)
     assert_equal(period, dt2_period)
     assert_equal(period, t_period)
     assert_equal(period, t2_period)
-    assert_equal(period, ts_period)    
+    assert_equal(period, t3_period)
+    assert_equal(period, ts_period)
   end
   
   def test_period_for_local_invalid
@@ -374,16 +385,22 @@ class TCTimezone < Test::Unit::TestCase
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(t2, t3)
     
-    dt = DateTime.new(2004,10,31,1, 0,0)
+    dt = DateTime.new(2004,10,31,1,0,0)
+    dt2 = DateTime.new(2004,10,31,1,0,Rational(555,1000))
     t = Time.utc(2004,10,31,1,30,0)
+    t2 = Time.utc(2004,10,31,1,30,0,555000)
     i = Time.utc(2004,10,31,1,59,59).to_i
     
     dt_tz = TestTimezone.new('America/New_York', nil, [p1, p2], dt)
+    dt2_tz = TestTimezone.new('America/New_York', nil, [p1, p2], dt2)
     t_tz = TestTimezone.new('America/New_York', nil, [p1, p2], t)
+    t2_tz = TestTimezone.new('America/New_York', nil, [p1, p2], t2)
     i_tz = TestTimezone.new('America/New_York', nil, [p1, p2], i)
         
     assert_raises(AmbiguousTime) { dt_tz.period_for_local(dt) }
+    assert_raises(AmbiguousTime) { dt2_tz.period_for_local(dt2) }
     assert_raises(AmbiguousTime) { t_tz.period_for_local(t) }
+    assert_raises(AmbiguousTime) { t2_tz.period_for_local(t2) }
     assert_raises(AmbiguousTime) { i_tz.period_for_local(i) }
   end
   
@@ -399,15 +416,21 @@ class TCTimezone < Test::Unit::TestCase
     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)
+    t2 = Time.utc(2004,4,4,2,30,0,987000)
     i = Time.utc(2004,4,4,2,59,59).to_i
     
     dt_tz = TestTimezone.new('America/New_York', nil, [], dt)
+    dt2_tz = TestTimezone.new('America/New_York', nil, [], dt2)
     t_tz = TestTimezone.new('America/New_York', nil, [], t)
-    i_tz = TestTimezone.new('America/New_York', nil, [], i)
+    t2_tz = TestTimezone.new('America/New_York', nil, [], t2)
+    i_tz = TestTimezone.new('America/New_York', nil, [], i)    
         
     assert_raises(PeriodNotFound) { dt_tz.period_for_local(dt) }
+    assert_raises(PeriodNotFound) { dt2_tz.period_for_local(dt2) }
     assert_raises(PeriodNotFound) { t_tz.period_for_local(t) }
+    assert_raises(PeriodNotFound) { t2_tz.period_for_local(t2) }
     assert_raises(PeriodNotFound) { i_tz.period_for_local(i) }
   end
   
@@ -579,8 +602,12 @@ class TCTimezone < Test::Unit::TestCase
   def test_utc_to_local
     dt = DateTime.new(2005,6,18,16,24,23)
     dt2 = DateTime.new(2005,6,18,16,24,23).new_offset(Rational(5,24))
+    dtu = DateTime.new(2005,6,18,16,24,23 + Rational(567,1000))
+    dtu2 = DateTime.new(2005,6,18,16,24,23 + Rational(567,1000)).new_offset(Rational(5,24))
     t = Time.utc(2005,6,18,16,24,23)
     t2 = Time.local(2005,6,18,16,24,23)
+    tu = Time.utc(2005,6,18,16,24,23,567000)
+    tu2 = Time.local(2005,6,18,16,24,23,567000)
     ts = t.to_i
     
     o1 = TimezoneOffsetInfo.new(0, 0, :GMT)
@@ -590,18 +617,26 @@ class TCTimezone < Test::Unit::TestCase
       TimezoneTransitionInfo.new(o2, o1, 1111885200),
       TimezoneTransitionInfo.new(o1, o2, 1130634000))
         
-    assert_equal(DateTime.new(2005,6,18,17,24,23), TestTimezone.new('Europe/London', period, [], dt).utc_to_local(dt))   
-    assert_equal(DateTime.new(2005,6,18,17,24,23), TestTimezone.new('Europe/London', period, [], dt2).utc_to_local(dt2))    
+    assert_equal(DateTime.new(2005,6,18,17,24,23), TestTimezone.new('Europe/London', period, [], dt).utc_to_local(dt))
+    assert_equal(DateTime.new(2005,6,18,17,24,23), TestTimezone.new('Europe/London', period, [], dt2).utc_to_local(dt2))
+    assert_equal(DateTime.new(2005,6,18,17,24,23 + Rational(567,1000)), TestTimezone.new('Europe/London', period, [], dtu).utc_to_local(dtu))
+    assert_equal(DateTime.new(2005,6,18,17,24,23 + Rational(567,1000)), TestTimezone.new('Europe/London', period, [], dtu2).utc_to_local(dtu2))
     assert_equal(Time.utc(2005,6,18,17,24,23), TestTimezone.new('Europe/London', period, [], t).utc_to_local(t))
     assert_equal(Time.utc(2005,6,18,17,24,23), TestTimezone.new('Europe/London', period, [], t2).utc_to_local(t2))
+    assert_equal(Time.utc(2005,6,18,17,24,23,567000), TestTimezone.new('Europe/London', period, [], tu).utc_to_local(tu))
+    assert_equal(Time.utc(2005,6,18,17,24,23,567000), TestTimezone.new('Europe/London', period, [], tu2).utc_to_local(tu2))
     assert_equal(Time.utc(2005,6,18,17,24,23).to_i, TestTimezone.new('Europe/London', period, [], ts).utc_to_local(ts))
   end
   
   def test_utc_to_local_offset
     dt = DateTime.new(2005,6,18,16,24,23)
     dt2 = DateTime.new(2005,6,18,16,24,23).new_offset(Rational(5,24))
+    dtu = DateTime.new(2005,6,18,16,24,23 + Rational(567,1000))
+    dtu2 = DateTime.new(2005,6,18,16,24,23 + Rational(567,1000)).new_offset(Rational(5,24))
     t = Time.utc(2005,6,18,16,24,23)
     t2 = Time.local(2005,6,18,16,24,23)
+    tu = Time.utc(2005,6,18,16,24,23,567000)
+    tu2 = Time.local(2005,6,18,16,24,23,567000)
     
     o1 = TimezoneOffsetInfo.new(0, 0, :GMT)
     o2 = TimezoneOffsetInfo.new(0, 3600, :BST)
@@ -612,17 +647,27 @@ class TCTimezone < Test::Unit::TestCase
     
     assert_equal(0, TestTimezone.new('Europe/London', period, [], dt).utc_to_local(dt).offset)
     assert_equal(0, TestTimezone.new('Europe/London', period, [], dt2).utc_to_local(dt2).offset)
+    assert_equal(0, TestTimezone.new('Europe/London', period, [], dtu).utc_to_local(dtu).offset)
+    assert_equal(0, TestTimezone.new('Europe/London', period, [], dtu2).utc_to_local(dtu2).offset)    
     assert_equal(0, TestTimezone.new('Europe/London', period, [], t).utc_to_local(t).utc_offset)
     assert_equal('UTC', TestTimezone.new('Europe/London', period, [], t).utc_to_local(t).zone)
     assert_equal(0, TestTimezone.new('Europe/London', period, [], t2).utc_to_local(t2).utc_offset)
     assert_equal('UTC', TestTimezone.new('Europe/London', period, [], t2).utc_to_local(t2).zone)
+    assert_equal(0, TestTimezone.new('Europe/London', period, [], tu).utc_to_local(tu).utc_offset)
+    assert_equal('UTC', TestTimezone.new('Europe/London', period, [], tu).utc_to_local(tu).zone)
+    assert_equal(0, TestTimezone.new('Europe/London', period, [], tu2).utc_to_local(tu2).utc_offset)
+    assert_equal('UTC', TestTimezone.new('Europe/London', period, [], tu2).utc_to_local(tu2).zone)
   end
   
   def test_local_to_utc
     dt = DateTime.new(2005,6,18,16,24,23)
-    dt2 = DateTime.new(2005,6,18,16,24,23)
+    dt2 = DateTime.new(2005,6,18,16,24,23).new_offset(Rational(5, 24))
+    dtu = DateTime.new(2005,6,18,16,24,23 + Rational(567,1000))
+    dtu2 = DateTime.new(2005,6,18,16,24,23 + Rational(567,1000)).new_offset(Rational(5, 24))
     t = Time.utc(2005,6,18,16,24,23)
     t2 = Time.local(2005,6,18,16,24,23)
+    tu = Time.utc(2005,6,18,16,24,23,567000)
+    tu2 = Time.local(2005,6,18,16,24,23,567000)
     ts = t.to_i
         
     o1 = TimezoneOffsetInfo.new(0, 0, :GMT)
@@ -633,17 +678,25 @@ class TCTimezone < Test::Unit::TestCase
       TimezoneTransitionInfo.new(o1, o2, 1130634000))
     
     assert_equal(DateTime.new(2005,6,18,15,24,23), TestTimezone.new('Europe/London', nil, [period], dt).local_to_utc(dt))
-    assert_equal(DateTime.new(2005,6,18,15,24,23), TestTimezone.new('Europe/London', nil, [period], dt2).local_to_utc(dt2))    
+    assert_equal(DateTime.new(2005,6,18,15,24,23), TestTimezone.new('Europe/London', nil, [period], dt2).local_to_utc(dt2))
+    assert_equal(DateTime.new(2005,6,18,15,24,23 + Rational(567,1000)), TestTimezone.new('Europe/London', nil, [period], dtu).local_to_utc(dtu))
+    assert_equal(DateTime.new(2005,6,18,15,24,23 + Rational(567,1000)), TestTimezone.new('Europe/London', nil, [period], dtu2).local_to_utc(dtu2))
     assert_equal(Time.utc(2005,6,18,15,24,23), TestTimezone.new('Europe/London', nil, [period], t).local_to_utc(t))
     assert_equal(Time.utc(2005,6,18,15,24,23), TestTimezone.new('Europe/London', nil, [period], t2).local_to_utc(t2))
+    assert_equal(Time.utc(2005,6,18,15,24,23,567000), TestTimezone.new('Europe/London', nil, [period], tu).local_to_utc(tu))
+    assert_equal(Time.utc(2005,6,18,15,24,23,567000), TestTimezone.new('Europe/London', nil, [period], tu2).local_to_utc(tu2))
     assert_equal(Time.utc(2005,6,18,15,24,23).to_i, TestTimezone.new('Europe/London', nil, [period], ts).local_to_utc(ts))
   end
   
   def test_local_to_utc_offset
     dt = DateTime.new(2005,6,18,16,24,23)
-    dt2 = DateTime.new(2005,6,18,16,24,23).new_offset(Rational(5,24))
+    dt2 = DateTime.new(2005,6,18,16,24,23).new_offset(Rational(5, 24))
+    dtu = DateTime.new(2005,6,18,16,24,23 + Rational(567,1000))
+    dtu2 = DateTime.new(2005,6,18,16,24,23 + Rational(567,1000)).new_offset(Rational(5, 24))
     t = Time.utc(2005,6,18,16,24,23)
     t2 = Time.local(2005,6,18,16,24,23)
+    tu = Time.utc(2005,6,18,16,24,23,567000)
+    tu2 = Time.local(2005,6,18,16,24,23,567000)
     
     o1 = TimezoneOffsetInfo.new(0, 0, :GMT)
     o2 = TimezoneOffsetInfo.new(0, 3600, :BST)
@@ -654,10 +707,16 @@ class TCTimezone < Test::Unit::TestCase
     
     assert_equal(0, TestTimezone.new('Europe/London', nil, [period], dt).local_to_utc(dt).offset)
     assert_equal(0, TestTimezone.new('Europe/London', nil, [period], dt2).local_to_utc(dt2).offset)
+    assert_equal(0, TestTimezone.new('Europe/London', nil, [period], dtu).local_to_utc(dtu).offset)
+    assert_equal(0, TestTimezone.new('Europe/London', nil, [period], dtu2).local_to_utc(dtu2).offset)
     assert_equal(0, TestTimezone.new('Europe/London', nil, [period], t).local_to_utc(t).utc_offset)
     assert_equal('UTC', TestTimezone.new('Europe/London', nil, [period], t).local_to_utc(t).zone)
     assert_equal(0, TestTimezone.new('Europe/London', nil, [period], t2).local_to_utc(t2).utc_offset)
     assert_equal('UTC', TestTimezone.new('Europe/London', nil, [period], t2).local_to_utc(t2).zone)
+    assert_equal(0, TestTimezone.new('Europe/London', nil, [period], tu).local_to_utc(tu).utc_offset)
+    assert_equal('UTC', TestTimezone.new('Europe/London', nil, [period], tu).local_to_utc(tu).zone)
+    assert_equal(0, TestTimezone.new('Europe/London', nil, [period], tu2).local_to_utc(tu2).utc_offset)
+    assert_equal('UTC', TestTimezone.new('Europe/London', nil, [period], tu2).local_to_utc(tu2).zone)
   end
   
   def test_local_to_utc_invalid
@@ -695,7 +754,11 @@ class TCTimezone < Test::Unit::TestCase
 
     i = Time.utc(2004,10,31,1,30,0).to_i
     tz = TestTimezone.new('America/New_York', nil, [p1, p2], i)
-    assert_raises(AmbiguousTime) { tz.local_to_utc(i) }    
+    assert_raises(AmbiguousTime) { tz.local_to_utc(i) }
+    
+    f = Time.utc(2004,10,31,1,30,0,501).to_i
+    tz = TestTimezone.new('America/New_York', nil, [p1, p2], f)
+    assert_raises(AmbiguousTime) { tz.local_to_utc(f) }  
   end
   
   def test_local_to_utc_not_found
@@ -912,10 +975,6 @@ 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'))
@@ -943,16 +1002,23 @@ class TCTimezone < Test::Unit::TestCase
   
   def test_marshal_linked
     tz = Timezone.get('UTC')
-    assert_kind_of(LinkedTimezone, tz)
+    
+    # ZoneinfoDataSource doesn't return LinkedTimezoneInfo for any timezone.
+    if DataSource.get.load_timezone_info('UTC').kind_of?(LinkedTimezoneInfo)
+      assert_kind_of(LinkedTimezone, tz)
+    else
+      assert_kind_of(DataTimezone, tz)
+    end
+    
     assert_same(tz, Marshal.load(Marshal.dump(tz)))    
   end
   
   def test_strftime_datetime
     tz = Timezone.get('Europe/London')
-    assert_equal('23:12:02 BST', tz.strftime('%H:%M:%S %Z', DateTime.new(1965, 7, 15, 22, 12, 2)))
-    assert_equal('BST', tz.strftime('%Z', DateTime.new(1965, 7, 15, 22, 12, 2)))
-    assert_equal('%ZBST', tz.strftime('%%Z%Z', DateTime.new(1965, 7, 15, 22, 12, 2)))
-    assert_equal('BST BST', tz.strftime('%Z %Z', DateTime.new(1965, 7, 15, 22, 12, 2)))
+    assert_equal('23:12:02 BST', tz.strftime('%H:%M:%S %Z', DateTime.new(2006, 7, 15, 22, 12, 2)))
+    assert_equal('BST', tz.strftime('%Z', DateTime.new(2006, 7, 15, 22, 12, 2)))
+    assert_equal('%ZBST', tz.strftime('%%Z%Z', DateTime.new(2006, 7, 15, 22, 12, 2)))
+    assert_equal('BST BST', tz.strftime('%Z %Z', DateTime.new(2006, 7, 15, 22, 12, 2)))
   end
   
   def test_strftime_time
@@ -970,4 +1036,68 @@ class TCTimezone < Test::Unit::TestCase
     assert_equal('%ZBST', tz.strftime('%%Z%Z', Time.utc(2006, 7, 15, 22, 12, 2).to_i))
     assert_equal('BST BST', tz.strftime('%Z %Z', Time.utc(2006, 7, 15, 22, 12, 2).to_i))
   end
+  
+  def test_get_missing_data_source
+    DataSource.set(DataSource.new)
+    
+    assert_raises(InvalidDataSource) do
+      Timezone.get('Europe/London')
+    end
+  end
+  
+  def test_new_missing_data_source
+    DataSource.set(DataSource.new)
+    
+    assert_raises(InvalidDataSource) do
+      Timezone.new('Europe/London')
+    end
+  end
+  
+  def test_all_missing_data_source
+    DataSource.set(DataSource.new)
+    
+    assert_raises(InvalidDataSource) do
+      Timezone.all
+    end
+  end
+  
+  def test_all_identifiers_missing_data_source
+    DataSource.set(DataSource.new)
+    
+    assert_raises(InvalidDataSource) do
+      Timezone.all_identifiers
+    end
+  end
+  
+  def test_all_data_zones_missing_data_source
+    DataSource.set(DataSource.new)
+    
+    assert_raises(InvalidDataSource) do
+      Timezone.all_data_zones
+    end
+  end
+  
+  def test_all_data_zone_identifiers_missing_data_source
+    DataSource.set(DataSource.new)
+    
+    assert_raises(InvalidDataSource) do
+      Timezone.all_data_zone_identifiers
+    end
+  end
+
+  def test_all_linked_zones_missing_data_source
+    DataSource.set(DataSource.new)
+    
+    assert_raises(InvalidDataSource) do
+      Timezone.all_linked_zones
+    end
+  end
+
+  def test_all_linked_zone_identifiers_missing_data_source
+    DataSource.set(DataSource.new)
+    
+    assert_raises(InvalidDataSource) do
+      Timezone.all_linked_zone_identifiers
+    end
+  end  
 end

data/test/tc_timezone_definition.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
 
@@ -75,7 +95,7 @@ class TCTimezoneDefinition < Test::Unit::TestCase
   end
     
   def test_data
-    assert_kind_of(DataTimezoneInfo, DataTest.get)
+    assert_kind_of(TransitionDataTimezoneInfo, DataTest.get)
     assert_equal('Test/Data/Zone', DataTest.get.identifier)
     assert_equal(:LMT, DataTest.get.period_for_utc(DateTime.new(1847,12,1,0,1,14)).abbreviation)
     assert_equal(:GMT, DataTest.get.period_for_utc(DateTime.new(1847,12,1,0,1,15)).abbreviation)
@@ -88,7 +108,7 @@ class TCTimezoneDefinition < Test::Unit::TestCase
   end
   
   def test_double_data
-    assert_kind_of(DataTimezoneInfo, DoubleDataTest.get)
+    assert_kind_of(TransitionDataTimezoneInfo, DoubleDataTest.get)
     assert_equal('Test/Data/Zone2', DoubleDataTest.get.identifier)
     assert_equal(:LMT, DoubleDataTest.get.period_for_utc(DateTime.new(1847,12,1,0,1,14)).abbreviation)
     assert_equal(:GMT, DoubleDataTest.get.period_for_utc(DateTime.new(1847,12,1,0,1,15)).abbreviation)
@@ -107,7 +127,7 @@ class TCTimezoneDefinition < Test::Unit::TestCase
   end
   
   def test_linked_data
-    assert_kind_of(DataTimezoneInfo, LinkedDataTest.get)
+    assert_kind_of(TransitionDataTimezoneInfo, LinkedDataTest.get)
     assert_equal('Test/Data/Zone2', LinkedDataTest.get.identifier)
     assert_equal(:LMT, LinkedDataTest.get.period_for_utc(DateTime.new(1847,12,1,0,1,14)).abbreviation)
     assert_equal(:GMT, LinkedDataTest.get.period_for_utc(DateTime.new(1847,12,1,0,1,15)).abbreviation)

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