summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-20 13:23:09 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-20 13:23:09 +0000
commitd66c22bfde282e23a74433bee835ad05f7328731 (patch)
tree2fb0cdc8a3df4907bab0dfd17da9246881f6c3c0 /test
parentac0a41e929a6558fbaffa94646ec64673eaa920a (diff)
merges r29951 from trunk into ruby_1_9_2.
-- * time.c (leap_year_v_p): fixed typo. [ruby-dev:42631] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_time.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb
index 95d36c597f..13b95b94f9 100644
--- a/test/ruby/test_time.rb
+++ b/test/ruby/test_time.rb
@@ -19,6 +19,10 @@ class TestTime < Test::Unit::TestCase
assert_equal(Time.utc(2000,2,10), Time.new(2000,2,9, 13,0,0, -3600*11))
assert_equal(Time.utc(2000,2,10), Time.new(2000,2,10, 11,0,0, "+11:00"))
assert_equal(Rational(1,2), Time.new(2000,2,10, 11,0,5.5, "+11:00").subsec)
+ bug4090 = '[ruby-dev:42631]'
+ tm = [2001,2,28,23,59,30]
+ t = Time.new(*tm, "-12:00")
+ assert_equal([2001,2,28,23,59,30,-43200], [t.year, t.month, t.mday, t.hour, t.min, t.sec, t.gmt_offset], bug4090)
end
def test_time_add()