diff options
| author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-19 18:20:30 +0000 |
|---|---|---|
| committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-19 18:20:30 +0000 |
| commit | a278e9f384f5d15a854d6de7c25b98342b7200aa (patch) | |
| tree | 9bd000ea4ca145f7931ad08cad5b635de733e2ed /test/testunit | |
| parent | d78ee77d07cb894e236cb68d0964deb3ca34ae33 (diff) | |
| download | ruby-a278e9f384f5d15a854d6de7c25b98342b7200aa.tar.gz ruby-a278e9f384f5d15a854d6de7c25b98342b7200aa.tar.xz ruby-a278e9f384f5d15a854d6de7c25b98342b7200aa.zip | |
* test/testunit/collector/test_dir.rb: r15825 made it unnecessary to change
String to Symbol.
* test/testunit/collector/test_objectspace.rb: ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17453 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/testunit')
| -rw-r--r-- | test/testunit/collector/test_dir.rb | 2 | ||||
| -rw-r--r-- | test/testunit/collector/test_objectspace.rb | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/test/testunit/collector/test_dir.rb b/test/testunit/collector/test_dir.rb index 3e5546943..eb61f9e6b 100644 --- a/test/testunit/collector/test_dir.rb +++ b/test/testunit/collector/test_dir.rb @@ -394,7 +394,7 @@ module Test def test_filtering expected = TestSuite.new('.') expected << @t1.suite - @c.filter = proc{|t| t.method_name == :test_1a || t.method_name == :test_1b} + @c.filter = proc{|t| t.method_name == "test_1a" || t.method_name == "test_1b"} assert_equal(expected, @c.collect) end diff --git a/test/testunit/collector/test_objectspace.rb b/test/testunit/collector/test_objectspace.rb index 841d35452..74c796eb7 100644 --- a/test/testunit/collector/test_objectspace.rb +++ b/test/testunit/collector/test_objectspace.rb @@ -43,8 +43,8 @@ module Test def full_suite(name=ObjectSpace::NAME) expected = TestSuite.new(name) - expected << (TestSuite.new(@tc1.name) << @tc1.new(:test_1) << @tc1.new(:test_2)) - expected << (TestSuite.new(@tc2.name) << @tc2.new(:test_0)) + expected << (TestSuite.new(@tc1.name) << @tc1.new("test_1") << @tc1.new("test_2")) + expected << (TestSuite.new(@tc2.name) << @tc2.new("test_0")) end def empty_suite @@ -81,15 +81,15 @@ module Test assert_equal(full_suite, @c.collect) expected = TestSuite.new(ObjectSpace::NAME) - expected << (TestSuite.new(@tc1.name) << @tc1.new(:test_1)) - expected << (TestSuite.new(@tc2.name) << @tc2.new(:test_0)) - @c.filter = proc{|test| [:test_1, :test_0].include?(test.method_name)} + expected << (TestSuite.new(@tc1.name) << @tc1.new("test_1")) + expected << (TestSuite.new(@tc2.name) << @tc2.new("test_0")) + @c.filter = proc{|test| ["test_1", "test_0"].include?(test.method_name)} assert_equal(expected, @c.collect) expected = TestSuite.new(ObjectSpace::NAME) - expected << (TestSuite.new(@tc1.name) << @tc1.new(:test_1)) - expected << (TestSuite.new(@tc2.name) << @tc2.new(:test_0)) - @c.filter = [proc{|t| t.method_name == :test_1 ? true : nil}, proc{|t| t.method_name == :test_0 ? true : nil}, proc{false}] + expected << (TestSuite.new(@tc1.name) << @tc1.new("test_1")) + expected << (TestSuite.new(@tc2.name) << @tc2.new("test_0")) + @c.filter = [proc{|t| t.method_name == "test_1" ? true : nil}, proc{|t| t.method_name == "test_0" ? true : nil}, proc{false}] assert_equal(expected, @c.collect) end end |
