From 98c7058bf7b3eab91c62a77cb10b09f6c8ed368e Mon Sep 17 00:00:00 2001 From: hsbt Date: Mon, 26 Mar 2018 05:56:26 +0000 Subject: Merge RDoc 6.0.3 from upstream. It fixed the several bugs that was found after RDoc 6 releasing. From: SHIBATA Hiroshi git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62924 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rdoc/test_rdoc_any_method.rb | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'test/rdoc/test_rdoc_any_method.rb') diff --git a/test/rdoc/test_rdoc_any_method.rb b/test/rdoc/test_rdoc_any_method.rb index 55793255ba..b5281f611d 100644 --- a/test/rdoc/test_rdoc_any_method.rb +++ b/test/rdoc/test_rdoc_any_method.rb @@ -133,7 +133,7 @@ method(a, b) { |c, d| ... } assert_equal 'Klass#method', loaded.full_name assert_equal 'method', loaded.name assert_equal 'param', loaded.params - assert_equal nil, loaded.singleton # defaults to nil + assert_nil loaded.singleton # defaults to nil assert_equal :public, loaded.visibility assert_equal cm, loaded.parent assert_equal section, loaded.section @@ -151,6 +151,19 @@ method(a, b) { |c, d| ... } assert aliased_method.display? end + def test_marshal_load_aliased_method_with_nil_singleton + aliased_method = Marshal.load Marshal.dump(@c2_a) + + aliased_method.store = @store + aliased_method.is_alias_for = ["C2", nil, "b"] + + assert_equal 'C2#a', aliased_method.full_name + assert_equal 'C2', aliased_method.parent_name + assert_equal '()', aliased_method.params + assert_equal @c2_b, aliased_method.is_alias_for, 'is_alias_for' + assert aliased_method.display? + end + def test_marshal_load_class_method class_method = Marshal.load Marshal.dump(@c1.method_list.first) @@ -207,9 +220,9 @@ method(a, b) { |c, d| ... } assert_equal 'Klass#method', loaded.full_name assert_equal 'method', loaded.name assert_equal 'param', loaded.params - assert_equal nil, loaded.singleton # defaults to nil + assert_nil loaded.singleton # defaults to nil assert_equal :public, loaded.visibility - assert_equal nil, loaded.file + assert_nil loaded.file assert_equal cm, loaded.parent assert_equal section, loaded.section assert_nil loaded.is_alias_for @@ -264,7 +277,7 @@ method(a, b) { |c, d| ... } assert_equal 'Klass#method', loaded.full_name assert_equal 'method', loaded.name assert_equal 'param', loaded.params - assert_equal nil, loaded.singleton # defaults to nil + assert_nil loaded.singleton # defaults to nil assert_equal :public, loaded.visibility assert_equal cm, loaded.parent assert_equal section, loaded.section @@ -467,4 +480,3 @@ method(a, b) { |c, d| ... } end end - -- cgit v1.2.3