From 75ef9e79d6f872d9155cfa69d717b0c693be7fc9 Mon Sep 17 00:00:00 2001 From: drbrain Date: Mon, 19 Apr 2010 05:08:28 +0000 Subject: Import RDoc 2.5.4 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rdoc/test_rdoc_markup_to_html_crossref.rb | 51 ++++++++++++++------------ 1 file changed, 27 insertions(+), 24 deletions(-) (limited to 'test/rdoc/test_rdoc_markup_to_html_crossref.rb') diff --git a/test/rdoc/test_rdoc_markup_to_html_crossref.rb b/test/rdoc/test_rdoc_markup_to_html_crossref.rb index a0c84666db..67dfc0cbc9 100644 --- a/test/rdoc/test_rdoc_markup_to_html_crossref.rb +++ b/test/rdoc/test_rdoc_markup_to_html_crossref.rb @@ -27,31 +27,30 @@ class TestRDocMarkupToHtmlCrossref < XrefTestCase refute_ref '#m', '#m' + assert_ref '../C1.html#method-c-m', 'C1::m' assert_ref '../C2/C3.html', 'C2::C3' - assert_ref '../C2/C3.html#M000002', 'C2::C3#m' + assert_ref '../C2/C3.html#method-i-m', 'C2::C3#m' assert_ref '../C2/C3/H1.html', 'C3::H1' assert_ref '../C4.html', 'C4' - # TODO there is a C3::H2 in the top-level namespace and RDoc should follow - # constant scoping rules - refute_ref 'C3::H2', 'C3::H2' + assert_ref '../C3/H2.html', 'C3::H2' refute_ref 'H1', 'H1' end def test_handle_special_CROSSREF_C2_C3 @xref = RDoc::Markup::ToHtmlCrossref.new 'classes/C2/C3.html', @c2_c3, true - assert_ref '../../C2/C3.html#M000002', '#m' + assert_ref '../../C2/C3.html#method-i-m', '#m' assert_ref '../../C2/C3.html', 'C3' - assert_ref '../../C2/C3.html#M000002', 'C3#m' + assert_ref '../../C2/C3.html#method-i-m', 'C3#m' assert_ref '../../C2/C3/H1.html', 'H1' assert_ref '../../C2/C3/H1.html', 'C3::H1' assert_ref '../../C4.html', 'C4' - refute_ref 'C3::H2', 'C3::H2' + assert_ref '../../C3/H2.html', 'C3::H2' end def test_handle_special_CROSSREF_C3 @@ -105,30 +104,34 @@ class TestRDocMarkupToHtmlCrossref < XrefTestCase def test_handle_special_CROSSREF_method refute_ref 'm', 'm' - assert_ref 'C1.html#M000000', '#m' + assert_ref 'C1.html#method-i-m', '#m' + assert_ref 'C1.html#method-c-m', '::m' + + assert_ref 'C1.html#method-i-m', 'C1#m' + assert_ref 'C1.html#method-i-m', 'C1.m' + assert_ref 'C1.html#method-c-m', 'C1::m' - assert_ref 'C1.html#M000000', 'C1#m' - assert_ref 'C1.html#M000000', 'C1#m()' - assert_ref 'C1.html#M000000', 'C1#m(*)' + assert_ref 'C1.html#method-i-m', 'C1#m' + assert_ref 'C1.html#method-i-m', 'C1#m()' + assert_ref 'C1.html#method-i-m', 'C1#m(*)' - assert_ref 'C1.html#M000000', 'C1.m' - assert_ref 'C1.html#M000000', 'C1.m()' - assert_ref 'C1.html#M000000', 'C1.m(*)' + assert_ref 'C1.html#method-i-m', 'C1.m' + assert_ref 'C1.html#method-i-m', 'C1.m()' + assert_ref 'C1.html#method-i-m', 'C1.m(*)' - # HACK should this work - #assert_ref 'classes/C1.html#M000001', 'C1::m' - #assert_ref 'classes/C1.html#M000001', 'C1::m()' - #assert_ref 'classes/C1.html#M000001', 'C1::m(*)' + assert_ref 'C1.html#method-c-m', 'C1::m' + assert_ref 'C1.html#method-c-m', 'C1::m()' + assert_ref 'C1.html#method-c-m', 'C1::m(*)' - assert_ref 'C2/C3.html#M000002', 'C2::C3#m' + assert_ref 'C2/C3.html#method-i-m', 'C2::C3#m' - assert_ref 'C2/C3.html#M000002', 'C2::C3.m' + assert_ref 'C2/C3.html#method-i-m', 'C2::C3.m' - assert_ref 'C2/C3/H1.html#M000003', 'C2::C3::H1#m?' + assert_ref 'C2/C3/H1.html#method-i-m%3F', 'C2::C3::H1#m?' - assert_ref 'C2/C3.html#M000002', '::C2::C3#m' - assert_ref 'C2/C3.html#M000002', '::C2::C3#m()' - assert_ref 'C2/C3.html#M000002', '::C2::C3#m(*)' + assert_ref 'C2/C3.html#method-i-m', '::C2::C3#m' + assert_ref 'C2/C3.html#method-i-m', '::C2::C3#m()' + assert_ref 'C2/C3.html#method-i-m', '::C2::C3#m(*)' end def test_handle_special_CROSSREF_no_ref -- cgit v1.2.3