Sync tests with trunk

2 files changed, 11 insertions, 15 deletions

diff --git a/tests/test_json.rb b/tests/test_json.rb
index e9a125d..462650e 100755
--- a/tests/test_json.rb
+++ b/tests/test_json.rb
@@ -491,6 +491,8 @@ EOT
     assert_equal @hash, JSON.load(stringio)
     assert_equal nil, JSON.load(nil)
     assert_equal nil, JSON.load('')
+  ensure
+    tempfile.close!
   end
 
   def test_load_with_options
@@ -515,12 +517,6 @@ EOT
     assert_equal too_deep, output.string
   end
 
-  def test_dump_should_modify_defaults
-    max_nesting = JSON.dump_default_options[:max_nesting]
-    JSON.dump([], StringIO.new, 101)
-    assert_equal max_nesting, JSON.dump_default_options[:max_nesting]
-  end
-
   def test_big_integers
     json1 = JSON([orig = (1 << 31) - 1])
     assert_equal orig, JSON[json1][0]
diff --git a/tests/test_json_generate.rb b/tests/test_json_generate.rb
index 117a155..2d4e1ee 100755
--- a/tests/test_json_generate.rb
+++ b/tests/test_json_generate.rb
@@ -215,16 +215,16 @@ EOT
   end
 
   def test_gc
-    bignum_too_long_to_embed_as_string = 1234567890123456789012345
-    expect = bignum_too_long_to_embed_as_string.to_s
-    stress, GC.stress = GC.stress, true
+    assert_in_out_err(%w[-rjson --disable-gems], <<-EOS, [], [])
+      bignum_too_long_to_embed_as_string = 1234567890123456789012345
+      expect = bignum_too_long_to_embed_as_string.to_s
+      GC.stress = true
 
-    10.times do |i|
-      tmp = bignum_too_long_to_embed_as_string.to_json
-      assert_equal expect, tmp
-    end
-  ensure
-    GC.stress = stress
+      10.times do |i|
+        tmp = bignum_too_long_to_embed_as_string.to_json
+        raise "'\#{expect}' is expected, but '\#{tmp}'" unless tmp == expect
+      end
+    EOS
   end if GC.respond_to?(:stress=)
 
   def test_configure_using_configure_and_merge