From 17f1cdaa00ff51470b934c99f6e54a24bf377b71 Mon Sep 17 00:00:00 2001 From: shugo Date: Wed, 12 Jun 2013 14:33:59 +0000 Subject: * eval.c (mod_using): new method Module#using, which activates refinements of the specified module only in the current class or module definition. [ruby-core:55273] [Feature #8481] * test/ruby/test_refinement.rb: related test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_refinement.rb | 65 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 57 insertions(+), 8 deletions(-) (limited to 'test/ruby/test_refinement.rb') diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb index 23b73667a7..5c4a99b121 100644 --- a/test/ruby/test_refinement.rb +++ b/test/ruby/test_refinement.rb @@ -429,14 +429,6 @@ class TestRefinement < Test::Unit::TestCase end end - def test_no_module_using - assert_raise(NoMethodError) do - Module.new { - using Module.new - } - end - end - class UsingClass end @@ -826,6 +818,63 @@ class TestRefinement < Test::Unit::TestCase assert_equal([:foo, :ref, bug7925], x, bug7925) end + module ModuleUsing + using FooExt + + def self.invoke_x_on(foo) + return foo.x + end + + def self.invoke_y_on(foo) + return foo.y + end + + def self.invoke_z_on(foo) + return foo.z + end + + def self.send_z_on(foo) + return foo.send(:z) + end + + def self.method_z(foo) + return foo.method(:z) + end + + def self.invoke_call_x_on(foo) + return foo.call_x + end + end + + def test_module_using + foo = Foo.new + assert_equal("Foo#x", foo.x) + assert_equal("Foo#y", foo.y) + assert_raise(NoMethodError) { foo.z } + assert_equal("FooExt#x", ModuleUsing.invoke_x_on(foo)) + assert_equal("FooExt#y Foo#y", ModuleUsing.invoke_y_on(foo)) + assert_equal("FooExt#z", ModuleUsing.invoke_z_on(foo)) + assert_equal("Foo#x", foo.x) + assert_equal("Foo#y", foo.y) + assert_raise(NoMethodError) { foo.z } + end + + def test_module_using_in_method + assert_raise(RuntimeError) do + Module.new.send(:using, FooExt) + end + end + + def test_module_using_invalid_self + assert_raise(RuntimeError) do + eval <<-EOF, TOPLEVEL_BINDING + module TestRefinement::TestModuleUsingInvalidSelf + Module.new.send(:using, TestRefinement::FooExt) + end + EOF + end + end + private def eval_using(mod, s) -- cgit v1.2.3