summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-21 16:25:53 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-21 16:25:53 +0000
commit47daa2f218bbaf8bedf9cc5144ee01428647f872 (patch)
tree19ae53ec96023d4dd8f2bba30f93d0d962947e68
parent3486311d540ba65e591a0fb54fc2acfb02c7f8dd (diff)
downloadruby-47daa2f218bbaf8bedf9cc5144ee01428647f872.tar.gz
* test/json/test_json_addition.rb (test_core): do not use Time.now
because JSON can't hold nsec. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rwxr-xr-xtest/json/test_json_addition.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f3eb10e7d3..1e6e991c0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 22 01:23:10 2007 Shugo Maeda <shugo@ruby-lang.org>
+
+ * test/json/test_json_addition.rb (test_core): do not use Time.now
+ because JSON can't hold nsec.
+
Sat Dec 22 01:10:30 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/tk/sample/tkextlib/vu/canvSticker2.rb,
diff --git a/test/json/test_json_addition.rb b/test/json/test_json_addition.rb
index 2ae0ce47c5..e8ae41525f 100755
--- a/test/json/test_json_addition.rb
+++ b/test/json/test_json_addition.rb
@@ -112,7 +112,7 @@ EOT
end
def test_core
- t = Time.now
+ t = Time.at(1198254128, 895990)
assert_equal t, JSON(JSON(t))
d = Date.today
assert_equal d, JSON(JSON(d))