diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-24 18:55:44 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-24 18:55:44 +0000 |
commit | 87665465cd97b672237754e2ea967a4adc87cf48 (patch) | |
tree | b2c61fb28e379286c3f5806d6c9ea12256ac7e4b | |
parent | ed68367f9e583e01d8bb89a4b668b62c83e80cda (diff) | |
download | ruby-87665465cd97b672237754e2ea967a4adc87cf48.tar.gz |
* test/ruby/test_modules.rb (test_ancestors, test_included_modules):
ignore json mixins.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | test/ruby/test_module.rb | 14 |
2 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Sun May 25 03:54:39 2008 Yusuke Endoh <mame@tsg.ne.jp> + + * test/ruby/test_modules.rb (test_ancestors, test_included_modules): + ignore json mixins. + Sun May 25 02:37:25 2008 Koichi Sasada <ko1@atdot.net> * eval_method.c: renamed from vm_method.c. "vm_method.c" is included diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index 2e9d69af90..6e02c557ed 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -68,6 +68,10 @@ class TestModule < Test::Unit::TestCase list.reject {|c| c == PP::ObjectMixin } end + def remove_json_mixins(list) + list.reject {|c| c.instance_methods(false).include?(:to_json) } + end + module Mixin MIXIN = 1 def mixin @@ -194,9 +198,10 @@ class TestModule < Test::Unit::TestCase assert_equal([User, Mixin], User.ancestors) assert_equal([Mixin], Mixin.ancestors) - assert_equal([Object, Kernel, BasicObject], remove_pp_mixins(Object.ancestors)) + assert_equal([Object, Kernel, BasicObject], + remove_json_mixins(remove_pp_mixins(Object.ancestors))) assert_equal([String, Comparable, Object, Kernel, BasicObject], - remove_pp_mixins(String.ancestors)) + remove_json_mixins(remove_pp_mixins(String.ancestors))) end def test_class_eval @@ -242,9 +247,10 @@ class TestModule < Test::Unit::TestCase def test_included_modules assert_equal([], Mixin.included_modules) assert_equal([Mixin], User.included_modules) - assert_equal([Kernel], remove_pp_mixins(Object.included_modules)) + assert_equal([Kernel], + remove_json_mixins(remove_pp_mixins(Object.included_modules))) assert_equal([Comparable, Kernel], - remove_pp_mixins(String.included_modules)) + remove_json_mixins(remove_pp_mixins(String.included_modules))) end def test_instance_methods |