diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-24 07:39:37 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-24 07:39:37 +0000 |
commit | df3e22ce84c2b19de9833f3b642098ee5abd826a (patch) | |
tree | ac513707b2dfc108f844d6338dc5e1933d189819 /test/rdoc | |
parent | 0f081edf7e2459dc22672cfa8f27c00fea5e24ad (diff) | |
download | ruby-df3e22ce84c2b19de9833f3b642098ee5abd826a.tar.gz |
Update rdoc-5.1.0
* Details of changes are following url.
https://github.com/rdoc/rdoc/blob/master/History.rdoc#510--2017-02-24
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57703 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rdoc')
-rw-r--r-- | test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Basics.text | 2 | ||||
-rw-r--r-- | test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Syntax.text | 2 | ||||
-rw-r--r-- | test/rdoc/test_rdoc_context.rb | 21 | ||||
-rw-r--r-- | test/rdoc/test_rdoc_i18n_text.rb | 2 | ||||
-rw-r--r-- | test/rdoc/test_rdoc_markdown_test.rb | 4 | ||||
-rw-r--r-- | test/rdoc/test_rdoc_ri_driver.rb | 12 | ||||
-rw-r--r-- | test/rdoc/test_rdoc_store.rb | 4 | ||||
-rw-r--r-- | test/rdoc/xref_data.rb | 25 | ||||
-rw-r--r-- | test/rdoc/xref_test_case.rb | 1 |
9 files changed, 60 insertions, 13 deletions
diff --git a/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Basics.text b/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Basics.text index 486055ca7f..6c5a6fdb4b 100644 --- a/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Basics.text +++ b/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Basics.text @@ -123,7 +123,7 @@ Output: Unordered (bulleted) lists use asterisks, pluses, and hyphens (`*`, `+`, and `-`) as list markers. These three markers are -interchangable; this: +interchangeable; this: * Candy. * Gum. diff --git a/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Syntax.text b/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Syntax.text index 57360a16c8..184018a5ac 100644 --- a/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Syntax.text +++ b/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Syntax.text @@ -298,7 +298,7 @@ Quote Level from the Text menu. Markdown supports ordered (numbered) and unordered (bulleted) lists. -Unordered lists use asterisks, pluses, and hyphens -- interchangably +Unordered lists use asterisks, pluses, and hyphens -- interchangeably -- as list markers: * Red diff --git a/test/rdoc/test_rdoc_context.rb b/test/rdoc/test_rdoc_context.rb index cc9ab3650f..9af1401f94 100644 --- a/test/rdoc/test_rdoc_context.rb +++ b/test/rdoc/test_rdoc_context.rb @@ -866,6 +866,27 @@ class TestRDocContext < XrefTestCase assert_equal [nil, 'Public', 'Internal'], titles end + def test_visibility_def + assert_equal :private, @c6.find_method_named('priv1').visibility + assert_equal :protected, @c6.find_method_named('prot1').visibility + assert_equal :public, @c6.find_method_named('pub1').visibility + assert_equal :private, @c6.find_method_named('priv2').visibility + assert_equal :protected, @c6.find_method_named('prot2').visibility + assert_equal :public, @c6.find_method_named('pub2').visibility + assert_equal :private, @c6.find_method_named('priv3').visibility + assert_equal :protected, @c6.find_method_named('prot3').visibility + assert_equal :public, @c6.find_method_named('pub3').visibility + assert_equal :private, @c6.find_method_named('priv4').visibility + assert_equal :protected, @c6.find_method_named('prot4').visibility + assert_equal :public, @c6.find_method_named('pub4').visibility + assert_equal :private, @c6.find_method_named('priv5').visibility + assert_equal :protected, @c6.find_method_named('prot5').visibility + assert_equal :public, @c6.find_method_named('pub5').visibility + assert_equal :private, @c6.find_method_named('priv6').visibility + assert_equal :protected, @c6.find_method_named('prot6').visibility + assert_equal :public, @c6.find_method_named('pub6').visibility + end + def util_visibilities @pub = RDoc::AnyMethod.new nil, 'pub' @prot = RDoc::AnyMethod.new nil, 'prot' diff --git a/test/rdoc/test_rdoc_i18n_text.rb b/test/rdoc/test_rdoc_i18n_text.rb index 61df193969..4169b92079 100644 --- a/test/rdoc/test_rdoc_i18n_text.rb +++ b/test/rdoc/test_rdoc_i18n_text.rb @@ -59,7 +59,7 @@ Paragraphe 2. assert_equal expected, translate(raw) end - def test_translate_not_transalted_message + def test_translate_not_translated_message nonexistent_paragraph = <<-PARAGRAPH.strip Nonexistent paragraph. PARAGRAPH diff --git a/test/rdoc/test_rdoc_markdown_test.rb b/test/rdoc/test_rdoc_markdown_test.rb index b80838131c..e738832fed 100644 --- a/test/rdoc/test_rdoc_markdown_test.rb +++ b/test/rdoc/test_rdoc_markdown_test.rb @@ -601,7 +601,7 @@ foo para("Unordered (bulleted) lists use asterisks, pluses, and hyphens (<code>*</code>,\n" + "<code>+</code>, and <code>-</code>) as list markers. These three markers are\n" + - "interchangable; this:"), + "interchangeable; this:"), verb("* Candy.\n", "* Gum.\n", @@ -1090,7 +1090,7 @@ foo para("Markdown supports ordered (numbered) and unordered (bulleted) lists."), - para("Unordered lists use asterisks, pluses, and hyphens -- interchangably\n" + + para("Unordered lists use asterisks, pluses, and hyphens -- interchangeably\n" + "-- as list markers:"), verb("* Red\n", diff --git a/test/rdoc/test_rdoc_ri_driver.rb b/test/rdoc/test_rdoc_ri_driver.rb index 144e74f825..1aa4762f92 100644 --- a/test/rdoc/test_rdoc_ri_driver.rb +++ b/test/rdoc/test_rdoc_ri_driver.rb @@ -282,7 +282,7 @@ class TestRDocRIDriver < RDoc::TestCase assert_equal expected, out end - def test_add_method_overriden + def test_add_method_overridden util_multi_store out = doc @@ -646,7 +646,7 @@ class TestRDocRIDriver < RDoc::TestCase assert_match %r%^=== Implementation from Foo%, out end - def test_display_method_overriden + def test_display_method_overridden util_multi_store out, = capture_io do @@ -1455,10 +1455,10 @@ Foo::Bar#bother @inherit = @cFoo.add_method RDoc::AnyMethod.new(nil, 'inherit') @inherit.record_location @top_level - # overriden by Bar in multi_store - @overriden = @cFoo.add_method RDoc::AnyMethod.new(nil, 'override') - @overriden.comment = 'must not be displayed in Bar#override' - @overriden.record_location @top_level + # overridden by Bar in multi_store + @overridden = @cFoo.add_method RDoc::AnyMethod.new(nil, 'override') + @overridden.comment = 'must not be displayed in Bar#override' + @overridden.record_location @top_level @store1.save diff --git a/test/rdoc/test_rdoc_store.rb b/test/rdoc/test_rdoc_store.rb index 4082df71ea..2c52d109ff 100644 --- a/test/rdoc/test_rdoc_store.rb +++ b/test/rdoc/test_rdoc_store.rb @@ -162,7 +162,7 @@ class TestRDocStore < XrefTestCase def test_all_classes_and_modules expected = %w[ - C1 C2 C2::C3 C2::C3::H1 C3 C3::H1 C3::H2 C4 C4::C4 C5 C5::C1 + C1 C2 C2::C3 C2::C3::H1 C3 C3::H1 C3::H2 C4 C4::C4 C5 C5::C1 C6 Child M1 M1::M2 Parent @@ -213,7 +213,7 @@ class TestRDocStore < XrefTestCase def test_classes expected = %w[ - C1 C2 C2::C3 C2::C3::H1 C3 C3::H1 C3::H2 C4 C4::C4 C5 C5::C1 + C1 C2 C2::C3 C2::C3::H1 C3 C3::H1 C3::H2 C4 C4::C4 C5 C5::C1 C6 Child Parent ] diff --git a/test/rdoc/xref_data.rb b/test/rdoc/xref_data.rb index 5d3f6a9a55..44d44956ac 100644 --- a/test/rdoc/xref_data.rb +++ b/test/rdoc/xref_data.rb @@ -57,6 +57,31 @@ class C5 end end +class C6 + private def priv1() end + def pub1() end + protected def prot1() end + def pub2() end + public def pub3() end + def pub4() end + + private + private def priv2() end + def priv3() end + protected def prot2() end + def priv4() end + public def pub5() end + def priv5() end + + protected + private def priv6() end + def prot3() end + protected def prot4() end + def prot5() end + public def pub6() end + def prot6() end +end + module M1 def m end diff --git a/test/rdoc/xref_test_case.rb b/test/rdoc/xref_test_case.rb index c0b3ae5abd..ea7fe705e3 100644 --- a/test/rdoc/xref_test_case.rb +++ b/test/rdoc/xref_test_case.rb @@ -51,6 +51,7 @@ class XrefTestCase < RDoc::TestCase @c5_c1 = @xref_data.find_module_named 'C5::C1' @c3_h1 = @xref_data.find_module_named 'C3::H1' @c3_h2 = @xref_data.find_module_named 'C3::H2' + @c6 = @xref_data.find_module_named 'C6' @m1 = @xref_data.find_module_named 'M1' @m1_m = @m1.method_list.first |