summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/drb/test_drb.rb1
-rw-r--r--test/drb/test_drbssl.rb1
-rw-r--r--test/drb/test_drbunix.rb1
-rw-r--r--test/fileutils/test_fileutils.rb2
-rw-r--r--test/fileutils/test_nowrite.rb2
-rw-r--r--test/rss/test_1.0.rb3
-rw-r--r--test/rss/test_accessor.rb3
-rw-r--r--test/rss/test_content.rb3
-rw-r--r--test/rss/test_dublincore.rb3
-rw-r--r--test/rss/test_parser.rb3
-rw-r--r--test/rss/test_syndication.rb3
-rw-r--r--test/rss/test_trackback.rb3
-rw-r--r--test/ruby/test_beginendblock.rb1
-rw-r--r--test/ruby/test_file.rb1
-rw-r--r--test/ruby/test_pipe.rb1
-rw-r--r--test/ruby/test_system.rb1
-rw-r--r--test/soap/calc/test_calc.rb4
-rw-r--r--test/soap/calc/test_calc2.rb4
-rw-r--r--test/soap/helloworld/test_helloworld.rb4
-rw-r--r--test/wsdl/axisArray/test_axisarray.rb5
-rw-r--r--test/wsdl/datetime/test_datetime.rb4
-rw-r--r--test/wsdl/raa/test_raa.rb8
23 files changed, 10 insertions, 56 deletions
diff --git a/ChangeLog b/ChangeLog
index 05e3d2d196e..d1edf4ba343 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 29 22:19:51 2004 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>
+
+ * test/*: remove $: trick. [ruby-dev:22763] use test/runner.rb to
+ run test.
+
Thu Jan 29 19:28:16 2004 Minero Aoki <aamine@loveruby.net>
* lib/net/http.rb (Request#initialize): reject only when a path is
diff --git a/test/drb/test_drb.rb b/test/drb/test_drb.rb
index 753ff093359..5a4a98e1ccd 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 1e7e49a72ce..b5dd68f6a7b 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 88f47ddbb73..e35a7bd580f 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 90a496124b5..50f0ed16bdb 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 18c00b8e081..4e6701b967d 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 3f2712ec92e..b48e765d08a 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 dd75b69c457..4163ff9f1a0 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 d23673d2f64..46a679bdc10 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 2ea12633d0b..b360ee9ca55 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 a041c538ca6..570141315be 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 a9e1f45c33d..80659e1e69e 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 152305e8633..cd37b70b8be 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 b56b596a651..a8e5913b10f 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 b35a2661c93..09d6c52023c 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 03b38635c8b..a6b7c14eddc 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 a19f6ef9b71..322b0c9ceb4 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 f308977561d..4210c657728 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 457e770cc4b..d15cfe9600f 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 9f6ed275eff..cd78d9fa0b0 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 9c7b42564c1..9f220bb48a5 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__
<?xml version="1.0" encoding="UTF-8"?>
<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
diff --git a/test/wsdl/datetime/test_datetime.rb b/test/wsdl/datetime/test_datetime.rb
index 405bd1209aa..0f531ff18c6 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 5fddb6b22df..cf171b373f5 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 {