From a52ac350ccb8eb2ab394548844ffe681f9f02d0f Mon Sep 17 00:00:00 2001 From: Kevin Newton Date: Wed, 6 Sep 2023 10:30:47 -0400 Subject: [PATCH] [ruby/yarp] Fix assert_raises in YARP https://github.com/ruby/yarp/commit/8f8f3530aa --- test/yarp/pattern_test.rb | 18 +++++++++--------- test/yarp/test_helper.rb | 4 ++++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/test/yarp/pattern_test.rb b/test/yarp/pattern_test.rb index 76e6e3e7885a18..d34fe84458f206 100644 --- a/test/yarp/pattern_test.rb +++ b/test/yarp/pattern_test.rb @@ -3,37 +3,37 @@ require_relative "test_helper" module YARP - class PatternTest < Test::Unit::TestCase + class PatternTest < TestCase def test_invalid_syntax - assert_raises(Pattern::CompilationError) { scan("", "<>") } + assert_raise(Pattern::CompilationError) { scan("", "<>") } end def test_invalid_constant - assert_raises(Pattern::CompilationError) { scan("", "Foo") } + assert_raise(Pattern::CompilationError) { scan("", "Foo") } end def test_invalid_nested_constant - assert_raises(Pattern::CompilationError) { scan("", "Foo::Bar") } + assert_raise(Pattern::CompilationError) { scan("", "Foo::Bar") } end def test_regexp_with_interpolation - assert_raises(Pattern::CompilationError) { scan("", "/\#{foo}/") } + assert_raise(Pattern::CompilationError) { scan("", "/\#{foo}/") } end def test_string_with_interpolation - assert_raises(Pattern::CompilationError) { scan("", '"#{foo}"') } + assert_raise(Pattern::CompilationError) { scan("", '"#{foo}"') } end def test_symbol_with_interpolation - assert_raises(Pattern::CompilationError) { scan("", ":\"\#{foo}\"") } + assert_raise(Pattern::CompilationError) { scan("", ":\"\#{foo}\"") } end def test_invalid_node - assert_raises(Pattern::CompilationError) { scan("", "IntegerNode[^foo]") } + assert_raise(Pattern::CompilationError) { scan("", "IntegerNode[^foo]") } end def test_self - assert_raises(Pattern::CompilationError) { scan("", "self") } + assert_raise(Pattern::CompilationError) { scan("", "self") } end def test_array_pattern_no_constant diff --git a/test/yarp/test_helper.rb b/test/yarp/test_helper.rb index b79adf4b166e91..086b73dd563a6c 100644 --- a/test/yarp/test_helper.rb +++ b/test/yarp/test_helper.rb @@ -19,6 +19,10 @@ module YARP class TestCase < ::Test::Unit::TestCase private + def assert_raises(*args, &block) + raise "Use assert_raise instead" + end + def assert_equal_nodes(expected, actual, compare_location: true, parent: nil) assert_equal expected.class, actual.class