Merge rdoc-6.1.0.beta1.

  * https://github.com/ruby/rdoc/compare/v6.0.4...v6.1.0.beta1

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64547 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 22 insertions, 7 deletions

diff --git a/test/rdoc/test_rdoc_cross_reference.rb b/test/rdoc/test_rdoc_cross_reference.rb
index a294553704..8233fe3f61 100644
--- a/test/rdoc/test_rdoc_cross_reference.rb
+++ b/test/rdoc/test_rdoc_cross_reference.rb
@@ -107,18 +107,24 @@ class TestRDocCrossReference < XrefTestCase
   end
 
   def test_resolve_method
-    assert_ref @c1__m, 'm'
-    assert_ref @c1_m,  '#m'
-    assert_ref @c1__m, '::m'
-
-    assert_ref @c1_m,  'C1#m'
-    assert_ref @c1__m, 'C1.m'
-    assert_ref @c1__m, 'C1::m'
+    assert_ref @c1__m,    'm'
+    assert_ref @c1__m,    '::m'
+    assert_ref @c1_m,     '#m'
+    assert_ref @c1_plus,  '#+'
+
+    assert_ref @c1_m,     'C1#m'
+    assert_ref @c1_plus,  'C1#+'
+    assert_ref @c1__m,    'C1.m'
+    assert_ref @c1__m,    'C1::m'
 
     assert_ref @c1_m, 'C1#m'
     assert_ref @c1_m, 'C1#m()'
     assert_ref @c1_m, 'C1#m(*)'
 
+    assert_ref @c1_plus, 'C1#+'
+    assert_ref @c1_plus, 'C1#+()'
+    assert_ref @c1_plus, 'C1#+(*)'
+
     assert_ref @c1__m, 'C1.m'
     assert_ref @c1__m, 'C1.m()'
     assert_ref @c1__m, 'C1.m(*)'
@@ -139,6 +145,15 @@ class TestRDocCrossReference < XrefTestCase
     assert_ref @c2_c3_m, '::C2::C3#m(*)'
   end
 
+  def test_resolve_the_same_name_in_instance_and_class_method
+    assert_ref @c9_a_i_foo, 'C9::A#foo'
+    assert_ref @c9_a_c_bar, 'C9::A::bar'
+    assert_ref @c9_b_c_foo, 'C9::B::foo'
+    assert_ref @c9_b_i_bar, 'C9::B#bar'
+    assert_ref @c9_b_c_foo, 'C9::B.foo'
+    assert_ref @c9_a_c_bar, 'C9::B.bar'
+  end
+
   def test_resolve_method_equals3
     m = RDoc::AnyMethod.new '', '==='
     @c1.add_method m