From 6673f4e8afb9d468849bcc7d87c82c46c799f119 Mon Sep 17 00:00:00 2001 From: tenderlove Date: Mon, 21 Feb 2011 01:02:41 +0000 Subject: * ext/psych/lib/psych/json/stream.rb: fix JSON stream emits to use double quotes during stream. * test/psych/json/test_stream.rb: tests to reflect changes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30928 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/psych/json/test_stream.rb | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'test') diff --git a/test/psych/json/test_stream.rb b/test/psych/json/test_stream.rb index 712465d4c0..252535abaa 100644 --- a/test/psych/json/test_stream.rb +++ b/test/psych/json/test_stream.rb @@ -31,12 +31,12 @@ module Psych def test_string @stream.push "foo" - assert_match(/(['"])foo\1/, @io.string) + assert_match(/(["])foo\1/, @io.string) end def test_symbol @stream.push :foo - assert_match(/(['"])foo\1/, @io.string) + assert_match(/(["])foo\1/, @io.string) end def test_int @@ -56,8 +56,8 @@ module Psych json = @io.string assert_match(/}$/, json) assert_match(/^--- \{/, json) - assert_match(/['"]one['"]/, json) - assert_match(/['"]two['"]/, json) + assert_match(/["]one['"]/, json) + assert_match(/["]two['"]/, json) end def test_list_to_json @@ -67,8 +67,22 @@ module Psych json = @io.string assert_match(/]$/, json) assert_match(/^--- \[/, json) - assert_match(/['"]one['"]/, json) - assert_match(/['"]two['"]/, json) + assert_match(/["]one["]/, json) + assert_match(/["]two["]/, json) + end + + def test_time + time = Time.utc(2010, 10, 10) + @stream.push({'a' => time }) + json = @io.string + assert_match "{\"a\": \"2010-10-10 00:00:00.000000000Z\"}\n", json + end + + def test_datetime + time = Time.new(2010, 10, 10).to_datetime + @stream.push({'a' => time }) + json = @io.string + assert_match "{\"a\": \"#{time.strftime("%Y-%m-%d %H:%M:%S.%9N %:z")}\"}\n", json end end end -- cgit v1.2.3