[ruby/date] introduce Date::Error, raise Date::Error for every

"invalid <anything>" type of exception

https://github.com/ruby/date/commit/3e55c09ba4

3 files changed, 39 insertions, 27 deletions

diff --git a/test/date/test_date_new.rb b/test/date/test_date_new.rb
index b90eadfadb..eddeeff820 100644
--- a/test/date/test_date_new.rb
+++ b/test/date/test_date_new.rb
@@ -27,7 +27,7 @@ class TestDateNew < Test::Unit::TestCase
   end
 
   def test_jd__ex
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       DateTime.jd(0, 23,59,60,0)
     end
   end
@@ -118,10 +118,10 @@ class TestDateNew < Test::Unit::TestCase
   end
 
   def test_ordinal__ex
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       Date.ordinal(2001,366)
     end
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       DateTime.ordinal(2001,365, 23,59,60, 0)
     end
   end
@@ -181,13 +181,13 @@ class TestDateNew < Test::Unit::TestCase
   end
 
   def test_civil__ex
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       Date.civil(2001,2,29)
     end
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       DateTime.civil(2001,2,28, 23,59,60, 0)
     end
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       DateTime.civil(2001,2,28, 24,59,59, 0)
     end
   end
@@ -248,10 +248,10 @@ class TestDateNew < Test::Unit::TestCase
   end
 
   def test_commercial__ex
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       Date.commercial(1997,53,1)
     end
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       DateTime.commercial(1997,52,1, 23,59,60, 0)
     end
   end
@@ -270,10 +270,10 @@ class TestDateNew < Test::Unit::TestCase
     assert_equal(2452355, d.jd)
     assert_equal([11,22,33], [d.hour, d.min, d.sec])
 
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       Date.weeknum(1999,53,0, 0)
     end
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       Date.weeknum(1999,-53,-1, 0)
     end
   end if Date.respond_to?(:weeknum, true)
@@ -292,10 +292,10 @@ class TestDateNew < Test::Unit::TestCase
     assert_equal(2448682, d.jd)
     assert_equal([11,22,33], [d.hour, d.min, d.sec])
 
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       Date.nth_kday(2006,5, 5,0)
     end
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       Date.nth_kday(2006,5, -5,0)
     end
   end if Date.respond_to?(:nth_kday, true)
diff --git a/test/date/test_date_parse.rb b/test/date/test_date_parse.rb
index 26c61eb3d5..e791b2d012 100644
--- a/test/date/test_date_parse.rb
+++ b/test/date/test_date_parse.rb
@@ -659,27 +659,39 @@ class TestDateParse < Test::Unit::TestCase
   end
 
   def test_parse__ex
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       Date.parse('')
     end
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       DateTime.parse('')
     end
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       Date.parse('2001-02-29')
     end
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       DateTime.parse('2001-02-29T23:59:60')
     end
-    assert_nothing_raised(ArgumentError) do
+    assert_nothing_raised(Date::Error) do
       DateTime.parse('2001-03-01T23:59:60')
     end
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       DateTime.parse('2001-03-01T23:59:61')
     end
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       Date.parse('23:55')
     end
+
+    begin
+      Date.parse('')
+    rescue ArgumentError => e
+      assert e.is_a? Date::Error
+    end
+
+    begin
+      DateTime.parse('')
+    rescue ArgumentError => e
+      assert e.is_a? Date::Error
+    end
   end
 
   def test__iso8601
diff --git a/test/date/test_date_strptime.rb b/test/date/test_date_strptime.rb
index bbc0da5ac0..fc42ebf7cd 100644
--- a/test/date/test_date_strptime.rb
+++ b/test/date/test_date_strptime.rb
@@ -460,28 +460,28 @@ class TestDateStrptime < Test::Unit::TestCase
   end
 
   def test_strptime__ex
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       Date.strptime('')
     end
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       DateTime.strptime('')
     end
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       Date.strptime('2001-02-29', '%F')
     end
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       DateTime.strptime('2001-02-29T23:59:60', '%FT%T')
     end
-    assert_nothing_raised(ArgumentError) do
+    assert_nothing_raised(Date::Error) do
       DateTime.strptime('2001-03-01T23:59:60', '%FT%T')
     end
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       DateTime.strptime('2001-03-01T23:59:61', '%FT%T')
     end
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       Date.strptime('23:55', '%H:%M')
     end
-    assert_raise(ArgumentError) do
+    assert_raise(Date::Error) do
       Date.strptime('01-31-2011', '%m/%d/%Y')
     end
   end