diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-04 07:05:26 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-04 07:05:26 +0000 |
commit | 04752225a796afba738d55c9556c67f520b24f71 (patch) | |
tree | e5da6f2b0cc85bb5ca637df0220972eb7410b74b | |
parent | f587eab23cdb70890f233d02eea7186ac05a21b1 (diff) | |
download | ruby-04752225a796afba738d55c9556c67f520b24f71.tar.gz |
* time.c (obj2nsec): fix string argument.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | test/ruby/test_time.rb | 6 | ||||
-rw-r--r-- | time.c | 2 |
3 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Sun May 4 16:04:28 2008 Tanaka Akira <akr@fsij.org> + + * time.c (obj2nsec): fix string argument. + Sun May 4 14:29:14 2008 Tanaka Akira <akr@fsij.org> * eval.c (rb_obj_respond_to): check the result of respond_to? method diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb index 452e22f919..9cbb6eaca6 100644 --- a/test/ruby/test_time.rb +++ b/test/ruby/test_time.rb @@ -64,6 +64,12 @@ class TestTime < Test::Unit::TestCase end end + def test_strtime + t = nil + assert_nothing_raised { t = Time.utc("2000", "1", "2" , "3", "4", "5") } + assert_equal(Time.utc(2000,1,2,3,4,5), t) + end + def test_huge_difference if negative_time_t? assert_equal(Time.at(-0x80000000), Time.at(0x7fffffff) - 0xffffffff, "[ruby-dev:22619]") @@ -356,7 +356,7 @@ obj2nsec(VALUE obj, long *nsec) if (TYPE(obj) == T_STRING) { obj = rb_str_to_inum(obj, 10, Qfalse); *nsec = 0; - return NUM2LONG(obj) * 1000; + return NUM2LONG(obj); } ts = time_timespec(obj, 1); |