ruby-changes:13438
From: nobu <ko1@a...>
Date: Sat, 3 Oct 2009 23:48:26 +0900 (JST)
Subject: [ruby-changes:13438] Ruby:r25211 (trunk): * test/rake: get rid of name collision.
nobu 2009-10-03 23:47:46 +0900 (Sat, 03 Oct 2009) New Revision: 25211 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25211 Log: * test/rake: get rid of name collision. Modified files: trunk/test/rake/test_application.rb trunk/test/rake/test_clean.rb trunk/test/rake/test_definitions.rb trunk/test/rake/test_earlytime.rb trunk/test/rake/test_extension.rb trunk/test/rake/test_file_creation_task.rb trunk/test/rake/test_file_task.rb trunk/test/rake/test_filelist.rb trunk/test/rake/test_fileutils.rb trunk/test/rake/test_ftp.rb trunk/test/rake/test_invocation_chain.rb trunk/test/rake/test_makefile_loader.rb trunk/test/rake/test_multitask.rb trunk/test/rake/test_namespace.rb trunk/test/rake/test_pathmap.rb trunk/test/rake/test_pseudo_status.rb trunk/test/rake/test_rake.rb trunk/test/rake/test_rdoc_task.rb trunk/test/rake/test_require.rb trunk/test/rake/test_rules.rb trunk/test/rake/test_task_arguments.rb trunk/test/rake/test_task_manager.rb trunk/test/rake/test_tasklib.rb trunk/test/rake/test_tasks.rb trunk/test/rake/test_test_task.rb trunk/test/rake/test_top_level_functions.rb trunk/test/rake/test_win32.rb Index: test/rake/test_top_level_functions.rb =================================================================== --- test/rake/test_top_level_functions.rb (revision 25210) +++ test/rake/test_top_level_functions.rb (revision 25211) @@ -2,7 +2,7 @@ require_relative 'capture_stdout' require 'rake' -class TestTopLevelFunctions < Test::Unit::TestCase +class Rake::TestTopLevelFunctions < Test::Unit::TestCase include CaptureStdout def setup Index: test/rake/test_rake.rb =================================================================== --- test/rake/test_rake.rb (revision 25210) +++ test/rake/test_rake.rb (revision 25211) @@ -1,7 +1,7 @@ require 'test/unit' require 'rake' -class TestRake < Test::Unit::TestCase +class Rake::TestRake < Test::Unit::TestCase def test_each_dir_parent assert_equal ['a'], alldirs('a') assert_equal ['a/b', 'a'], alldirs('a/b') Index: test/rake/test_clean.rb =================================================================== --- test/rake/test_clean.rb (revision 25210) +++ test/rake/test_clean.rb (revision 25211) @@ -1,7 +1,7 @@ require 'test/unit' require 'rake/clean' -class TestClean < Test::Unit::TestCase +class Rake::TestClean < Test::Unit::TestCase include Rake def test_clean assert Task['clean'], "Should define clean" Index: test/rake/test_file_creation_task.rb =================================================================== --- test/rake/test_file_creation_task.rb (revision 25210) +++ test/rake/test_file_creation_task.rb (revision 25211) @@ -4,7 +4,7 @@ require_relative 'filecreation' ###################################################################### -class TestFileCreationTask < Test::Unit::TestCase +class Rake::TestFileCreationTask < Test::Unit::TestCase include Rake include FileCreation Index: test/rake/test_task_arguments.rb =================================================================== --- test/rake/test_task_arguments.rb (revision 25210) +++ test/rake/test_task_arguments.rb (revision 25211) @@ -2,7 +2,7 @@ require 'rake' ###################################################################### -class TestTaskArguments < Test::Unit::TestCase +class Rake::TestTaskArguments < Test::Unit::TestCase def teardown ENV.delete('rev') ENV.delete('VER') Index: test/rake/test_ftp.rb =================================================================== --- test/rake/test_ftp.rb (revision 25210) +++ test/rake/test_ftp.rb (revision 25211) @@ -13,7 +13,7 @@ end -class TestFtpFile < Test::Unit::TestCase +class Rake::TestFtpFile < Test::Unit::TestCase def setup Rake::FtpFile.class_eval { @date_class = FakeDate; @time_class = FakeDate } Index: test/rake/test_tasklib.rb =================================================================== --- test/rake/test_tasklib.rb (revision 25210) +++ test/rake/test_tasklib.rb (revision 25211) @@ -2,7 +2,7 @@ require 'rake/tasklib' -class TestTaskLib < Test::Unit::TestCase +class Rake::TestTaskLib < Test::Unit::TestCase def test_paste tl = Rake::TaskLib.new assert_equal :ab, tl.paste(:a, :b) Index: test/rake/test_rules.rb =================================================================== --- test/rake/test_rules.rb (revision 25210) +++ test/rake/test_rules.rb (revision 25211) @@ -4,7 +4,7 @@ require_relative 'filecreation' ###################################################################### -class TestRules < Test::Unit::TestCase +class Rake::TestRules < Test::Unit::TestCase include Rake include FileCreation Index: test/rake/test_pathmap.rb =================================================================== --- test/rake/test_pathmap.rb (revision 25210) +++ test/rake/test_pathmap.rb (revision 25211) @@ -2,7 +2,7 @@ require 'rake' # ==================================================================== -class TestPathMap < Test::Unit::TestCase +class Rake::TestPathMap < Test::Unit::TestCase def test_returns_self_with_no_args assert_equal "abc.rb", "abc.rb".pathmap @@ -157,7 +157,7 @@ end end -class TestPathMapExplode < Test::Unit::TestCase +class Rake::TestPathMapExplode < Test::Unit::TestCase def setup String.class_eval { public :pathmap_explode } end @@ -184,7 +184,7 @@ end end -class TestPathMapPartial < Test::Unit::TestCase +class Rake::TestPathMapPartial < Test::Unit::TestCase def test_pathmap_partial @path = "1/2/file" def @path.call(n) @@ -200,7 +200,7 @@ end end -class TestFileListPathMap < Test::Unit::TestCase +class Rake::TestFileListPathMap < Test::Unit::TestCase def test_file_list_supports_pathmap assert_equal ['a', 'b'], FileList['dir/a.rb', 'dir/b.rb'].pathmap("%n") end Index: test/rake/test_earlytime.rb =================================================================== --- test/rake/test_earlytime.rb (revision 25210) +++ test/rake/test_earlytime.rb (revision 25211) @@ -1,7 +1,7 @@ require 'test/unit' require 'rake' -class TestEarlyTime < Test::Unit::TestCase +class Rake::TestEarlyTime < Test::Unit::TestCase def test_create early = Rake::EarlyTime.instance time = Time.mktime(1970, 1, 1, 0, 0, 0) Index: test/rake/test_task_manager.rb =================================================================== --- test/rake/test_task_manager.rb (revision 25210) +++ test/rake/test_task_manager.rb (revision 25211) @@ -5,7 +5,7 @@ include Rake::TaskManager end -class TestTaskManager < Test::Unit::TestCase +class Rake::TestTaskManager < Test::Unit::TestCase def setup @tm = TaskManager.new @@ -146,7 +146,7 @@ end -class TestTaskManagerArgumentResolution < Test::Unit::TestCase +class Rake::TestTaskManagerArgumentResolution < Test::Unit::TestCase def test_good_arg_patterns assert_equal [:t, [], []], task(:t) assert_equal [:t, [], [:x]], task(:t => :x) Index: test/rake/test_file_task.rb =================================================================== --- test/rake/test_file_task.rb (revision 25210) +++ test/rake/test_file_task.rb (revision 25211) @@ -4,7 +4,7 @@ require_relative 'filecreation' ###################################################################### -class TestFileTask < Test::Unit::TestCase +class Rake::TestFileTask < Test::Unit::TestCase include Rake include FileCreation @@ -89,7 +89,7 @@ end ###################################################################### -class TestDirectoryTask < Test::Unit::TestCase +class Rake::TestDirectoryTask < Test::Unit::TestCase include Rake def setup Index: test/rake/test_test_task.rb =================================================================== --- test/rake/test_test_task.rb (revision 25210) +++ test/rake/test_test_task.rb (revision 25211) @@ -2,7 +2,7 @@ require 'test/unit' require 'rake/testtask' -class TestTestTask < Test::Unit::TestCase +class Rake::TestTestTask < Test::Unit::TestCase include Rake def setup Index: test/rake/test_win32.rb =================================================================== --- test/rake/test_win32.rb (revision 25210) +++ test/rake/test_win32.rb (revision 25211) @@ -3,7 +3,7 @@ require 'rake' -class TestWin32 < Test::Unit::TestCase +class Rake::TestWin32 < Test::Unit::TestCase include InEnvironment Win32 = Rake::Win32 Index: test/rake/test_application.rb =================================================================== --- test/rake/test_application.rb (revision 25210) +++ test/rake/test_application.rb (revision 25211) @@ -6,7 +6,7 @@ TESTING_REQUIRE = [ ] ###################################################################### -class TestApplication < Test::Unit::TestCase +class Rake::TestApplication < Test::Unit::TestCase include CaptureStdout include InEnvironment BASEDIR = File.dirname(__FILE__) @@ -298,7 +298,7 @@ ###################################################################### -class TestApplicationOptions < Test::Unit::TestCase +class Rake::TestApplicationOptions < Test::Unit::TestCase include CaptureStdout def setup @@ -589,7 +589,7 @@ end end -class TestTaskArgumentParsing < Test::Unit::TestCase +class Rake::TestTaskArgumentParsing < Test::Unit::TestCase def setup @app = Rake::Application.new end @@ -632,7 +632,7 @@ end -class TestTaskArgumentParsing < Test::Unit::TestCase +class Rake::TestTaskArgumentParsing < Test::Unit::TestCase include InEnvironment def test_terminal_width_using_env Index: test/rake/test_makefile_loader.rb =================================================================== --- test/rake/test_makefile_loader.rb (revision 25210) +++ test/rake/test_makefile_loader.rb (revision 25211) @@ -2,7 +2,7 @@ require 'rake' require 'rake/loaders/makefile' -class TestMakefileLoader < Test::Unit::TestCase +class Rake::TestMakefileLoader < Test::Unit::TestCase include Rake def test_parse Index: test/rake/test_definitions.rb =================================================================== --- test/rake/test_definitions.rb (revision 25210) +++ test/rake/test_definitions.rb (revision 25211) @@ -4,7 +4,7 @@ require_relative 'filecreation' ###################################################################### -class TestDefinitions < Test::Unit::TestCase +class Rake::TestDefinitions < Test::Unit::TestCase include Rake EXISTINGFILE = "testdata/existing" Index: test/rake/test_filelist.rb =================================================================== --- test/rake/test_filelist.rb (revision 25210) +++ test/rake/test_filelist.rb (revision 25211) @@ -4,7 +4,7 @@ require_relative 'capture_stdout' -class TestFileList < Test::Unit::TestCase +class Rake::TestFileList < Test::Unit::TestCase FileList = Rake::FileList include CaptureStdout Index: test/rake/test_invocation_chain.rb =================================================================== --- test/rake/test_invocation_chain.rb (revision 25210) +++ test/rake/test_invocation_chain.rb (revision 25211) @@ -2,7 +2,7 @@ require 'rake' ###################################################################### -class TestAnEmptyInvocationChain < Test::Unit::TestCase +class Rake::TestAnEmptyInvocationChain < Test::Unit::TestCase def setup @empty = Rake::InvocationChain::EMPTY @@ -20,7 +20,7 @@ end ###################################################################### -class TestAnInvocationChainWithOneMember < Test::Unit::TestCase +class Rake::TestAnInvocationChainWithOneMember < Test::Unit::TestCase def setup @empty = Rake::InvocationChain::EMPTY @@ -47,7 +47,7 @@ end ###################################################################### -class TestAnInvocationChainWithMultipleMember < Test::Unit::TestCase +class Rake::TestAnInvocationChainWithMultipleMember < Test::Unit::TestCase def setup @first_member = "A" Index: test/rake/test_extension.rb =================================================================== --- test/rake/test_extension.rb (revision 25210) +++ test/rake/test_extension.rb (revision 25211) @@ -3,7 +3,7 @@ require 'stringio' ###################################################################### -class TestExtension < Test::Unit::TestCase +class Rake::TestExtension < Test::Unit::TestCase module Redirect def error_redirect Index: test/rake/test_require.rb =================================================================== --- test/rake/test_require.rb (revision 25210) +++ test/rake/test_require.rb (revision 25211) @@ -2,7 +2,7 @@ require 'rake' # ==================================================================== -class TestRequire < Test::Unit::TestCase +class Rake::TestRequire < Test::Unit::TestCase RakeLibDir = File.dirname(__FILE__) + '/data/rakelib' def test_can_load_rake_library Index: test/rake/test_multitask.rb =================================================================== --- test/rake/test_multitask.rb (revision 25210) +++ test/rake/test_multitask.rb (revision 25211) @@ -2,7 +2,7 @@ require 'rake' ###################################################################### -class TestMultiTask < Test::Unit::TestCase +class Rake::TestMultiTask < Test::Unit::TestCase include Rake def setup Index: test/rake/test_tasks.rb =================================================================== --- test/rake/test_tasks.rb (revision 25210) +++ test/rake/test_tasks.rb (revision 25211) @@ -5,7 +5,7 @@ require_relative 'capture_stdout' ###################################################################### -class TestTask < Test::Unit::TestCase +class Rake::TestTask < Test::Unit::TestCase include CaptureStdout include Rake @@ -213,7 +213,7 @@ end ###################################################################### -class TestTaskWithArguments < Test::Unit::TestCase +class Rake::TestTaskWithArguments < Test::Unit::TestCase include CaptureStdout include Rake Index: test/rake/test_namespace.rb =================================================================== --- test/rake/test_namespace.rb (revision 25210) +++ test/rake/test_namespace.rb (revision 25211) @@ -1,7 +1,7 @@ require 'test/unit' require 'rake' -class TestNameSpace < Test::Unit::TestCase +class Rake::TestNameSpace < Test::Unit::TestCase class TM include Rake::TaskManager Index: test/rake/test_fileutils.rb =================================================================== --- test/rake/test_fileutils.rb (revision 25210) +++ test/rake/test_fileutils.rb (revision 25211) @@ -4,7 +4,7 @@ require 'fileutils' require 'stringio' -class TestFileUtils < Test::Unit::TestCase +class Rake::TestFileUtils < Test::Unit::TestCase include FileCreation BASEDIR = File.dirname(__FILE__) ShellCommand = "#{BASEDIR}/shellcommand.rb" Index: test/rake/test_pseudo_status.rb =================================================================== --- test/rake/test_pseudo_status.rb (revision 25210) +++ test/rake/test_pseudo_status.rb (revision 25211) @@ -3,7 +3,7 @@ require_relative 'capture_stdout' -class PseudoStatusTest < Test::Unit::TestCase +class Rake::TestPseudoStatus < Test::Unit::TestCase def test_with_zero_exit_status s = Rake::PseudoStatus.new assert_equal 0, s.exitstatus Index: test/rake/test_rdoc_task.rb =================================================================== --- test/rake/test_rdoc_task.rb (revision 25210) +++ test/rake/test_rdoc_task.rb (revision 25211) @@ -1,7 +1,7 @@ require 'test/unit' require 'rake/rdoctask' -class TestRDocTask < Test::Unit::TestCase +class Rake::TestRDocTask < Test::Unit::TestCase include Rake def setup -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/