diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/-ext-/test_recursion.rb | 36 | ||||
-rw-r--r-- | test/ruby/test_array.rb | 2 | ||||
-rw-r--r-- | test/ruby/test_thread.rb | 13 |
3 files changed, 37 insertions, 14 deletions
diff --git a/test/-ext-/test_recursion.rb b/test/-ext-/test_recursion.rb new file mode 100644 index 0000000000..43a256f942 --- /dev/null +++ b/test/-ext-/test_recursion.rb @@ -0,0 +1,36 @@ +# -*- coding: us-ascii -*- +require 'test/unit' +require_relative '../ruby/envutil' + +class TestRecursion < Test::Unit::TestCase + require '-test-/recursion' + + def setup + @obj = Struct.new(:visited).new(false) + @obj.extend(Bug::Recursive) + end + + def test_recursive + def @obj.doit + self.visited = true + exec_recursive(:doit) + raise "recursive" + end + assert_raise_with_message(RuntimeError, "recursive") { + @obj.exec_recursive(:doit) + } + assert(@obj.visited, "obj.hash was not called") + end + + def test_recursive_outer + def @obj.doit + self.visited = true + exec_recursive_outer(:doit) + raise "recursive_outer should short circuit intermediate calls" + end + assert_nothing_raised { + @obj.exec_recursive_outer(:doit) + } + assert(@obj.visited, "obj.hash was not called") + end +end diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index d7e1c365dd..9411c6a088 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -2012,9 +2012,9 @@ class TestArray < Test::Unit::TestCase end def test_hash2 + assert_not_equal([[1]].hash, [[2]].hash) a = [] a << a - assert_equal([[a]].hash, a.hash) assert_not_equal([a, a].hash, a.hash) # Implementation dependent end diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index ab1b81a8fe..f74c4ec9cb 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -467,19 +467,6 @@ class TestThread < Test::Unit::TestCase m.unlock end - def test_recursive_outer - arr = [] - obj = Struct.new(:foo, :visited).new(arr, false) - arr << obj - def obj.hash - self[:visited] = true - super - raise "recursive_outer should short circuit intermediate calls" - end - assert_nothing_raised {arr.hash} - assert(obj[:visited], "obj.hash was not called") - end - def test_thread_instance_variable bug4389 = '[ruby-core:35192]' assert_in_out_err([], <<-INPUT, %w(), [], bug4389) |