Skip to content

Commit

Permalink
Update test fixtures to be based on tzdata 2023c.
Browse files Browse the repository at this point in the history 
Europe/Amsterdam is now a linked time zone. Use Europe/Brussels instead.
  • Loading branch information
@philr
philr committed Jun 22, 2023
1 parent 01cb654 commit 01d4937
Show file tree
Hide file tree
Showing 33 changed files with 1,158 additions and 1,081 deletions.
16 changes: 8 additions & 8 deletions test/data_sources/tc_ruby_data_source.rb
View file
Expand Up @@ -122,10 +122,10 @@ def test_load_timezone_info_tainted
skip_if_taint_is_undefined_or_no_op

safe_test(unavailable: :skip) do
identifier = 'Europe/Amsterdam'.dup.taint
identifier = 'Europe/Brussels'.dup.taint
assert(identifier.tainted?)
info = @data_source.send(:load_timezone_info, identifier)
assert_equal('Europe/Amsterdam', info.identifier)
assert_equal('Europe/Brussels', info.identifier)
assert(identifier.tainted?)
end
end
Expand All @@ -134,8 +134,8 @@ def test_load_timezone_info_tainted_and_frozen
skip_if_taint_is_undefined_or_no_op

safe_test do
info = @data_source.send(:load_timezone_info, 'Europe/Amsterdam'.dup.taint.freeze)
assert_equal('Europe/Amsterdam', info.identifier)
info = @data_source.send(:load_timezone_info, 'Europe/Brussels'.dup.taint.freeze)
assert_equal('Europe/Brussels', info.identifier)
end
end

Expand Down Expand Up @@ -282,11 +282,11 @@ def test_country_codes
end

def test_to_s
assert_equal("Ruby DataSource: tzdb v2020d, tzinfo-data v#{defined?(TZINFO_TEST_DATA_FORMAT) ? TZINFO_TEST_DATA_FORMAT : 2}.2020.4.test", @data_source.to_s)
assert_equal("Ruby DataSource: tzdb v2023c, tzinfo-data v#{defined?(TZINFO_TEST_DATA_FORMAT) ? TZINFO_TEST_DATA_FORMAT : 2}.2023.3.test", @data_source.to_s)
end

def test_inspect
assert_equal("#<TZInfo::DataSources::RubyDataSource: tzdb v2020d, tzinfo-data v#{defined?(TZINFO_TEST_DATA_FORMAT) ? TZINFO_TEST_DATA_FORMAT : 2}.2020.4.test>", @data_source.inspect)
assert_equal("#<TZInfo::DataSources::RubyDataSource: tzdb v2023c, tzinfo-data v#{defined?(TZINFO_TEST_DATA_FORMAT) ? TZINFO_TEST_DATA_FORMAT : 2}.2023.3.test>", @data_source.inspect)
end

if defined?(TZINFO_TEST_DATA_FORMAT) && TZINFO_TEST_DATA_FORMAT == 1
Expand All @@ -303,7 +303,7 @@ def test_to_s_no_tzinfo_data_version
puts ds.to_s
EOF

assert_sub_process_returns(['Ruby DataSource: tzdb v2020d'], code)
assert_sub_process_returns(['Ruby DataSource: tzdb v2023c'], code)
end

def test_inspect_no_tzinfo_data_version
Expand All @@ -316,7 +316,7 @@ def test_inspect_no_tzinfo_data_version
puts ds.inspect
EOF

assert_sub_process_returns(['#<TZInfo::DataSources::RubyDataSource: tzdb v2020d>'], code)
assert_sub_process_returns(['#<TZInfo::DataSources::RubyDataSource: tzdb v2023c>'], code)
end
end

Expand Down
8 changes: 4 additions & 4 deletions test/data_sources/tc_zoneinfo_data_source.rb
View file
Expand Up @@ -787,10 +787,10 @@ def test_load_timezone_info_tainted
skip_if_taint_is_undefined_or_no_op

safe_test(unavailable: :skip) do
identifier = 'Europe/Amsterdam'.dup.taint
identifier = 'Europe/Brussels'.dup.taint
assert(identifier.tainted?)
info = @data_source.send(:load_timezone_info, identifier)
assert_equal('Europe/Amsterdam', info.identifier)
assert_equal('Europe/Brussels', info.identifier)
assert(identifier.tainted?)
end
end
Expand All @@ -799,8 +799,8 @@ def test_load_timezone_info_tainted_and_frozen
skip_if_taint_is_undefined_or_no_op

safe_test do
info = @data_source.send(:load_timezone_info, 'Europe/Amsterdam'.dup.taint.freeze)
assert_equal('Europe/Amsterdam', info.identifier)
info = @data_source.send(:load_timezone_info, 'Europe/Brussels'.dup.taint.freeze)
assert_equal('Europe/Brussels', info.identifier)
end
end

Expand Down
4 changes: 2 additions & 2 deletions test/tc_timezone.rb
View file
Expand Up @@ -296,8 +296,8 @@ def test_get_tainted_and_frozen_not_previously_loaded
skip_if_taint_is_undefined_or_no_op

safe_test do
tz = Timezone.get('Europe/Amsterdam'.dup.taint.freeze)
assert_equal('Europe/Amsterdam', tz.identifier)
tz = Timezone.get('Europe/Brussels'.dup.taint.freeze)
assert_equal('Europe/Brussels', tz.identifier)
end
end

Expand Down
56 changes: 28 additions & 28 deletions test/tc_timezone_melbourne.rb
View file
Expand Up @@ -84,71 +84,71 @@ def test_2004
end

def test_1942
#Australia/Melbourne Sat Mar 28 14:59:59 1942 UTC = Sun Mar 29 01:59:59 1942 AEDT isdst=1 gmtoff=39600
#Australia/Melbourne Sat Mar 28 15:00:00 1942 UTC = Sun Mar 29 01:00:00 1942 AEST isdst=0 gmtoff=36000
#Australia/Melbourne Sat Mar 28 15:59:59 1942 UTC = Sun Mar 29 02:59:59 1942 AEDT isdst=1 gmtoff=39600
#Australia/Melbourne Sat Mar 28 16:00:00 1942 UTC = Sun Mar 29 02:00:00 1942 AEST isdst=0 gmtoff=36000
#Australia/Melbourne Sat Sep 26 15:59:59 1942 UTC = Sun Sep 27 01:59:59 1942 AEST isdst=0 gmtoff=36000
#Australia/Melbourne Sat Sep 26 16:00:00 1942 UTC = Sun Sep 27 03:00:00 1942 AEDT isdst=1 gmtoff=39600

tz = Timezone.get('Australia/Melbourne')

time_types_test(:offset) do |h|
assert_equal_with_offset(h.output_time(1942,3,29,1,59,59,0,39600), tz.to_local(h.time(1942,3,28,14,59,59,0,0)))
assert_equal_with_offset(h.output_time(1942,3,29,1, 0, 0,0,36000), tz.to_local(h.time(1942,3,28,15, 0, 0,0,0)))
assert_equal_with_offset(h.output_time(1942,3,29,2,59,59,0,39600), tz.to_local(h.time(1942,3,28,15,59,59,0,0)))
assert_equal_with_offset(h.output_time(1942,3,29,2, 0, 0,0,36000), tz.to_local(h.time(1942,3,28,16, 0, 0,0,0)))
assert_equal_with_offset(h.output_time(1942,9,27,1,59,59,0,36000), tz.to_local(h.time(1942,9,26,15,59,59,0,0)))
assert_equal_with_offset(h.output_time(1942,9,27,3, 0, 0,0,39600), tz.to_local(h.time(1942,9,26,16, 0, 0,0,0)))

assert_equal_with_offset(h.output_time(1942,3,29,1,59,59,0,39600), tz.utc_to_local(h.time(1942,3,28,14,59,59)))
assert_equal_with_offset(h.output_time(1942,3,29,1, 0, 0,0,36000), tz.utc_to_local(h.time(1942,3,28,15, 0, 0)))
assert_equal_with_offset(h.output_time(1942,3,29,2,59,59,0,39600), tz.utc_to_local(h.time(1942,3,28,15,59,59)))
assert_equal_with_offset(h.output_time(1942,3,29,2, 0, 0,0,36000), tz.utc_to_local(h.time(1942,3,28,16, 0, 0)))
assert_equal_with_offset(h.output_time(1942,9,27,1,59,59,0,36000), tz.utc_to_local(h.time(1942,9,26,15,59,59)))
assert_equal_with_offset(h.output_time(1942,9,27,3, 0, 0,0,39600), tz.utc_to_local(h.time(1942,9,26,16, 0, 0)))

assert_equal_with_offset(h.output_time(1942,3,28,14,59,59,0,:utc), tz.local_to_utc(h.time(1942,3,29,1,59,59), true))
assert_equal_with_offset(h.output_time(1942,3,28,15,59,59,0,:utc), tz.local_to_utc(h.time(1942,3,29,1,59,59), false))
assert_equal_with_offset(h.output_time(1942,3,28,14, 0, 0,0,:utc), tz.local_to_utc(h.time(1942,3,29,1, 0, 0), true))
assert_equal_with_offset(h.output_time(1942,3,28,15, 0, 0,0,:utc), tz.local_to_utc(h.time(1942,3,29,1, 0, 0), false))
assert_equal_with_offset(h.output_time(1942,3,28,15,59,59,0,:utc), tz.local_to_utc(h.time(1942,3,29,2,59,59), true))
assert_equal_with_offset(h.output_time(1942,3,28,16,59,59,0,:utc), tz.local_to_utc(h.time(1942,3,29,2,59,59), false))
assert_equal_with_offset(h.output_time(1942,3,28,15, 0, 0,0,:utc), tz.local_to_utc(h.time(1942,3,29,2, 0, 0), true))
assert_equal_with_offset(h.output_time(1942,3,28,16, 0, 0,0,:utc), tz.local_to_utc(h.time(1942,3,29,2, 0, 0), false))
assert_equal_with_offset(h.output_time(1942,9,26,15,59,59,0,:utc), tz.local_to_utc(h.time(1942,9,27,1,59,59)))
assert_equal_with_offset(h.output_time(1942,9,26,16, 0, 0,0,:utc), tz.local_to_utc(h.time(1942,9,27,3, 0, 0)))

assert_raises(PeriodNotFound) { tz.local_to_utc(h.time(1942,9,27,2,0,0)) }
assert_raises(AmbiguousTime) { tz.local_to_utc(h.time(1942,3,29,1,0,0)) }
assert_raises(AmbiguousTime) { tz.local_to_utc(h.time(1942,3,29,2,0,0)) }

assert_equal('AEDT', tz.period_for(h.time(1942,3,28,14,59,59,0,0)).zone_identifier)
assert_equal('AEST', tz.period_for(h.time(1942,3,28,15, 0, 0,0,0)).zone_identifier)
assert_equal('AEDT', tz.period_for(h.time(1942,3,28,15,59,59,0,0)).zone_identifier)
assert_equal('AEST', tz.period_for(h.time(1942,3,28,16, 0, 0,0,0)).zone_identifier)
assert_equal('AEST', tz.period_for(h.time(1942,9,26,15,59,59,0,0)).zone_identifier)
assert_equal('AEDT', tz.period_for(h.time(1942,9,26,16, 0, 0,0,0)).zone_identifier)

assert_equal('AEDT', tz.period_for_utc(h.time(1942,3,28,14,59,59)).zone_identifier)
assert_equal('AEST', tz.period_for_utc(h.time(1942,3,28,15, 0, 0)).zone_identifier)
assert_equal('AEDT', tz.period_for_utc(h.time(1942,3,28,15,59,59)).zone_identifier)
assert_equal('AEST', tz.period_for_utc(h.time(1942,3,28,16, 0, 0)).zone_identifier)
assert_equal('AEST', tz.period_for_utc(h.time(1942,9,26,15,59,59)).zone_identifier)
assert_equal('AEDT', tz.period_for_utc(h.time(1942,9,26,16, 0, 0)).zone_identifier)

assert_equal('AEDT', tz.period_for_local(h.time(1942,3,29,1,59,59), true).zone_identifier)
assert_equal('AEST', tz.period_for_local(h.time(1942,3,29,1,59,59), false).zone_identifier)
assert_equal('AEDT', tz.period_for_local(h.time(1942,3,29,1, 0, 0), true).zone_identifier)
assert_equal('AEST', tz.period_for_local(h.time(1942,3,29,1, 0, 0), false).zone_identifier)
assert_equal('AEDT', tz.period_for_local(h.time(1942,3,29,2,59,59), true).zone_identifier)
assert_equal('AEST', tz.period_for_local(h.time(1942,3,29,2,59,59), false).zone_identifier)
assert_equal('AEDT', tz.period_for_local(h.time(1942,3,29,2, 0, 0), true).zone_identifier)
assert_equal('AEST', tz.period_for_local(h.time(1942,3,29,2, 0, 0), false).zone_identifier)
assert_equal('AEST', tz.period_for_local(h.time(1942,9,27,1,59,59)).zone_identifier)
assert_equal('AEDT', tz.period_for_local(h.time(1942,9,27,3, 0, 0)).zone_identifier)

assert_equal(39600, tz.period_for(h.time(1942,3,28,14,59,59,0,0)).observed_utc_offset)
assert_equal(36000, tz.period_for(h.time(1942,3,28,15, 0, 0,0,0)).observed_utc_offset)
assert_equal(39600, tz.period_for(h.time(1942,3,28,15,59,59,0,0)).observed_utc_offset)
assert_equal(36000, tz.period_for(h.time(1942,3,28,16, 0, 0,0,0)).observed_utc_offset)
assert_equal(36000, tz.period_for(h.time(1942,9,26,15,59,59,0,0)).observed_utc_offset)
assert_equal(39600, tz.period_for(h.time(1942,9,26,16, 0, 0,0,0)).observed_utc_offset)

assert_equal(39600, tz.period_for_utc(h.time(1942,3,28,14,59,59)).observed_utc_offset)
assert_equal(36000, tz.period_for_utc(h.time(1942,3,28,15, 0, 0)).observed_utc_offset)
assert_equal(39600, tz.period_for_utc(h.time(1942,3,28,15,59,59)).observed_utc_offset)
assert_equal(36000, tz.period_for_utc(h.time(1942,3,28,16, 0, 0)).observed_utc_offset)
assert_equal(36000, tz.period_for_utc(h.time(1942,9,26,15,59,59)).observed_utc_offset)
assert_equal(39600, tz.period_for_utc(h.time(1942,9,26,16, 0, 0)).observed_utc_offset)

assert_equal(39600, tz.period_for_local(h.time(1942,3,29,1,59,59), true).observed_utc_offset)
assert_equal(36000, tz.period_for_local(h.time(1942,3,29,1,59,59), false).observed_utc_offset)
assert_equal(39600, tz.period_for_local(h.time(1942,3,29,1, 0, 0), true).observed_utc_offset)
assert_equal(36000, tz.period_for_local(h.time(1942,3,29,1, 0, 0), false).observed_utc_offset)
assert_equal(39600, tz.period_for_local(h.time(1942,3,29,2,59,59), true).observed_utc_offset)
assert_equal(36000, tz.period_for_local(h.time(1942,3,29,2,59,59), false).observed_utc_offset)
assert_equal(39600, tz.period_for_local(h.time(1942,3,29,2, 0, 0), true).observed_utc_offset)
assert_equal(36000, tz.period_for_local(h.time(1942,3,29,2, 0, 0), false).observed_utc_offset)
assert_equal(36000, tz.period_for_local(h.time(1942,9,27,1,59,59)).observed_utc_offset)
assert_equal(39600, tz.period_for_local(h.time(1942,9,27,3, 0, 0)).observed_utc_offset)

transitions = tz.transitions_up_to(h.time(1943,1,1,0,0,0,0,0), h.time(1942,1,1,0,0,0,0,0))
assert_equal(2, transitions.length)
assert_equal_with_offset(Timestamp.for(Time.utc(1942,3,28,15,0,0)), transitions[0].at)
assert_equal_with_offset(Timestamp.for(Time.utc(1942,3,28,16,0,0)), transitions[0].at)
assert_equal(TimezoneOffset.new(36000, 3600, 'AEDT'), transitions[0].previous_offset)
assert_equal(TimezoneOffset.new(36000, 0, 'AEST'), transitions[0].offset)
assert_equal_with_offset(Timestamp.for(Time.utc(1942,9,26,16,0,0)), transitions[1].at)
Expand Down
6 changes: 6 additions & 0 deletions test/tzinfo-data1/tzinfo/data/definitions/America/New_York.rb
View file
Expand Up @@ -319,6 +319,12 @@ module New_York
tz.transition 2069, 11, :o1, 3150684000, 9908215, 4
tz.transition 2070, 3, :o2, 3161574000, 59452315, 24
tz.transition 2070, 11, :o1, 3182133600, 9909671, 4
tz.transition 2071, 3, :o2, 3193023600, 59461051, 24
tz.transition 2071, 11, :o1, 3213583200, 9911127, 4
tz.transition 2072, 3, :o2, 3225078000, 59469955, 24
tz.transition 2072, 11, :o1, 3245637600, 9912611, 4
tz.transition 2073, 3, :o2, 3256527600, 59478691, 24
tz.transition 2073, 11, :o1, 3277087200, 9914067, 4
end
end
end
Expand Down
16 changes: 11 additions & 5 deletions test/tzinfo-data1/tzinfo/data/definitions/Australia/Melbourne.rb
View file
Expand Up @@ -16,14 +16,14 @@ module Melbourne
tz.offset :o2, 36000, 3600, :AEDT

tz.transition 1895, 1, :o1, -2364111592, 26062831051, 10800
tz.transition 1916, 12, :o2, -1672567140, 3486569881, 1440
tz.transition 1917, 3, :o1, -1665392400, 19370497, 8
tz.transition 1916, 12, :o2, -1672560000, 14527375, 6
tz.transition 1917, 3, :o1, -1665388800, 14527873, 6
tz.transition 1941, 12, :o2, -883641600, 14582161, 6
tz.transition 1942, 3, :o1, -876128400, 19443577, 8
tz.transition 1942, 3, :o1, -876124800, 14582683, 6
tz.transition 1942, 9, :o2, -860400000, 14583775, 6
tz.transition 1943, 3, :o1, -844678800, 19446489, 8
tz.transition 1943, 3, :o1, -844675200, 14584867, 6
tz.transition 1943, 10, :o2, -828345600, 14586001, 6
tz.transition 1944, 3, :o1, -813229200, 19449401, 8
tz.transition 1944, 3, :o1, -813225600, 14587051, 6
tz.transition 1971, 10, :o2, 57686400
tz.transition 1972, 2, :o1, 67968000
tz.transition 1972, 10, :o2, 89136000
Expand Down Expand Up @@ -222,6 +222,12 @@ module Melbourne
tz.transition 2069, 4, :o1, 3132489600, 14861059, 6
tz.transition 2069, 10, :o2, 3148214400, 14862151, 6
tz.transition 2070, 4, :o1, 3163939200, 14863243, 6
tz.transition 2070, 10, :o2, 3179664000, 14864335, 6
tz.transition 2071, 4, :o1, 3195388800, 14865427, 6
tz.transition 2071, 10, :o2, 3211113600, 14866519, 6
tz.transition 2072, 4, :o1, 3226838400, 14867611, 6
tz.transition 2072, 10, :o2, 3242563200, 14868703, 6
tz.transition 2073, 4, :o1, 3258288000, 14869795, 6
end
end
end
Expand Down

0 comments on commit 01d4937

Please sign in to comment.