1 files changed, 15 insertions, 33 deletions

diff --git a/test/psych/test_exception.rb b/test/psych/test_exception.rb
index 78601d09c7..c1e69ab18d 100644
--- a/test/psych/test_exception.rb
+++ b/test/psych/test_exception.rb
@@ -33,42 +33,36 @@ module Psych
 
     def test_backtrace
       err     = make_ex
-      new_err = Psych.load(Psych.dump(err))
+      new_err = Psych.unsafe_load(Psych.dump(err))
       assert_equal err.backtrace, new_err.backtrace
     end
 
     def test_naming_exception
       err     = String.xxx rescue $!
-      new_err = Psych.load(Psych.dump(err))
+      new_err = Psych.unsafe_load(Psych.dump(err))
       assert_equal err.message, new_err.message
     end
 
     def test_load_takes_file
-      ex = assert_raises(Psych::SyntaxError) do
+      ex = assert_raise(Psych::SyntaxError) do
         Psych.load '--- `'
       end
       assert_nil ex.file
 
-      ex = assert_raises(Psych::SyntaxError) do
+      ex = assert_raise(Psych::SyntaxError) do
         Psych.load '--- `', filename: 'meow'
       end
       assert_equal 'meow', ex.file
-
-      # deprecated interface
-      ex = assert_raises(Psych::SyntaxError) do
-        Psych.load '--- `', 'deprecated'
-      end
-      assert_equal 'deprecated', ex.file
     end
 
     def test_psych_parse_stream_takes_file
-      ex = assert_raises(Psych::SyntaxError) do
+      ex = assert_raise(Psych::SyntaxError) do
         Psych.parse_stream '--- `'
       end
       assert_nil ex.file
       assert_match '(<unknown>)', ex.message
 
-      ex = assert_raises(Psych::SyntaxError) do
+      ex = assert_raise(Psych::SyntaxError) do
         Psych.parse_stream '--- `', filename: 'omg!'
       end
       assert_equal 'omg!', ex.file
@@ -76,22 +70,16 @@ module Psych
     end
 
     def test_load_stream_takes_file
-      ex = assert_raises(Psych::SyntaxError) do
+      ex = assert_raise(Psych::SyntaxError) do
         Psych.load_stream '--- `'
       end
       assert_nil ex.file
       assert_match '(<unknown>)', ex.message
 
-      ex = assert_raises(Psych::SyntaxError) do
+      ex = assert_raise(Psych::SyntaxError) do
         Psych.load_stream '--- `', filename: 'omg!'
       end
       assert_equal 'omg!', ex.file
-
-      # deprecated interface
-      ex = assert_raises(Psych::SyntaxError) do
-        Psych.load_stream '--- `', 'deprecated'
-      end
-      assert_equal 'deprecated', ex.file
     end
 
     def test_parse_file_exception
@@ -99,7 +87,7 @@ module Psych
         t.binmode
         t.write '--- `'
         t.close
-        ex = assert_raises(Psych::SyntaxError) do
+        ex = assert_raise(Psych::SyntaxError) do
           Psych.parse_file t.path
         end
         assert_equal t.path, ex.file
@@ -111,7 +99,7 @@ module Psych
         t.binmode
         t.write '--- `'
         t.close
-        ex = assert_raises(Psych::SyntaxError) do
+        ex = assert_raise(Psych::SyntaxError) do
           Psych.load_file t.path
         end
         assert_equal t.path, ex.file
@@ -123,7 +111,7 @@ module Psych
         t.binmode
         t.write '--- `'
         t.close
-        ex = assert_raises(Psych::SyntaxError) do
+        ex = assert_raise(Psych::SyntaxError) do
           Psych.safe_load_file t.path
         end
         assert_equal t.path, ex.file
@@ -131,26 +119,20 @@ module Psych
     end
 
     def test_psych_parse_takes_file
-      ex = assert_raises(Psych::SyntaxError) do
+      ex = assert_raise(Psych::SyntaxError) do
         Psych.parse '--- `'
       end
       assert_match '(<unknown>)', ex.message
       assert_nil ex.file
 
-      ex = assert_raises(Psych::SyntaxError) do
+      ex = assert_raise(Psych::SyntaxError) do
         Psych.parse '--- `', filename: 'omg!'
       end
       assert_match 'omg!', ex.message
-
-      # deprecated interface
-      ex = assert_raises(Psych::SyntaxError) do
-        Psych.parse '--- `', 'deprecated'
-      end
-      assert_match 'deprecated', ex.message
     end
 
     def test_attributes
-      e = assert_raises(Psych::SyntaxError) {
+      e = assert_raise(Psych::SyntaxError) {
         Psych.load '--- `foo'
       }
 
@@ -165,7 +147,7 @@ module Psych
     end
 
     def test_convert
-      w = Psych.load(Psych.dump(@wups))
+      w = Psych.unsafe_load(Psych.dump(@wups))
       assert_equal @wups.message, w.message
       assert_equal @wups.backtrace, w.backtrace
       assert_equal 1, w.foo