diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-03 14:54:18 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-03 14:54:18 +0000 |
commit | 612b92f6717fa13e04a9d89b7b087f543d07ae6c (patch) | |
tree | 6f052a78890f21b5c41a8c57f7b17938056947d8 | |
parent | 13ddb8b3e97220ac347cbaf669c745c707bbe5ad (diff) | |
download | ruby-612b92f6717fa13e04a9d89b7b087f543d07ae6c.tar.gz ruby-612b92f6717fa13e04a9d89b7b087f543d07ae6c.tar.xz ruby-612b92f6717fa13e04a9d89b7b087f543d07ae6c.zip |
* test/rake: get rid of name collision.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25212 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/rake/test_ftp.rb | 18 | ||||
-rw-r--r-- | test/rake/test_task_manager.rb | 9 | ||||
-rw-r--r-- | test/rake/test_tasks.rb | 2 |
3 files changed, 14 insertions, 15 deletions
diff --git a/test/rake/test_ftp.rb b/test/rake/test_ftp.rb index 2178eb788..0346dd71c 100644 --- a/test/rake/test_ftp.rb +++ b/test/rake/test_ftp.rb @@ -3,17 +3,15 @@ require 'time' require 'test/unit' require 'rake/contrib/ftptools' -class FakeDate - def self.today - Date.new(2003,10,3) - end - def self.now - Time.local(2003,10,3,12,00,00) - end -end - - class Rake::TestFtpFile < Test::Unit::TestCase + class FakeDate + def self.today + Date.new(2003,10,3) + end + def self.now + Time.local(2003,10,3,12,00,00) + end + end def setup Rake::FtpFile.class_eval { @date_class = FakeDate; @time_class = FakeDate } diff --git a/test/rake/test_task_manager.rb b/test/rake/test_task_manager.rb index d414e75cf..94c30d9c8 100644 --- a/test/rake/test_task_manager.rb +++ b/test/rake/test_task_manager.rb @@ -1,11 +1,10 @@ require 'test/unit' require 'rake' -class TaskManager - include Rake::TaskManager -end - class Rake::TestTaskManager < Test::Unit::TestCase + class TaskManager + include Rake::TaskManager + end def setup @tm = TaskManager.new @@ -147,6 +146,8 @@ class Rake::TestTaskManager < Test::Unit::TestCase end class Rake::TestTaskManagerArgumentResolution < Test::Unit::TestCase + TaskManager = Rake::TestTaskManager::TaskManager + def test_good_arg_patterns assert_equal [:t, [], []], task(:t) assert_equal [:t, [], [:x]], task(:t => :x) diff --git a/test/rake/test_tasks.rb b/test/rake/test_tasks.rb index 02aea6ebb..a042ec4fc 100644 --- a/test/rake/test_tasks.rb +++ b/test/rake/test_tasks.rb @@ -5,7 +5,7 @@ require_relative 'filecreation' require_relative 'capture_stdout' ###################################################################### -class Rake::TestTask < Test::Unit::TestCase +class Rake::TestTasks < Test::Unit::TestCase include CaptureStdout include Rake |