From 5dc5a526125b25200fb6566257756bccbc4474c8 Mon Sep 17 00:00:00 2001 From: tadf Date: Sun, 3 Jun 2012 05:17:38 +0000 Subject: [PATCH] modified tests. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/date/test_date_marshal.rb | 12 ++++++++++++ test/date/test_date_strftime.rb | 16 ++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/test/date/test_date_marshal.rb b/test/date/test_date_marshal.rb index 2f86a8c8c2..4ea5565716 100644 --- a/test/date/test_date_marshal.rb +++ b/test/date/test_date_marshal.rb @@ -24,6 +24,18 @@ class TestDateMarshal < Test::Unit::TestCase assert_equal(d, d2) assert_equal(d.start, d2.start) assert_instance_of(String, d2.to_s) + + d = Date.today + a = d.marshal_dump + d.freeze + assert(d.frozen?) + assert_raise(RuntimeError){d.marshal_load(a)} + + d = DateTime.now + a = d.marshal_dump + d.freeze + assert(d.frozen?) + assert_raise(RuntimeError){d.marshal_load(a)} end end diff --git a/test/date/test_date_strftime.rb b/test/date/test_date_strftime.rb index 6699115c52..0ed9215e1e 100644 --- a/test/date/test_date_strftime.rb +++ b/test/date/test_date_strftime.rb @@ -72,19 +72,19 @@ class TestDateStrftime < Test::Unit::TestCase assert_equal(s[0], d.strftime(f), [f, s].inspect) case f[-1,1] when 'c', 'C', 'x', 'X', 'y', 'Y' - f2 = f.sub(/\A%/, '%E') - assert_equal(s[0], d.strftime(f2), [f2, s].inspect) + f2 = f.sub(/\A%/, '%E') + assert_equal(s[0], d.strftime(f2), [f2, s].inspect) else - f2 = f.sub(/\A%/, '%E') - assert_equal(f2, d.strftime(f2), [f2, s].inspect) + f2 = f.sub(/\A%/, '%E') + assert_equal(f2, d.strftime(f2), [f2, s].inspect) end case f[-1,1] when 'd', 'e', 'H', 'k', 'I', 'l', 'm', 'M', 'S', 'u', 'U', 'V', 'w', 'W', 'y' - f2 = f.sub(/\A%/, '%O') - assert_equal(s[0], d.strftime(f2), [f2, s].inspect) + f2 = f.sub(/\A%/, '%O') + assert_equal(s[0], d.strftime(f2), [f2, s].inspect) else - f2 = f.sub(/\A%/, '%O') - assert_equal(f2, d.strftime(f2), [f2, s].inspect) + f2 = f.sub(/\A%/, '%O') + assert_equal(f2, d.strftime(f2), [f2, s].inspect) end end end