mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* test/ruby/test_module.rb (test_ancestors, test_included_modules):
ignore rake mixins. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24331 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
f3f74f49f0
commit
22acf29509
2 changed files with 17 additions and 6 deletions
|
@ -1,3 +1,8 @@
|
|||
Fri Jul 31 00:55:48 2009 Yusuke Endoh <mame@tsg.ne.jp>
|
||||
|
||||
* test/ruby/test_module.rb (test_ancestors, test_included_modules):
|
||||
ignore rake mixins.
|
||||
|
||||
Fri Jul 31 00:30:54 2009 Yusuke Endoh <mame@tsg.ne.jp>
|
||||
|
||||
* vm_insnhelper.c (vm_call_cfunc): let set_trace_func use called_id
|
||||
|
@ -23277,12 +23282,12 @@ Sun May 25 17:52:25 2008 Yusuke Endoh <mame@tsg.ne.jp>
|
|||
|
||||
Sun May 25 04:30:45 2008 Yusuke Endoh <mame@tsg.ne.jp>
|
||||
|
||||
* test/ruby/test_modules.rb (remove_json_mixins): change judgment
|
||||
* test/ruby/test_module.rb (remove_json_mixins): change judgment
|
||||
condition.
|
||||
|
||||
Sun May 25 03:54:39 2008 Yusuke Endoh <mame@tsg.ne.jp>
|
||||
|
||||
* test/ruby/test_modules.rb (test_ancestors, test_included_modules):
|
||||
* test/ruby/test_module.rb (test_ancestors, test_included_modules):
|
||||
ignore json mixins.
|
||||
|
||||
Sun May 25 02:37:25 2008 Koichi Sasada <ko1@atdot.net>
|
||||
|
|
|
@ -72,6 +72,12 @@ class TestModule < Test::Unit::TestCase
|
|||
list.reject {|c| c.to_s.start_with?("JSON") }
|
||||
end
|
||||
|
||||
def remove_rake_mixins(list)
|
||||
list.
|
||||
reject {|c| c.to_s == "RakeFileUtils" }.
|
||||
reject {|c| c.to_s.start_with?("FileUtils") }
|
||||
end
|
||||
|
||||
module Mixin
|
||||
MIXIN = 1
|
||||
def mixin
|
||||
|
@ -205,9 +211,9 @@ class TestModule < Test::Unit::TestCase
|
|||
assert_equal([Mixin], Mixin.ancestors)
|
||||
|
||||
assert_equal([Object, Kernel, BasicObject],
|
||||
remove_json_mixins(remove_pp_mixins(Object.ancestors)))
|
||||
remove_rake_mixins(remove_json_mixins(remove_pp_mixins(Object.ancestors))))
|
||||
assert_equal([String, Comparable, Object, Kernel, BasicObject],
|
||||
remove_json_mixins(remove_pp_mixins(String.ancestors)))
|
||||
remove_rake_mixins(remove_json_mixins(remove_pp_mixins(String.ancestors))))
|
||||
end
|
||||
|
||||
def test_class_eval
|
||||
|
@ -246,9 +252,9 @@ class TestModule < Test::Unit::TestCase
|
|||
assert_equal([], Mixin.included_modules)
|
||||
assert_equal([Mixin], User.included_modules)
|
||||
assert_equal([Kernel],
|
||||
remove_json_mixins(remove_pp_mixins(Object.included_modules)))
|
||||
remove_rake_mixins(remove_json_mixins(remove_pp_mixins(Object.included_modules))))
|
||||
assert_equal([Comparable, Kernel],
|
||||
remove_json_mixins(remove_pp_mixins(String.included_modules)))
|
||||
remove_rake_mixins(remove_json_mixins(remove_pp_mixins(String.included_modules))))
|
||||
end
|
||||
|
||||
def test_instance_methods
|
||||
|
|
Loading…
Add table
Reference in a new issue