From 320c98b436b5277678907b9ba32e4c6cdd3678a0 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 9 Apr 2019 01:27:36 +0000 Subject: date: support for Reiwa, new Japanese era [Feature #15742] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67474 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/date/test_date_parse.rb | 24 ++++++++++++++++++++++++ test/date/test_date_strftime.rb | 2 ++ 2 files changed, 26 insertions(+) (limited to 'test/date') diff --git a/test/date/test_date_parse.rb b/test/date/test_date_parse.rb index 7907295bf4..e17fd3eb25 100644 --- a/test/date/test_date_parse.rb +++ b/test/date/test_date_parse.rb @@ -997,6 +997,9 @@ class TestDateParse < Test::Unit::TestCase assert_equal([2019, 4, 30, nil, nil, nil, nil], h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset)) h = Date._jisx0301('H31.05.01') + assert_equal([2019, 5, 1, nil, nil, nil, nil], + h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset)) + h = Date._jisx0301('R01.05.01') assert_equal([2019, 5, 1, nil, nil, nil, nil], h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset)) @@ -1039,6 +1042,19 @@ class TestDateParse < Test::Unit::TestCase assert_equal([2019, 5, 1, 4, 5, 6, 3600], h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset)) + h = Date._jisx0301('R01.05.01T04:05:06') + assert_equal([2019, 5, 1, 4, 5, 6, nil], + h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset)) + h = Date._jisx0301('R01.05.01T04:05:06,07') + assert_equal([2019, 5, 1, 4, 5, 6, nil], + h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset)) + h = Date._jisx0301('R01.05.01T04:05:06Z') + assert_equal([2019, 5, 1, 4, 5, 6, 0], + h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset)) + h = Date._jisx0301('R01.05.01T04:05:06.07+0100') + assert_equal([2019, 5, 1, 4, 5, 6, 3600], + h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset)) + h = Date._jisx0301('') assert_equal({}, h) end @@ -1132,6 +1148,10 @@ class TestDateParse < Test::Unit::TestCase assert_equal(Date.new(2019,5,1), d) assert_equal(Date::ITALY + 10, d.start) + d = Date.jisx0301('R01.05.01', Date::ITALY + 10) + assert_equal(Date.new(2019,5,1), d) + assert_equal(Date::ITALY + 10, d.start) + d = DateTime.jisx0301('H13.02.03T04:05:06+07:00', Date::ITALY + 10) assert_equal(DateTime.new(2001,2,3,4,5,6,'+07:00'), d) assert_equal(Date::ITALY + 10, d.start) @@ -1143,6 +1163,10 @@ class TestDateParse < Test::Unit::TestCase d = DateTime.jisx0301('H31.05.01T04:05:06+07:00', Date::ITALY + 10) assert_equal(DateTime.new(2019,5,1,4,5,6,'+07:00'), d) assert_equal(Date::ITALY + 10, d.start) + + d = DateTime.jisx0301('R01.05.01T04:05:06+07:00', Date::ITALY + 10) + assert_equal(DateTime.new(2019,5,1,4,5,6,'+07:00'), d) + assert_equal(Date::ITALY + 10, d.start) end def test_given_string diff --git a/test/date/test_date_strftime.rb b/test/date/test_date_strftime.rb index e52d4de1ae..dc237a909d 100644 --- a/test/date/test_date_strftime.rb +++ b/test/date/test_date_strftime.rb @@ -407,6 +407,7 @@ class TestDateStrftime < Test::Unit::TestCase assert_equal('H01.01.08', Date.parse('1989-01-08').jisx0301) assert_equal('H18.09.01', Date.parse('2006-09-01').jisx0301) assert_equal('H31.04.30', Date.parse('2019-04-30').jisx0301) + assert_equal('R01.05.01', Date.parse('2019-05-01').jisx0301) %w(M06.01.01 M45.07.29 @@ -417,6 +418,7 @@ class TestDateStrftime < Test::Unit::TestCase H01.01.08 H18.09.01 H31.04.30 + R01.05.01 ).each do |s| assert_equal(s, Date.parse(s).jisx0301) end -- cgit v1.2.3