summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-09 04:26:05 +0000
committernahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-09 04:26:05 +0000
commitf34ce620a79db7f21131a912fb6f456ded2d218f (patch)
treef7a5d476c89b015f662dd1497c690c3e05edeffa
parent417a410892ac5a3c6e70f5d7abc9fd8ba9bc1914 (diff)
* lib/test/unit/collector/dir.rb: do not ignore exceptions(LoadError
and SystemExitError) while loading a testcase. smell of bug. * test/testunit/collector/test_dir.rb: add new test of the LoadError. * test/drb/{test_drbssl.rb,test_drbunix.rb}: do not define testcase if openssl is not installed. * test/testunit/collector/test_dir.rb: assert_raises -> assert_raise. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5423 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog12
-rw-r--r--lib/test/unit/collector/dir.rb1
-rw-r--r--test/drb/test_drbssl.rb12
-rw-r--r--test/drb/test_drbunix.rb12
-rw-r--r--test/testunit/collector/test_dir.rb29
5 files changed, 51 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 9142481c1c5..191e54051c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Fri Jan 9 13:14:59 2004 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>
+
+ * lib/test/unit/collector/dir.rb: do not ignore exceptions(LoadError
+ and SystemExitError) while loading a testcase. smell of bug.
+
+ * test/testunit/collector/test_dir.rb: add new test of the LoadError.
+
+ * test/drb/{test_drbssl.rb,test_drbunix.rb}: do not define testcase if
+ openssl is not installed.
+
+ * test/testunit/collector/test_dir.rb: assert_raises -> assert_raise.
+
Fri Jan 9 11:52:16 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* rubysig.h: <errno.h> is needed to use errno which may be a macro.
diff --git a/lib/test/unit/collector/dir.rb b/lib/test/unit/collector/dir.rb
index 43fd1be718e..e7395ac0516 100644
--- a/lib/test/unit/collector/dir.rb
+++ b/lib/test/unit/collector/dir.rb
@@ -76,7 +76,6 @@ module Test
require(name)
end
find_test_cases(already_gathered).each{|t| add_suite(suites, t.suite)}
- rescue LoadError, SystemExit
ensure
$:.replace(loadpath)
end
diff --git a/test/drb/test_drbssl.rb b/test/drb/test_drbssl.rb
index 0ca177fe582..1e7e49a72ce 100644
--- a/test/drb/test_drbssl.rb
+++ b/test/drb/test_drbssl.rb
@@ -1,6 +1,13 @@
$:.unshift(File.dirname(File.expand_path(__FILE__)))
require 'drbtest'
-require 'drb/ssl'
+
+begin
+ require 'drb/ssl'
+rescue LoadError
+end
+
+if Object.const_defined?("OpenSSL")
+
class DRbSSLService < DRbService
%w(ut_drb_drbssl.rb ut_array_drbssl.rb).each do |nm|
@@ -63,3 +70,6 @@ class TestDRbSSLAry < Test::Unit::TestCase
@there = @ext.front
end
end
+
+
+end
diff --git a/test/drb/test_drbunix.rb b/test/drb/test_drbunix.rb
index e05637a2b78..88f47ddbb73 100644
--- a/test/drb/test_drbunix.rb
+++ b/test/drb/test_drbunix.rb
@@ -1,6 +1,13 @@
$:.unshift(File.dirname(File.expand_path(__FILE__)))
require 'drbtest'
-require 'drb/unix'
+
+begin
+ require 'drb/unix'
+rescue LoadError
+end
+
+if Object.const_defined?("UNIXServer")
+
class DRbUNIXService < DRbService
%w(ut_drb_drbunix.rb ut_array_drbunix.rb).each do |nm|
@@ -46,3 +53,6 @@ class TestDRbUNIXAry < Test::Unit::TestCase
@there = @ext.front
end
end
+
+
+end
diff --git a/test/testunit/collector/test_dir.rb b/test/testunit/collector/test_dir.rb
index e9b42d7966a..64bcabaea61 100644
--- a/test/testunit/collector/test_dir.rb
+++ b/test/testunit/collector/test_dir.rb
@@ -148,7 +148,7 @@ module Test
return false if(@required.include?(file))
begin
e = find(file)
- rescue Errno::ENOENT => e
+ rescue Errno::ENOENT => ex
if(/\.rb\Z/ =~ file)
raise LoadError, file
end
@@ -213,10 +213,10 @@ module Test
end
end
assert_equal('/', fs.pwd)
- assert_raises(Errno::ENOENT) do
+ assert_raise(Errno::ENOENT) do
fs.chdir('bogus')
end
- assert_raises(Errno::ENOTDIR) do
+ assert_raise(Errno::ENOTDIR) do
fs.chdir('a')
end
fs.chdir('b')
@@ -248,10 +248,10 @@ module Test
assert_equal(['.', '..', 'a', 'b', 'e', 'f'], fs.entries('.').sort)
assert_equal(['.', '..', 'a', 'b', 'e', 'f'], fs.entries('b/..').sort)
assert_equal(['.', '..', 'c', 'd'], fs.entries('b').sort)
- assert_raises(Errno::ENOENT) do
+ assert_raise(Errno::ENOENT) do
fs.entries('z')
end
- assert_raises(Errno::ENOTDIR) do
+ assert_raise(Errno::ENOTDIR) do
fs.entries('a')
end
fs.chdir('f')
@@ -275,7 +275,7 @@ module Test
end
assert_equal([], c)
- assert_raises(LoadError) do
+ assert_raise(LoadError) do
fs.require('bogus')
end
@@ -353,13 +353,18 @@ module Test
end
def test_collect_file
- expected = TestSuite.new('test_1.rb')
- expected << @t1.suite
- assert_equal(expected, @c.collect('test_1.rb'))
+ expected = [@t1.suite]
+ subsuites = []
+ @c.collect_file('test_1.rb', subsuites, @c.find_test_cases)
+ assert_equal(expected, subsuites)
- expected = TestSuite.new('t4.rb')
- expected << @t4.suite
- assert_equal(expected, @c.collect('t4.rb'))
+ expected = [@t4.suite]
+ subsuites = []
+ @c.collect_file('t4.rb', subsuites, @c.find_test_cases)
+ assert_equal(expected, subsuites)
+ assert_raise(LoadError) do
+ @c.collect_file('tloaderr.rb', [], [])
+ end
end
def test_nil_pattern