nobu	2009-09-29 15:59:42 +0900 (Tue, 29 Sep 2009)

  New Revision: 25151

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25151

  Log:
    * test/ruby/test_{class,module}.rb (test_method_redefinition): include
      warned line number.

  Modified files:
    trunk/test/ruby/test_class.rb
    trunk/test/ruby/test_module.rb

Index: test/ruby/test_module.rb
===================================================================
--- test/ruby/test_module.rb	(revision 25150)
+++ test/ruby/test_module.rb	(revision 25151)
@@ -788,25 +788,53 @@
   end
 
   def test_method_redefinition
+    line = __LINE__+4
     stderr = EnvUtil.verbose_warning do
       Module.new do
         def foo; end
         def foo; end
       end
     end
-    assert_match(/method redefined; discarding old foo/, stderr)
+    assert_match(/:#{line}: warning: method redefined; discarding old foo/, stderr)
 
     stderr = EnvUtil.verbose_warning do
       Module.new do
         def foo; end
         alias bar foo
+        def foo; end
+      end
+    end
+    assert_equal("", stderr)
+
+    stderr = EnvUtil.verbose_warning do
+      Module.new do
+        def foo; end
         alias bar foo
+        alias bar foo
       end
     end
     assert_equal("", stderr)
 
+    line = __LINE__+4
     stderr = EnvUtil.verbose_warning do
       Module.new do
+        define_method(:foo) do end
+        def foo; end
+      end
+    end
+    assert_match(/:#{line}: warning: method redefined; discarding old foo/, stderr)
+
+    stderr = EnvUtil.verbose_warning do
+      Module.new do
+        define_method(:foo) do end
+        alias bar foo
+        alias barf oo
+      end
+    end
+    assert_equal("", stderr)
+
+    stderr = EnvUtil.verbose_warning do
+      Module.new do
         module_function
         def foo; end
         module_function :foo
Index: test/ruby/test_class.rb
===================================================================
--- test/ruby/test_class.rb	(revision 25150)
+++ test/ruby/test_class.rb	(revision 25151)
@@ -106,13 +106,14 @@
   end
 
   def test_method_redefinition
+    line = __LINE__+4
     stderr = EnvUtil.verbose_warning do
       Class.new do
         def foo; end
         def foo; end
       end
     end
-    assert_match(/method redefined; discarding old foo/, stderr)
+    assert_match(/:#{line}: warning: method redefined; discarding old foo/, stderr)
 
     stderr = EnvUtil.verbose_warning do
       Class.new do
@@ -132,6 +133,7 @@
     end
     assert_equal("", stderr)
 
+    line = __LINE__+4
     stderr = EnvUtil.verbose_warning do
       Class.new do
         define_method(:foo) do end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/