From 9e5f063138dbb6c47835b31fc2a86a82b15ab364 Mon Sep 17 00:00:00 2001 From: usa Date: Sun, 2 Mar 2014 19:21:57 +0000 Subject: * test/win32ole: get rid of warnings (unused variable). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ test/win32ole/test_err_in_callback.rb | 4 ++-- test/win32ole/test_win32ole.rb | 4 ++-- test/win32ole/test_win32ole_event.rb | 6 +++--- test/win32ole/test_win32ole_method.rb | 8 ++++---- test/win32ole/test_win32ole_variant.rb | 8 ++++---- test/win32ole/test_win32ole_variant_outarg.rb | 2 +- test/win32ole/test_word.rb | 1 - 8 files changed, 20 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea8eb44e22..fea49343c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Mar 3 04:21:34 2014 NAKAMURA Usaku + + * test/win32ole: get rid of warnings (unused variable). + Mon Mar 3 02:53:53 2014 NAKAMURA Usaku * io.c (rb_io_flush_raw): [EXPERIMENTAL] remove force syncing for Win32 diff --git a/test/win32ole/test_err_in_callback.rb b/test/win32ole/test_err_in_callback.rb index d39ea12c54..cae6d493cb 100644 --- a/test/win32ole/test_err_in_callback.rb +++ b/test/win32ole/test_err_in_callback.rb @@ -29,7 +29,7 @@ if defined?(WIN32OLE) def available_adodb? begin - db = WIN32OLE.new('ADODB.Connection') + WIN32OLE.new('ADODB.Connection') rescue WIN32OLERuntimeError return false end @@ -42,7 +42,7 @@ if defined?(WIN32OLE) Dir.mktmpdir do |tmpdir| logfile = File.join(tmpdir, "test_err_in_callback.log") cmd = "#{@ruby} -v #{@iopt} #{@script} > #{logfile.gsub(%r(/), '\\')} 2>&1" - result = system(cmd) + system(cmd) str = "" open(logfile) {|ifs| str = ifs.read diff --git a/test/win32ole/test_win32ole.rb b/test/win32ole/test_win32ole.rb index 5b237370b5..71026d48c6 100644 --- a/test/win32ole/test_win32ole.rb +++ b/test/win32ole/test_win32ole.rb @@ -228,7 +228,7 @@ if defined?(WIN32OLE) def test_invoke_hash_key_non_str_sym fso = WIN32OLE.new('Scripting.FileSystemObject') begin - bfolder = fso.getFolder({1 => "."}) + fso.getFolder({1 => "."}) assert(false) rescue TypeError assert(true) @@ -270,7 +270,7 @@ if defined?(WIN32OLE) def test_ole_query_interface shell=WIN32OLE.new('Shell.Application') assert_raise(ArgumentError) { - shell2 = shell.ole_query_interface + shell.ole_query_interface } shell2 = shell.ole_query_interface('{A4C6892C-3BA9-11D2-9DEA-00C04FB16162}') assert_instance_of(WIN32OLE, shell2) diff --git a/test/win32ole/test_win32ole_event.rb b/test/win32ole/test_win32ole_event.rb index 03e4dcda9e..8e3915ec17 100644 --- a/test/win32ole/test_win32ole_event.rb +++ b/test/win32ole/test_win32ole_event.rb @@ -52,7 +52,7 @@ if defined?(WIN32OLE_EVENT) def test_s_new assert_raise(TypeError) { - ev = WIN32OLE_EVENT.new("A") + WIN32OLE_EVENT.new("A") } end @@ -149,11 +149,11 @@ if defined?(WIN32OLE_EVENT) def test_non_exist_event assert_raise(RuntimeError) { - ev = WIN32OLE_EVENT.new(@db, 'XXXX') + WIN32OLE_EVENT.new(@db, 'XXXX') } dict = WIN32OLE.new('Scripting.Dictionary') assert_raise(RuntimeError) { - ev = WIN32OLE_EVENT.new(dict) + WIN32OLE_EVENT.new(dict) } end diff --git a/test/win32ole/test_win32ole_method.rb b/test/win32ole/test_win32ole_method.rb index 2c24004682..2a4e3d0896 100644 --- a/test/win32ole/test_win32ole_method.rb +++ b/test/win32ole/test_win32ole_method.rb @@ -28,16 +28,16 @@ if defined?(WIN32OLE_METHOD) WIN32OLE_METHOD.new(1, 2) } assert_raise(ArgumentError) { - method = WIN32OLE_METHOD.new("foo") + WIN32OLE_METHOD.new("foo") } assert_raise(ArgumentError) { - method = WIN32OLE_METHOD.new(ole_type) + WIN32OLE_METHOD.new(ole_type) } assert_raise(WIN32OLERuntimeError) { - method = WIN32OLE_METHOD.new(ole_type, "NonExistMethod") + WIN32OLE_METHOD.new(ole_type, "NonExistMethod") } assert_raise(TypeError) { - method = WIN32OLE_METHOD.new(ole_type, 1) + WIN32OLE_METHOD.new(ole_type, 1) } method = WIN32OLE_METHOD.new(ole_type, "Open") assert_instance_of(WIN32OLE_METHOD, method) diff --git a/test/win32ole/test_win32ole_variant.rb b/test/win32ole/test_win32ole_variant.rb index 8e701ef391..73bcd75c64 100644 --- a/test/win32ole/test_win32ole_variant.rb +++ b/test/win32ole/test_win32ole_variant.rb @@ -38,7 +38,7 @@ if defined?(WIN32OLE_VARIANT) def test_s_new_no_argument ex = nil begin - obj = WIN32OLE_VARIANT.new + WIN32OLE_VARIANT.new rescue ArgumentError ex = $! end @@ -49,7 +49,7 @@ if defined?(WIN32OLE_VARIANT) def test_s_new_one_argument ex = nil begin - obj = WIN32OLE_VARIANT.new('foo') + WIN32OLE_VARIANT.new('foo') rescue ex = $! end @@ -343,7 +343,7 @@ if defined?(WIN32OLE_VARIANT) def test_s_array_exc assert_raise(TypeError) { - obj = WIN32OLE_VARIANT.array(2, WIN32OLE::VARIANT::VT_I4) + WIN32OLE_VARIANT.array(2, WIN32OLE::VARIANT::VT_I4) } end @@ -485,7 +485,7 @@ if defined?(WIN32OLE_VARIANT) def test_create_vt_array_exc exc = assert_raise(TypeError) { - obj = WIN32OLE_VARIANT.new(1, WIN32OLE::VARIANT::VT_ARRAY); + WIN32OLE_VARIANT.new(1, WIN32OLE::VARIANT::VT_ARRAY); } assert_match(/wrong argument type Fixnum \(expected Array\)/, exc.message) end diff --git a/test/win32ole/test_win32ole_variant_outarg.rb b/test/win32ole/test_win32ole_variant_outarg.rb index 560af10106..ffc8e067bd 100644 --- a/test/win32ole/test_win32ole_variant_outarg.rb +++ b/test/win32ole/test_win32ole_variant_outarg.rb @@ -46,7 +46,7 @@ if defined?(WIN32OLE_VARIANT) sql = "INSERT INTO data.csv VALUES (5, 'E')" @db.execute(sql, -1) c = WIN32OLE::ARGV[1] - assert_equal(1, WIN32OLE::ARGV[1]) + assert_equal(1, c) obj = WIN32OLE_VARIANT.new(nil, WIN32OLE::VARIANT::VT_VARIANT|WIN32OLE::VARIANT::VT_BYREF) assert_equal(nil, obj.value) @db.execute(sql , obj) diff --git a/test/win32ole/test_word.rb b/test/win32ole/test_word.rb index e2ca6d4d5c..acfa214913 100644 --- a/test/win32ole/test_word.rb +++ b/test/win32ole/test_word.rb @@ -26,7 +26,6 @@ def word_installed? end if defined?(WIN32OLE) - w = nil dotest = word_installed? if !dotest STDERR.puts("\n#{__FILE__} skipped(Microsoft Word not found.)") -- cgit v1.2.3