From 94f01c55dfd2d1ce49fb253432267d87cca64cd1 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 26 Nov 2013 17:20:16 +0000
Subject: should not ignore the rest of recursive constructs

* array.c (rb_ary_hash): should not ignore the rest of recursive
  constructs.
* hash.c (rb_hash_hash): ditto.
* range.c (range_hash): ditto.
* struct.c (rb_struct_hash): ditto.
* test/-ext-/test_recursion.rb (TestRecursion): separate from
  test/ruby/test_thread.rb.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43860 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/-ext-/test_recursion.rb | 36 ++++++++++++++++++++++++++++++++++++
 test/ruby/test_array.rb      |  2 +-
 test/ruby/test_thread.rb     | 13 -------------
 3 files changed, 37 insertions(+), 14 deletions(-)
 create mode 100644 test/-ext-/test_recursion.rb

(limited to 'test')

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)
-- 
cgit v1.2.3