Tidy up detect_recursion specs

Author: chrisseaton

spec/truffle/thread/detect_recursion_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. This
+# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved. This
 # code is released under a tri EPL/GPL/LGPL license. You can use it,
 # redistribute it and/or modify it under the terms of the:
 #
@@ -8,59 +8,61 @@
 
 require_relative '../../ruby/spec_helper'
 
-describe "Thread#detect_recursion" do
-
-  before :each do
-    def check_recursion_to_depth(obj, depth)
-      return false unless obj.class.method_defined? :each
-      Thread.detect_recursion obj do 
-        if depth > 1
-          obj.each do |el|
-            if check_recursion_to_depth(el, depth-1)
-              return true
-            end
+module TruffleThreadDetectRecursionSpecFixtures
+  def self.check_recursion_to_depth(obj, depth)
+    # checks that obj recurses to a given depth
+    return false unless obj.class.method_defined? :each
+    Thread.detect_recursion(obj) do 
+      if depth > 1
+        obj.each do |el|
+          if check_recursion_to_depth(el, depth-1)
+            return true
           end
         end
       end
     end
+  end
 
-    def check_double_recursion_equality_to_depth(obj1, obj2, depth)
-      # checks that obj1 and obj2 are both recursive and equal structurally
-      # (because detect_recursion on two objects is only used during object comparison,
-      # and aborts after inequality is discovered)
-      return false unless obj1.class == obj2.class
-      return false unless obj1.class.method_defined? :each
-      return false unless obj1.size == obj2.size
-
-      Thread.detect_recursion obj1 obj2 do 
-        if depth > 1
-          if obj1.class == Hash
-            obj1.each do |key, val|
-              return false unless obj2.has_key?(key)
-              if check_double_recursion_equality_to_depth(val, obj2[key], depth-1)
-                return true
-              end
+  def self.check_double_recursion_equality_to_depth(obj1, obj2, depth)
+    # checks that obj1 and obj2 are both recursive and equal structurally
+    # (because detect_recursion on two objects is only used during object comparison,
+    # and aborts after inequality is discovered)
+    return false unless obj1.class == obj2.class
+    return false unless obj1.class.method_defined? :each
+    return false unless obj1.size == obj2.size
+
+    Thread.detect_recursion(obj1, obj2) do
+      if depth > 1
+        if obj1.class == Hash
+          obj1.each do |key, val|
+            return false unless obj2.has_key?(key)
+            if check_double_recursion_equality_to_depth(val, obj2[key], depth-1)
+              return true
             end
-          else
-            obj1.size.times do |i|
-              if check_double_recursion_equality_to_depth(obj1[i], obj2[i], depth-1)
-                return true
-              end
+          end
+        else
+          obj1.size.times do |i|
+            if check_double_recursion_equality_to_depth(obj1[i], obj2[i], depth-1)
+              return true
             end
           end
         end
       end
     end
   end
+end
+
+describe "Thread#detect_recursion" do
 
   describe "for single arrays" do
     it "for non-recursive arrays returns false" do
       a = [1,[2,[3], 4],[[[5,6,7]]]]
 
       10.times do |i|
-        check_recursion_to_depth(a, i).should be_false
+        TruffleThreadDetectRecursionSpecFixtures.check_recursion_to_depth(a, i).should be_false
       end
     end
+
     it "for recursive arrays returns true after sufficient depth to detect recursion" do
       a = []
       a << [[[a]]]
@@ -70,11 +72,11 @@ def check_double_recursion_equality_to_depth(obj1, obj2, depth)
 
       10.times do |i|
         if i < 5
-          check_recursion_to_depth(a, i).should be_false
-          check_recursion_to_depth(b, i).should be_false
+          TruffleThreadDetectRecursionSpecFixtures.check_recursion_to_depth(a, i).should be_false
+          TruffleThreadDetectRecursionSpecFixtures.check_recursion_to_depth(b, i).should be_false
         else
-          check_recursion_to_depth(a, i).should be_true
-          check_recursion_to_depth(b, i).should be_true
+          TruffleThreadDetectRecursionSpecFixtures.check_recursion_to_depth(a, i).should be_true
+          TruffleThreadDetectRecursionSpecFixtures.check_recursion_to_depth(b, i).should be_true
         end
       end
     end
@@ -85,18 +87,19 @@ def check_double_recursion_equality_to_depth(obj1, obj2, depth)
       a = {:q => {:w => "qwe" }, :t => {:q => {:w => "qwe" }, :t => {:q => {:w => "qwe" }}}}
 
       10.times do |i|
-        check_recursion_to_depth(a, i).should be_false
+        TruffleThreadDetectRecursionSpecFixtures.check_recursion_to_depth(a, i).should be_false
       end
     end
+
     it "for recursive hashes returns true after sufficient depth to detect recursion" do
       a = {:q => {:w => "qwe" }}
       a[:t] = a
 
       10.times do |i|
         if i < 3
-          check_recursion_to_depth(a, i).should be_false
+          TruffleThreadDetectRecursionSpecFixtures.check_recursion_to_depth(a, i).should be_false
         else
-          check_recursion_to_depth(a, i).should be_true
+          TruffleThreadDetectRecursionSpecFixtures.check_recursion_to_depth(a, i).should be_true
         end
       end
     end
@@ -110,9 +113,9 @@ def check_double_recursion_equality_to_depth(obj1, obj2, depth)
 
       10.times do |i|
         if i < 2
-          check_recursion_to_depth(a, i).should be_false
+          TruffleThreadDetectRecursionSpecFixtures.check_recursion_to_depth(a, i).should be_false
         else
-          check_recursion_to_depth(a, i).should be_true
+          TruffleThreadDetectRecursionSpecFixtures.check_recursion_to_depth(a, i).should be_true
         end
       end
     end
@@ -126,9 +129,9 @@ def check_double_recursion_equality_to_depth(obj1, obj2, depth)
 
       10.times do |i|
         if i < 8
-          check_recursion_to_depth(a, i).should be_false
+          TruffleThreadDetectRecursionSpecFixtures.check_recursion_to_depth(a, i).should be_false
         else
-          check_recursion_to_depth(a, i).should be_true
+          TruffleThreadDetectRecursionSpecFixtures.check_recursion_to_depth(a, i).should be_true
         end
       end
     end
@@ -142,9 +145,10 @@ def check_double_recursion_equality_to_depth(obj1, obj2, depth)
       c = [[[[[[[[[a,1]]]]]]]]]
 
       10.times do |i|
-        check_double_recursion_equality_to_depth(a, c, i).should be_false
+        TruffleThreadDetectRecursionSpecFixtures.check_double_recursion_equality_to_depth(a, c, i).should be_false
       end
     end
+
     it "returns true after sufficient depth to detect recursion and equivalent structure" do
       a = []
       a << a
@@ -154,9 +158,9 @@ def check_double_recursion_equality_to_depth(obj1, obj2, depth)
 
       10.times do |i|
         if i < 8
-          check_double_recursion_equality_to_depth(a, b, i).should be_false
+          TruffleThreadDetectRecursionSpecFixtures.check_double_recursion_equality_to_depth(a, b, i).should be_false
         else
-          check_double_recursion_equality_to_depth(a, b, i).should be_true
+          TruffleThreadDetectRecursionSpecFixtures.check_double_recursion_equality_to_depth(a, b, i).should be_true
         end
       end
     end
@@ -170,9 +174,10 @@ def check_double_recursion_equality_to_depth(obj1, obj2, depth)
       b = {:q => {:w => "qwe" }, :t => {:t => {:w => "qwe" }, :q => a}}
 
       10.times do |i|
-        check_double_recursion_equality_to_depth(a, b, i).should be_false
+        TruffleThreadDetectRecursionSpecFixtures.check_double_recursion_equality_to_depth(a, b, i).should be_false
       end
     end
+
     it "returns true after sufficient depth to detect recursion and equivalent structure" do
       a = {:q => {:w => "qwe" }}
       a[:t] = a
@@ -181,9 +186,9 @@ def check_double_recursion_equality_to_depth(obj1, obj2, depth)
 
       10.times do |i|
         if i < 4
-          check_double_recursion_equality_to_depth(a, b, i).should be_false
+          TruffleThreadDetectRecursionSpecFixtures.check_double_recursion_equality_to_depth(a, b, i).should be_false
         else
-          check_double_recursion_equality_to_depth(a, b, i).should be_true
+          TruffleThreadDetectRecursionSpecFixtures.check_double_recursion_equality_to_depth(a, b, i).should be_true
         end
       end
     end
@@ -198,9 +203,9 @@ def check_double_recursion_equality_to_depth(obj1, obj2, depth)
 
       10.times do |i|
         if i < 3
-          check_double_recursion_equality_to_depth(a, b, i).should be_false
+          TruffleThreadDetectRecursionSpecFixtures.check_double_recursion_equality_to_depth(a, b, i).should be_false
         else
-          check_double_recursion_equality_to_depth(a, b, i).should be_true
+          TruffleThreadDetectRecursionSpecFixtures.check_double_recursion_equality_to_depth(a, b, i).should be_true
         end
       end
     end
@@ -215,11 +220,12 @@ def check_double_recursion_equality_to_depth(obj1, obj2, depth)
 
       20.times do |i|
         if i < 11
-          check_double_recursion_equality_to_depth(a, b, i).should be_false
+          TruffleThreadDetectRecursionSpecFixtures.check_double_recursion_equality_to_depth(a, b, i).should be_false
         else
-          check_double_recursion_equality_to_depth(a, b, i).should be_true
+          TruffleThreadDetectRecursionSpecFixtures.check_double_recursion_equality_to_depth(a, b, i).should be_true
         end
       end
     end
   end
+
 end