From fc664d40132ce5f621f83c3178e90b7b73a612e6 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 30 Sep 2009 04:15:46 +0000
Subject: * vm_method.c (rb_add_method_def): show the location where  
 overwritten method was defined.  [ruby-dev:39400]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25169 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_class.rb  | 4 ++++
 test/ruby/test_module.rb | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'test/ruby')

diff --git a/test/ruby/test_class.rb b/test/ruby/test_class.rb
index 093448f2c..409fc49e4 100644
--- a/test/ruby/test_class.rb
+++ b/test/ruby/test_class.rb
@@ -106,6 +106,8 @@ class TestClass < Test::Unit::TestCase
   end
 
   def test_method_redefinition
+    feature2155 = '[ruby-dev:39400]'
+
     line = __LINE__+4
     stderr = EnvUtil.verbose_warning do
       Class.new do
@@ -114,6 +116,7 @@ class TestClass < Test::Unit::TestCase
       end
     end
     assert_match(/:#{line}: warning: method redefined; discarding old foo/, stderr)
+    assert_match(/:#{line-1}: warning: previous definition of foo/, stderr, feature2155)
 
     stderr = EnvUtil.verbose_warning do
       Class.new do
@@ -141,6 +144,7 @@ class TestClass < Test::Unit::TestCase
       end
     end
     assert_match(/:#{line}: warning: method redefined; discarding old foo/, stderr)
+    assert_match(/:#{line-1}: warning: previous definition of foo/, stderr, feature2155)
 
     stderr = EnvUtil.verbose_warning do
       Class.new do
diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb
index bfb347c46..c50cd38b7 100644
--- a/test/ruby/test_module.rb
+++ b/test/ruby/test_module.rb
@@ -788,6 +788,8 @@ class TestModule < Test::Unit::TestCase
   end
 
   def test_method_redefinition
+    feature2155 = '[ruby-dev:39400]'
+
     line = __LINE__+4
     stderr = EnvUtil.verbose_warning do
       Module.new do
@@ -796,6 +798,7 @@ class TestModule < Test::Unit::TestCase
       end
     end
     assert_match(/:#{line}: warning: method redefined; discarding old foo/, stderr)
+    assert_match(/:#{line-1}: warning: previous definition of foo/, stderr, feature2155)
 
     stderr = EnvUtil.verbose_warning do
       Module.new do
@@ -823,6 +826,7 @@ class TestModule < Test::Unit::TestCase
       end
     end
     assert_match(/:#{line}: warning: method redefined; discarding old foo/, stderr)
+    assert_match(/:#{line-1}: warning: previous definition of foo/, stderr, feature2155)
 
     stderr = EnvUtil.verbose_warning do
       Module.new do
-- 
cgit