summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-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/soap/calc/test_calc.rb2
-rw-r--r--test/soap/calc/test_calc2.rb2
-rw-r--r--test/soap/helloworld/test_helloworld.rb2
-rw-r--r--test/wsdl/test_emptycomplextype.rb2
-rw-r--r--test/xsd/test_xmlschemaparser.rb2
-rw-r--r--test/yaml/test_yaml.rb2
14 files changed, 39 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index a7907ee6d5f..9b45822b1a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Thu Jan 29 11:32:14 2004 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>
+
+ * test/rss/test_*: do $: trick while searching a module in the current
+ directory.
+
+ * test/xsd/test_xmlschemaparser.rb, test/wsdl/test_emptycomplextype.rb,
+ test/soap/helloworld/test_helloworld.rb,
+ test/soap/calc/{test_calc.rb,test_calc2.rb}: do File.expand_path
+ before using __FILE__.
+
+ * test/yaml/test_yaml.rb: assert_equals -> assert_equal.
+
Thu Jan 29 01:56:02 2004 why the lucky stiff <why@ruby-lang.org>
* ext/syck/rubyext.c: usec round-tripping skew. [ruby-core:2305]
diff --git a/test/rss/test_1.0.rb b/test/rss/test_1.0.rb
index b48e765d08a..3f2712ec92e 100644
--- a/test/rss/test_1.0.rb
+++ b/test/rss/test_1.0.rb
@@ -4,7 +4,10 @@ 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 4163ff9f1a0..dd75b69c457 100644
--- a/test/rss/test_accessor.rb
+++ b/test/rss/test_accessor.rb
@@ -4,7 +4,10 @@ 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 46a679bdc10..d23673d2f64 100644
--- a/test/rss/test_content.rb
+++ b/test/rss/test_content.rb
@@ -6,7 +6,10 @@ 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 b360ee9ca55..2ea12633d0b 100644
--- a/test/rss/test_dublincore.rb
+++ b/test/rss/test_dublincore.rb
@@ -6,7 +6,10 @@ 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 570141315be..a041c538ca6 100644
--- a/test/rss/test_parser.rb
+++ b/test/rss/test_parser.rb
@@ -3,7 +3,10 @@
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 80659e1e69e..a9e1f45c33d 100644
--- a/test/rss/test_syndication.rb
+++ b/test/rss/test_syndication.rb
@@ -6,7 +6,10 @@ 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 cd37b70b8be..152305e8633 100644
--- a/test/rss/test_trackback.rb
+++ b/test/rss/test_trackback.rb
@@ -6,7 +6,10 @@ 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/soap/calc/test_calc.rb b/test/soap/calc/test_calc.rb
index c917ddcf9e5..f308977561d 100644
--- a/test/soap/calc/test_calc.rb
+++ b/test/soap/calc/test_calc.rb
@@ -1,7 +1,7 @@
require 'test/unit'
require 'soap/rpc/driver'
-dir = File.dirname(__FILE__)
+dir = File.dirname(File.expand_path(__FILE__))
$:.push(dir)
require 'server.rb'
$:.delete(dir)
diff --git a/test/soap/calc/test_calc2.rb b/test/soap/calc/test_calc2.rb
index c066d374fba..457e770cc4b 100644
--- a/test/soap/calc/test_calc2.rb
+++ b/test/soap/calc/test_calc2.rb
@@ -1,7 +1,7 @@
require 'test/unit'
require 'soap/rpc/driver'
-dir = File.dirname(__FILE__)
+dir = File.dirname(File.expand_path(__FILE__))
$:.push(dir)
require 'server2.rb'
$:.delete(dir)
diff --git a/test/soap/helloworld/test_helloworld.rb b/test/soap/helloworld/test_helloworld.rb
index 7261e42f194..9f6ed275eff 100644
--- a/test/soap/helloworld/test_helloworld.rb
+++ b/test/soap/helloworld/test_helloworld.rb
@@ -1,7 +1,7 @@
require 'test/unit'
require 'soap/rpc/driver'
-dir = File.dirname(__FILE__)
+dir = File.dirname(File.expand_path(__FILE__))
$:.push(dir)
require 'hw_s.rb'
$:.delete(dir)
diff --git a/test/wsdl/test_emptycomplextype.rb b/test/wsdl/test_emptycomplextype.rb
index 45136b417d3..0c21de8dd23 100644
--- a/test/wsdl/test_emptycomplextype.rb
+++ b/test/wsdl/test_emptycomplextype.rb
@@ -7,7 +7,7 @@ module WSDL
class TestWSDL < Test::Unit::TestCase
def setup
- @file = File.join(File.dirname(__FILE__), 'emptycomplextype.wsdl')
+ @file = File.join(File.dirname(File.expand_path(__FILE__)), 'emptycomplextype.wsdl')
end
def test_wsdl
diff --git a/test/xsd/test_xmlschemaparser.rb b/test/xsd/test_xmlschemaparser.rb
index ab9421c954b..10dff43e614 100644
--- a/test/xsd/test_xmlschemaparser.rb
+++ b/test/xsd/test_xmlschemaparser.rb
@@ -7,7 +7,7 @@ module XSD
class TestXMLSchemaParser < Test::Unit::TestCase
def setup
- @file = File.join(File.dirname(__FILE__), 'xmlschema.xml')
+ @file = File.join(File.dirname(File.expand_path(__FILE__)), 'xmlschema.xml')
end
def test_wsdl
diff --git a/test/yaml/test_yaml.rb b/test/yaml/test_yaml.rb
index 642ebc558fe..fd9f79b5f39 100644
--- a/test/yaml/test_yaml.rb
+++ b/test/yaml/test_yaml.rb
@@ -1191,7 +1191,7 @@ EOY
require 'yaml'
t = Time.now
5.times do
- assert_equals( t, YAML.load( YAML.dump( t ) ) )
+ assert_equal( t, YAML.load( YAML.dump( t ) ) )
end
end