From 04b5228aba6e9aaaf3c082cb2aeafa124fcaca3b Mon Sep 17 00:00:00 2001 From: nahi Date: Thu, 29 Jan 2004 13:22:27 +0000 Subject: * test/*: remove $: trick. [ruby-dev:22763] use test/runner.rb to run test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/drb/test_drb.rb | 1 - test/drb/test_drbssl.rb | 1 - test/drb/test_drbunix.rb | 1 - test/fileutils/test_fileutils.rb | 2 -- test/fileutils/test_nowrite.rb | 2 -- test/rss/test_1.0.rb | 3 --- test/rss/test_accessor.rb | 3 --- test/rss/test_content.rb | 3 --- test/rss/test_dublincore.rb | 3 --- test/rss/test_parser.rb | 3 --- test/rss/test_syndication.rb | 3 --- test/rss/test_trackback.rb | 3 --- test/ruby/test_beginendblock.rb | 1 - test/ruby/test_file.rb | 1 - test/ruby/test_pipe.rb | 1 - test/ruby/test_system.rb | 1 - test/soap/calc/test_calc.rb | 4 ---- test/soap/calc/test_calc2.rb | 4 ---- test/soap/helloworld/test_helloworld.rb | 4 ---- test/wsdl/axisArray/test_axisarray.rb | 5 +---- test/wsdl/datetime/test_datetime.rb | 4 +--- test/wsdl/raa/test_raa.rb | 8 +++----- 22 files changed, 5 insertions(+), 56 deletions(-) (limited to 'test') diff --git a/test/drb/test_drb.rb b/test/drb/test_drb.rb index 753ff09335..5a4a98e1cc 100644 --- a/test/drb/test_drb.rb +++ b/test/drb/test_drb.rb @@ -1,4 +1,3 @@ -$:.unshift(File.dirname(File.expand_path(__FILE__))) require 'drbtest' class TestDRbCore < Test::Unit::TestCase diff --git a/test/drb/test_drbssl.rb b/test/drb/test_drbssl.rb index 1e7e49a72c..b5dd68f6a7 100644 --- a/test/drb/test_drbssl.rb +++ b/test/drb/test_drbssl.rb @@ -1,4 +1,3 @@ -$:.unshift(File.dirname(File.expand_path(__FILE__))) require 'drbtest' begin diff --git a/test/drb/test_drbunix.rb b/test/drb/test_drbunix.rb index 88f47ddbb7..e35a7bd580 100644 --- a/test/drb/test_drbunix.rb +++ b/test/drb/test_drbunix.rb @@ -1,4 +1,3 @@ -$:.unshift(File.dirname(File.expand_path(__FILE__))) require 'drbtest' begin diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb index 90a496124b..50f0ed16bd 100644 --- a/test/fileutils/test_fileutils.rb +++ b/test/fileutils/test_fileutils.rb @@ -2,8 +2,6 @@ # test/fileutils/test_fileutils.rb # -$:.unshift File.dirname(__FILE__) - require 'fileutils' require 'fileasserts' require 'pathname' diff --git a/test/fileutils/test_nowrite.rb b/test/fileutils/test_nowrite.rb index 18c00b8e08..4e6701b967 100644 --- a/test/fileutils/test_nowrite.rb +++ b/test/fileutils/test_nowrite.rb @@ -2,8 +2,6 @@ # test/fileutils/test_nowrite.rb # -$:.unshift File.dirname(__FILE__) - require 'fileutils' require 'fileasserts' require 'tmpdir' diff --git a/test/rss/test_1.0.rb b/test/rss/test_1.0.rb index 3f2712ec92..b48e765d08 100644 --- a/test/rss/test_1.0.rb +++ b/test/rss/test_1.0.rb @@ -4,10 +4,7 @@ require "test/unit" require "rexml/document" require "rss/1.0" -dir = File.dirname(File.expand_path(__FILE__)) -$:.push(dir) require "common" -$:.delete(dir) class TestCore < Test::Unit::TestCase diff --git a/test/rss/test_accessor.rb b/test/rss/test_accessor.rb index dd75b69c45..4163ff9f1a 100644 --- a/test/rss/test_accessor.rb +++ b/test/rss/test_accessor.rb @@ -4,10 +4,7 @@ require "test/unit" require "rss/parser" require "rss/1.0" require "rss/2.0" -dir = File.dirname(File.expand_path(__FILE__)) -$:.push(dir) require "common" -$:.delete(dir) class TestAccessor < Test::Unit::TestCase include TestRSSMixin diff --git a/test/rss/test_content.rb b/test/rss/test_content.rb index d23673d2f6..46a679bdc1 100644 --- a/test/rss/test_content.rb +++ b/test/rss/test_content.rb @@ -6,10 +6,7 @@ require "rexml/document" require "rss/parser" require "rss/content" -dir = File.dirname(File.expand_path(__FILE__)) -$:.push(dir) require "common" -$:.delete(dir) class TestContent < Test::Unit::TestCase include TestRSSMixin diff --git a/test/rss/test_dublincore.rb b/test/rss/test_dublincore.rb index 2ea12633d0..b360ee9ca5 100644 --- a/test/rss/test_dublincore.rb +++ b/test/rss/test_dublincore.rb @@ -6,10 +6,7 @@ require "rexml/document" require "rss/parser" require "rss/dublincore" -dir = File.dirname(File.expand_path(__FILE__)) -$:.push(dir) require "common" -$:.delete(dir) class TestDublinCore < Test::Unit::TestCase include TestRSSMixin diff --git a/test/rss/test_parser.rb b/test/rss/test_parser.rb index a041c538ca..570141315b 100644 --- a/test/rss/test_parser.rb +++ b/test/rss/test_parser.rb @@ -3,10 +3,7 @@ require "test/unit" require "rss/parser" require "rss/1.0" -dir = File.dirname(File.expand_path(__FILE__)) -$:.push(dir) require "common" -$:.delete(dir) class TestParser < Test::Unit::TestCase include TestRSSMixin diff --git a/test/rss/test_syndication.rb b/test/rss/test_syndication.rb index a9e1f45c33..80659e1e69 100644 --- a/test/rss/test_syndication.rb +++ b/test/rss/test_syndication.rb @@ -6,10 +6,7 @@ require "rexml/document" require "rss/parser" require "rss/syndication" -dir = File.dirname(File.expand_path(__FILE__)) -$:.push(dir) require "common" -$:.delete(dir) class TestSyndication < Test::Unit::TestCase include TestRSSMixin diff --git a/test/rss/test_trackback.rb b/test/rss/test_trackback.rb index 152305e863..cd37b70b8b 100644 --- a/test/rss/test_trackback.rb +++ b/test/rss/test_trackback.rb @@ -6,10 +6,7 @@ require "rexml/document" require "rss/parser" require "rss/trackback" -dir = File.dirname(File.expand_path(__FILE__)) -$:.push(dir) require "common" -$:.delete(dir) class TestTrackBack < Test::Unit::TestCase include TestRSSMixin diff --git a/test/ruby/test_beginendblock.rb b/test/ruby/test_beginendblock.rb index b56b596a65..a8e5913b10 100644 --- a/test/ruby/test_beginendblock.rb +++ b/test/ruby/test_beginendblock.rb @@ -1,6 +1,5 @@ require 'test/unit' require 'tempfile' -$:.replace([File.dirname(File.expand_path(__FILE__))] | $:) require 'envutil' class TestBeginEndBlock < Test::Unit::TestCase diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb index b35a2661c9..09d6c52023 100644 --- a/test/ruby/test_file.rb +++ b/test/ruby/test_file.rb @@ -1,6 +1,5 @@ require 'test/unit' require 'tempfile' -$:.replace([File.dirname(File.expand_path(__FILE__))] | $:) require 'ut_eof' $KCODE = 'none' diff --git a/test/ruby/test_pipe.rb b/test/ruby/test_pipe.rb index 03b38635c8..a6b7c14edd 100644 --- a/test/ruby/test_pipe.rb +++ b/test/ruby/test_pipe.rb @@ -1,5 +1,4 @@ require 'test/unit' -$:.replace([File.dirname(File.expand_path(__FILE__))] | $:) require 'ut_eof' require 'envutil' diff --git a/test/ruby/test_system.rb b/test/ruby/test_system.rb index a19f6ef9b7..322b0c9ceb 100644 --- a/test/ruby/test_system.rb +++ b/test/ruby/test_system.rb @@ -1,5 +1,4 @@ require 'test/unit' -$:.replace([File.dirname(File.expand_path(__FILE__))] | $:) require 'envutil' $KCODE = 'none' diff --git a/test/soap/calc/test_calc.rb b/test/soap/calc/test_calc.rb index f308977561..4210c65772 100644 --- a/test/soap/calc/test_calc.rb +++ b/test/soap/calc/test_calc.rb @@ -1,10 +1,6 @@ require 'test/unit' require 'soap/rpc/driver' - -dir = File.dirname(File.expand_path(__FILE__)) -$:.push(dir) require 'server.rb' -$:.delete(dir) module SOAP diff --git a/test/soap/calc/test_calc2.rb b/test/soap/calc/test_calc2.rb index 457e770cc4..d15cfe9600 100644 --- a/test/soap/calc/test_calc2.rb +++ b/test/soap/calc/test_calc2.rb @@ -1,10 +1,6 @@ require 'test/unit' require 'soap/rpc/driver' - -dir = File.dirname(File.expand_path(__FILE__)) -$:.push(dir) require 'server2.rb' -$:.delete(dir) module SOAP diff --git a/test/soap/helloworld/test_helloworld.rb b/test/soap/helloworld/test_helloworld.rb index 9f6ed275ef..cd78d9fa0b 100644 --- a/test/soap/helloworld/test_helloworld.rb +++ b/test/soap/helloworld/test_helloworld.rb @@ -1,10 +1,6 @@ require 'test/unit' require 'soap/rpc/driver' - -dir = File.dirname(File.expand_path(__FILE__)) -$:.push(dir) require 'hw_s.rb' -$:.delete(dir) module SOAP diff --git a/test/wsdl/axisArray/test_axisarray.rb b/test/wsdl/axisArray/test_axisarray.rb index 9c7b42564c..9f220bb48a 100644 --- a/test/wsdl/axisArray/test_axisarray.rb +++ b/test/wsdl/axisArray/test_axisarray.rb @@ -3,6 +3,7 @@ require 'soap/processor' require 'soap/mapping' require 'soap/rpc/element' require 'wsdl/importer' +require 'itemList.rb' module WSDL @@ -10,10 +11,6 @@ module WSDL class TestAxisArray < Test::Unit::TestCase def setup - dir = File.dirname(File.expand_path(__FILE__)) - $:.push(dir) - require 'itemList.rb' - $:.delete(dir) @xml =<<__EOX__ diff --git a/test/wsdl/datetime/test_datetime.rb b/test/wsdl/datetime/test_datetime.rb index 405bd1209a..0f531ff18c 100644 --- a/test/wsdl/datetime/test_datetime.rb +++ b/test/wsdl/datetime/test_datetime.rb @@ -1,5 +1,6 @@ require 'test/unit' require 'soap/wsdlDriver' +require 'DatetimeService.rb' module WSDL @@ -17,9 +18,6 @@ class TestDatetime < Test::Unit::TestCase end def setup_server - $:.push(DIR) - require File.join(DIR, 'DatetimeService.rb') - $:.delete(DIR) @server = DatetimePortTypeApp.new('Datetime server', nil, '0.0.0.0', Port) @server.level = Logger::Severity::ERROR @t = Thread.new { diff --git a/test/wsdl/raa/test_raa.rb b/test/wsdl/raa/test_raa.rb index 5fddb6b22d..cf171b373f 100644 --- a/test/wsdl/raa/test_raa.rb +++ b/test/wsdl/raa/test_raa.rb @@ -1,5 +1,8 @@ require 'test/unit' require 'soap/wsdlDriver' +require 'RAA.rb' +require 'RAAServant.rb' +require 'RAAService.rb' module WSDL @@ -17,11 +20,6 @@ class TestRAA < Test::Unit::TestCase end def setup_server - $:.push(DIR) - require File.join(DIR, 'RAA.rb') - require File.join(DIR, 'RAAServant.rb') - require File.join(DIR, 'RAAService.rb') - $:.delete(DIR) @server = App.new('RAA server', nil, '0.0.0.0', Port) @server.level = Logger::Severity::ERROR @t = Thread.new { -- cgit v1.2.3