From 87665465cd97b672237754e2ea967a4adc87cf48 Mon Sep 17 00:00:00 2001 From: mame Date: Sat, 24 May 2008 18:55:44 +0000 Subject: * 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 --- ChangeLog | 5 +++++ test/ruby/test_module.rb | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb08713ea1..66fe3c681a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun May 25 03:54:39 2008 Yusuke Endoh + + * test/ruby/test_modules.rb (test_ancestors, test_included_modules): + ignore json mixins. + Sun May 25 02:37:25 2008 Koichi Sasada * 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 -- cgit v1.2.3