From 8c299e6e264c7a3366f11b0b73c80ce49ca3be9b Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 19 Dec 2004 02:01:59 +0000 Subject: * lib/test/unit.rb: use standalone runner for -e. * lib/test/unit/autorunner.rb (Test::Unit::AutoRunner#options): accept multiple -p and -x options. * lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#recursive_collect): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/testunit/collector/test_dir.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/testunit/collector') diff --git a/test/testunit/collector/test_dir.rb b/test/testunit/collector/test_dir.rb index 7ab3f45a90..3576333a08 100644 --- a/test/testunit/collector/test_dir.rb +++ b/test/testunit/collector/test_dir.rb @@ -164,11 +164,11 @@ module Test def test_dir inner_dir = nil - dir = FileSystem::Directory.new('/', nil) do + dirs = FileSystem::Directory.new('/', nil) do file 'a', nil inner_dir = dir 'b' end - assert_equal(inner_dir, dir['b']) + assert_equal(inner_dir, dirs['b']) end def test_fs @@ -370,7 +370,7 @@ module Test def test_nil_pattern expected = TestSuite.new('d2') expected << @t5.suite - @c.pattern = nil + @c.pattern.clear assert_equal(expected, @c.collect('d2')) end @@ -385,7 +385,7 @@ module Test expected = TestSuite.new('[d1, d2]') expected << (TestSuite.new('d1') << @t3.suite) expected << (TestSuite.new('d2') << @t5.suite) - @c.pattern = /\btest_/ + @c.pattern.replace([/\btest_/]) assert_equal(expected, @c.collect('d1', 'd2')) end end -- cgit v1.2.3