TimeZone: fix base offset for Sri Jayawardenepura. Anchor tests for zone offsets to more current date

activesupport/CHANGELOG

@@ -1,5 +1,7 @@
 *2.2.1 [RC2 or 2.2 final]*
 
+* TimeZone: fix offset for Sri Jayawardenepura. Anchor tests for zone offsets to more current date [Geoff Buesing]
+
 * TimeZone: Caracas GMT offset changed to -4:30 [#1361 state:resolved] [Phil Ross]
 
 * Added render :js for people who want to render inline JavaScript replies without using RJS [DHH]

activesupport/lib/active_support/values/time_zone.rb

@@ -326,9 +326,9 @@ module ActiveSupport
        [ 14_400, "Abu Dhabi", "Muscat", "Baku", "Tbilisi", "Yerevan" ],
        [ 16_200, "Kabul" ],
        [ 18_000, "Ekaterinburg", "Islamabad", "Karachi", "Tashkent" ],
-       [ 19_800, "Chennai", "Kolkata", "Mumbai", "New Delhi" ],
+       [ 19_800, "Chennai", "Kolkata", "Mumbai", "New Delhi", "Sri Jayawardenepura" ],
        [ 20_700, "Kathmandu" ],
-       [ 21_600, "Astana", "Dhaka", "Sri Jayawardenepura", "Almaty",
+       [ 21_600, "Astana", "Dhaka", "Almaty",
                  "Novosibirsk" ],
        [ 23_400, "Rangoon" ],
        [ 25_200, "Bangkok", "Hanoi", "Jakarta", "Krasnoyarsk" ],

activesupport/test/time_zone_test.rb

@@ -51,7 +51,7 @@ class TimeZoneTest < Test::Unit::TestCase
 
     define_method("test_utc_offset_for_#{name}") do
       silence_warnings do # silence warnings raised by tzinfo gem
-        period = zone.tzinfo.period_for_utc(Time.utc(2006,1,1,0,0,0))
+        period = zone.tzinfo.period_for_utc(Time.utc(2009,1,1,0,0,0))
         assert_equal period.utc_offset, zone.utc_offset
       end
     end