Fix new id values for true,false,nil. Workaround #3028 so we can test…

… the behavior of finalization in ObjectSpace
jruby · Jun 9, 2015 · 9f76735 · 9f76735
1 parent b96813f
commit 9f76735
Showing 1 changed file with 24 additions and 19 deletions.
diff --git a/test/jruby/test_objectspace.rb b/test/jruby/test_objectspace.rb
@@ -35,12 +35,12 @@ def test_id2ref
     assert_equal(-19, -10.object_id)
 
     assert_equal(0, false.object_id)
-    assert_equal(2, true.object_id)
-    assert_equal(4, nil.object_id)
+    assert_equal(20, true.object_id)
+    assert_equal(8, nil.object_id)
 
     assert_equal(false, ObjectSpace._id2ref(0))
-    assert_equal(true, ObjectSpace._id2ref(2))
-    assert_equal(nil, ObjectSpace._id2ref(4))
+    assert_equal(true, ObjectSpace._id2ref(20))
+    assert_equal(nil, ObjectSpace._id2ref(8))
   end
 
   def test_jruby_objectspace
@@ -65,27 +65,32 @@ def finalizer(results)
     end
   end
 
-  # JRUBY-4839
-  def test_finalization
-    [true, false].each do |objectspace|
-      JRuby.objectspace = objectspace
-      obj1 = "lemon"
-      obj2 = "apple"
-      results = []
+  def body(objectspace, results)
+    JRuby.objectspace = objectspace
+    obj1 = "lemon"
+    obj2 = "apple"
 
-      ObjectSpace.define_finalizer obj1, finalizer(results)
-      ObjectSpace.define_finalizer obj2, finalizer(results)
+    ObjectSpace.define_finalizer obj1, finalizer(results)
+    ObjectSpace.define_finalizer obj2, finalizer(results)
 
-      obj1_id = obj1.object_id
+    results << obj1.object_id
 
-      ObjectSpace.undefine_finalizer obj2
+    ObjectSpace.undefine_finalizer obj2
+
+    obj1 = nil
+    obj2 = nil
+  end
+
+  # JRUBY-4839 GH #3028
+  def test_finalization
+    [true, false].each do |objectspace|
+      results = []
 
-      obj1 = nil
-      obj2 = nil
+      body(objectspace, results)
 
       t = Time.now
-      (JRuby.gc; sleep 0.1) until (Time.now - t > 5) || results.length > 0
-      assert_equal ["finalizing #{obj1_id}"], results
+      (JRuby.gc; sleep 0.1) until (Time.now - t > 5) || results.length > 1
+      assert_equal "finalizing #{results[0]}", results[1]
     end
   end
 end