From 24a59101f2ff8b471ec1c11171f8a47947fd4afe Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 9 Mar 2014 02:05:09 +0000 Subject: [PATCH 1/4] adjust tests to account for unsorted methods --- test/ruby/test_module.rb | 6 +++--- test/ruby/test_struct.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index b5e128b..4419644 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -1065,7 +1065,7 @@ class TestModule < Test::Unit::TestCase (class << self ; self ; end).class_eval do define_method :method_added do |sym| memo << sym - memo << mod.instance_methods(false) + memo << mod.instance_methods(false).sort memo << (mod.instance_method(sym) rescue nil) end end @@ -1082,10 +1082,10 @@ class TestModule < Test::Unit::TestCase assert_equal [:f, :g], memo.shift assert_equal mod.instance_method(:f), memo.shift assert_equal :a, memo.shift - assert_equal [:f, :g, :a], memo.shift + assert_equal [:a, :f, :g], memo.shift assert_equal mod.instance_method(:a), memo.shift assert_equal :a=, memo.shift - assert_equal [:f, :g, :a, :a=], memo.shift + assert_equal [:a, :a=, :f, :g], memo.shift assert_equal mod.instance_method(:a=), memo.shift end diff --git a/test/ruby/test_struct.rb b/test/ruby/test_struct.rb index 2acec57..7a81bea 100644 --- a/test/ruby/test_struct.rb +++ b/test/ruby/test_struct.rb @@ -141,7 +141,7 @@ module TestStruct assert_equal("#", o.inspect) methods = klass.instance_methods(false) - assert_equal([:@a, :"@a="].inspect, methods.inspect, '[Bug #8756]') + assert_equal([:@a, :"@a="].inspect, methods.sort.inspect, '[Bug #8756]') assert_include(methods, :@a) assert_include(methods, :"@a=") end -- 1.9.0.rc3.13.gda73b5f