* test/csv/test_features.rb, test/logger/test_logger.rb

  test/mkmf/test_have_macro.rb, test/net/http/test_http.rb,
  test/openssl/test_config.rb, test/psych/test_encoding.rb,
  test/psych/test_exception.rb, test/psych/test_psych.rb,
  test/psych/test_tainted.rb, test/readline/test_readline.rb,
  test/rexml/test_contrib.rb, test/ruby/test_autoload.rb,
  test/ruby/test_beginendblock.rb, test/ruby/test_exception.rb,
  test/ruby/test_file.rb, test/ruby/test_io.rb,
  test/ruby/test_marshal.rb, test/ruby/test_process.rb,
  test/ruby/test_require.rb, test/ruby/test_rubyoptions.rb,
  test/syslog/test_syslog_logger.rb, test/webrick/test_httpauth.rb,
  test/zlib/test_zlib.rb: Use Tempfile.create.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40400 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 35 insertions, 39 deletions

diff --git a/test/psych/test_encoding.rb b/test/psych/test_encoding.rb
index 2cddd5983f..4f26fa3c9c 100644
--- a/test/psych/test_encoding.rb
+++ b/test/psych/test_encoding.rb
@@ -50,58 +50,54 @@ module Psych
     end
 
     def test_io_shiftjis
-      t = Tempfile.new(['shiftjis', 'yml'], :encoding => 'SHIFT_JIS')
-      t.write '--- こんにちは！'
-      t.close
-
-      # If the external encoding isn't utf8, utf16le, or utf16be, we cannot
-      # process the file.
-      File.open(t.path, 'r', :encoding => 'SHIFT_JIS') do |f|
-        assert_raises Psych::SyntaxError do
-          Psych.load(f)
+      Tempfile.create(['shiftjis', 'yml'], :encoding => 'SHIFT_JIS') {|t|
+        t.write '--- こんにちは！'
+        t.close
+
+        # If the external encoding isn't utf8, utf16le, or utf16be, we cannot
+        # process the file.
+        File.open(t.path, 'r', :encoding => 'SHIFT_JIS') do |f|
+          assert_raises Psych::SyntaxError do
+            Psych.load(f)
+          end
         end
-      end
-
-      t.close(true)
+      }
     end
 
     def test_io_utf16le
-      t = Tempfile.new(['utf16le', 'yml'])
-      t.binmode
-      t.write '--- こんにちは！'.encode('UTF-16LE')
-      t.close
+      Tempfile.create(['utf16le', 'yml']) {|t|
+        t.binmode
+        t.write '--- こんにちは！'.encode('UTF-16LE')
+        t.close
 
-      File.open(t.path, 'rb', :encoding => 'UTF-16LE') do |f|
-        assert_equal "こんにちは！", Psych.load(f)
-      end
-
-      t.close(true)
+        File.open(t.path, 'rb', :encoding => 'UTF-16LE') do |f|
+          assert_equal "こんにちは！", Psych.load(f)
+        end
+      }
     end
 
     def test_io_utf16be
-      t = Tempfile.new(['utf16be', 'yml'])
-      t.binmode
-      t.write '--- こんにちは！'.encode('UTF-16BE')
-      t.close
+      Tempfile.create(['utf16be', 'yml']) {|t|
+        t.binmode
+        t.write '--- こんにちは！'.encode('UTF-16BE')
+        t.close
 
-      File.open(t.path, 'rb', :encoding => 'UTF-16BE') do |f|
-        assert_equal "こんにちは！", Psych.load(f)
-      end
-
-      t.close(true)
+        File.open(t.path, 'rb', :encoding => 'UTF-16BE') do |f|
+          assert_equal "こんにちは！", Psych.load(f)
+        end
+      }
     end
 
     def test_io_utf8
-      t = Tempfile.new(['utf8', 'yml'])
-      t.binmode
-      t.write '--- こんにちは！'.encode('UTF-8')
-      t.close
+      Tempfile.create(['utf8', 'yml']) {|t|
+        t.binmode
+        t.write '--- こんにちは！'.encode('UTF-8')
+        t.close
 
-      File.open(t.path, 'rb', :encoding => 'UTF-8') do |f|
-        assert_equal "こんにちは！", Psych.load(f)
-      end
-
-      t.close(true)
+        File.open(t.path, 'rb', :encoding => 'UTF-8') do |f|
+          assert_equal "こんにちは！", Psych.load(f)
+        end
+      }
     end
 
     def test_emit_alias