nobu	2009-10-03 23:54:18 +0900 (Sat, 03 Oct 2009)

  New Revision: 25212

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25212

  Log:
    * test/rake: get rid of name collision.

  Modified files:
    trunk/test/rake/test_ftp.rb
    trunk/test/rake/test_task_manager.rb
    trunk/test/rake/test_tasks.rb

Index: test/rake/test_ftp.rb
===================================================================
--- test/rake/test_ftp.rb	(revision 25211)
+++ test/rake/test_ftp.rb	(revision 25212)
@@ -3,18 +3,16 @@
 require 'test/unit'
 require 'rake/contrib/ftptools'
 
-class FakeDate
-  def self.today
-    Date.new(2003,10,3)
+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 self.now
-    Time.local(2003,10,3,12,00,00)
-  end
-end
 
-
-class Rake::TestFtpFile < Test::Unit::TestCase
-
   def setup
     Rake::FtpFile.class_eval { @date_class = FakeDate; @time_class = FakeDate }
   end
Index: test/rake/test_task_manager.rb
===================================================================
--- test/rake/test_task_manager.rb	(revision 25211)
+++ test/rake/test_task_manager.rb	(revision 25212)
@@ -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 @@
 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)
Index: test/rake/test_tasks.rb
===================================================================
--- test/rake/test_tasks.rb	(revision 25211)
+++ test/rake/test_tasks.rb	(revision 25212)
@@ -5,7 +5,7 @@
 require_relative 'capture_stdout'
 
 ######################################################################
-class Rake::TestTask < Test::Unit::TestCase
+class Rake::TestTasks < Test::Unit::TestCase
   include CaptureStdout
   include Rake
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/