From 45c950c1df411bb245ddc50138b6ab64f289753b Mon Sep 17 00:00:00 2001 From: nahi Date: Tue, 13 Jan 2004 04:06:31 +0000 Subject: [PATCH] * test/test_*.rb: Pathname#parent -> Pathname#dirname. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ test/test_generator.rb | 4 ++-- test/test_ipaddr.rb | 4 ++-- test/test_pathname.rb | 4 ++-- test/test_pp.rb | 4 ++-- test/test_prettyprint.rb | 4 ++-- test/test_set.rb | 4 ++-- test/test_time.rb | 4 ++-- test/test_tsort.rb | 4 ++-- 9 files changed, 20 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index eec6649524..3b79ce6ee7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Jan 13 13:04:24 2004 NAKAMURA, Hiroshi + + * test/test_*.rb: Pathname#parent -> Pathname#dirname. + Tue Jan 13 11:38:58 2004 Nobuyoshi Nakada * test/yaml/test_yaml.rb (YAML_Unit_Tests::test_spec_type_{int,float}): diff --git a/test/test_generator.rb b/test/test_generator.rb index 2db04787f1..604ce93caa 100644 --- a/test/test_generator.rb +++ b/test/test_generator.rb @@ -1,4 +1,4 @@ require 'pathname' -require Pathname.new(__FILE__).parent.join('inlinetest.rb') -target = __FILE__.scan(/test_(.*\.rb)$/)[0][0] +require Pathname.new(__FILE__).dirname.join('inlinetest.rb') +target = __FILE__[/test_(.*\.rb)$/, 1] InlineTest.loadtest__END__part(target) diff --git a/test/test_ipaddr.rb b/test/test_ipaddr.rb index 2db04787f1..604ce93caa 100644 --- a/test/test_ipaddr.rb +++ b/test/test_ipaddr.rb @@ -1,4 +1,4 @@ require 'pathname' -require Pathname.new(__FILE__).parent.join('inlinetest.rb') -target = __FILE__.scan(/test_(.*\.rb)$/)[0][0] +require Pathname.new(__FILE__).dirname.join('inlinetest.rb') +target = __FILE__[/test_(.*\.rb)$/, 1] InlineTest.loadtest__END__part(target) diff --git a/test/test_pathname.rb b/test/test_pathname.rb index ef4da4638c..981fedd98f 100644 --- a/test/test_pathname.rb +++ b/test/test_pathname.rb @@ -1,4 +1,4 @@ require 'pathname' -require Pathname.new(__FILE__).parent.join('inlinetest.rb') -target = __FILE__.scan(/test_(.*\.rb)$/)[0][0] +require Pathname.new(__FILE__).dirname.join('inlinetest.rb') +target = __FILE__[/test_(.*\.rb)$/, 1] InlineTest.loadtest(target) diff --git a/test/test_pp.rb b/test/test_pp.rb index ef4da4638c..981fedd98f 100644 --- a/test/test_pp.rb +++ b/test/test_pp.rb @@ -1,4 +1,4 @@ require 'pathname' -require Pathname.new(__FILE__).parent.join('inlinetest.rb') -target = __FILE__.scan(/test_(.*\.rb)$/)[0][0] +require Pathname.new(__FILE__).dirname.join('inlinetest.rb') +target = __FILE__[/test_(.*\.rb)$/, 1] InlineTest.loadtest(target) diff --git a/test/test_prettyprint.rb b/test/test_prettyprint.rb index ef4da4638c..981fedd98f 100644 --- a/test/test_prettyprint.rb +++ b/test/test_prettyprint.rb @@ -1,4 +1,4 @@ require 'pathname' -require Pathname.new(__FILE__).parent.join('inlinetest.rb') -target = __FILE__.scan(/test_(.*\.rb)$/)[0][0] +require Pathname.new(__FILE__).dirname.join('inlinetest.rb') +target = __FILE__[/test_(.*\.rb)$/, 1] InlineTest.loadtest(target) diff --git a/test/test_set.rb b/test/test_set.rb index 2db04787f1..604ce93caa 100644 --- a/test/test_set.rb +++ b/test/test_set.rb @@ -1,4 +1,4 @@ require 'pathname' -require Pathname.new(__FILE__).parent.join('inlinetest.rb') -target = __FILE__.scan(/test_(.*\.rb)$/)[0][0] +require Pathname.new(__FILE__).dirname.join('inlinetest.rb') +target = __FILE__[/test_(.*\.rb)$/, 1] InlineTest.loadtest__END__part(target) diff --git a/test/test_time.rb b/test/test_time.rb index ef4da4638c..981fedd98f 100644 --- a/test/test_time.rb +++ b/test/test_time.rb @@ -1,4 +1,4 @@ require 'pathname' -require Pathname.new(__FILE__).parent.join('inlinetest.rb') -target = __FILE__.scan(/test_(.*\.rb)$/)[0][0] +require Pathname.new(__FILE__).dirname.join('inlinetest.rb') +target = __FILE__[/test_(.*\.rb)$/, 1] InlineTest.loadtest(target) diff --git a/test/test_tsort.rb b/test/test_tsort.rb index ef4da4638c..981fedd98f 100644 --- a/test/test_tsort.rb +++ b/test/test_tsort.rb @@ -1,4 +1,4 @@ require 'pathname' -require Pathname.new(__FILE__).parent.join('inlinetest.rb') -target = __FILE__.scan(/test_(.*\.rb)$/)[0][0] +require Pathname.new(__FILE__).dirname.join('inlinetest.rb') +target = __FILE__[/test_(.*\.rb)$/, 1] InlineTest.loadtest(target)