From 746fe8af5a829061640e976039b7d905ed43bc98 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 3 Oct 2009 14:47:46 +0000 Subject: * test/rake: get rid of name collision. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rake/test_application.rb | 8 ++++---- test/rake/test_clean.rb | 2 +- test/rake/test_definitions.rb | 2 +- test/rake/test_earlytime.rb | 2 +- test/rake/test_extension.rb | 2 +- test/rake/test_file_creation_task.rb | 2 +- test/rake/test_file_task.rb | 4 ++-- test/rake/test_filelist.rb | 2 +- test/rake/test_fileutils.rb | 2 +- test/rake/test_ftp.rb | 2 +- test/rake/test_invocation_chain.rb | 6 +++--- test/rake/test_makefile_loader.rb | 2 +- test/rake/test_multitask.rb | 2 +- test/rake/test_namespace.rb | 2 +- test/rake/test_pathmap.rb | 8 ++++---- test/rake/test_pseudo_status.rb | 2 +- test/rake/test_rake.rb | 2 +- test/rake/test_rdoc_task.rb | 2 +- test/rake/test_require.rb | 2 +- test/rake/test_rules.rb | 2 +- test/rake/test_task_arguments.rb | 2 +- test/rake/test_task_manager.rb | 4 ++-- test/rake/test_tasklib.rb | 2 +- test/rake/test_tasks.rb | 4 ++-- test/rake/test_test_task.rb | 2 +- test/rake/test_top_level_functions.rb | 2 +- test/rake/test_win32.rb | 2 +- 27 files changed, 38 insertions(+), 38 deletions(-) (limited to 'test') diff --git a/test/rake/test_application.rb b/test/rake/test_application.rb index adaa0b1b20..77f9859b24 100755 --- a/test/rake/test_application.rb +++ b/test/rake/test_application.rb @@ -6,7 +6,7 @@ require_relative 'in_environment' 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 @@ end ###################################################################### -class TestApplicationOptions < Test::Unit::TestCase +class Rake::TestApplicationOptions < Test::Unit::TestCase include CaptureStdout def setup @@ -589,7 +589,7 @@ class TestApplicationOptions < Test::Unit::TestCase end end -class TestTaskArgumentParsing < Test::Unit::TestCase +class Rake::TestTaskArgumentParsing < Test::Unit::TestCase def setup @app = Rake::Application.new end @@ -632,7 +632,7 @@ class TestTaskArgumentParsing < Test::Unit::TestCase end -class TestTaskArgumentParsing < Test::Unit::TestCase +class Rake::TestTaskArgumentParsing < Test::Unit::TestCase include InEnvironment def test_terminal_width_using_env diff --git a/test/rake/test_clean.rb b/test/rake/test_clean.rb index 35d99caa5a..0e8b81c2c7 100644 --- a/test/rake/test_clean.rb +++ b/test/rake/test_clean.rb @@ -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" diff --git a/test/rake/test_definitions.rb b/test/rake/test_definitions.rb index a56d09b8d7..164958ecd5 100644 --- a/test/rake/test_definitions.rb +++ b/test/rake/test_definitions.rb @@ -4,7 +4,7 @@ require 'rake' require_relative 'filecreation' ###################################################################### -class TestDefinitions < Test::Unit::TestCase +class Rake::TestDefinitions < Test::Unit::TestCase include Rake EXISTINGFILE = "testdata/existing" diff --git a/test/rake/test_earlytime.rb b/test/rake/test_earlytime.rb index d166c25721..a228146679 100644 --- a/test/rake/test_earlytime.rb +++ b/test/rake/test_earlytime.rb @@ -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) diff --git a/test/rake/test_extension.rb b/test/rake/test_extension.rb index 0873efbe35..94348aafa6 100644 --- a/test/rake/test_extension.rb +++ b/test/rake/test_extension.rb @@ -3,7 +3,7 @@ require 'rake' require 'stringio' ###################################################################### -class TestExtension < Test::Unit::TestCase +class Rake::TestExtension < Test::Unit::TestCase module Redirect def error_redirect diff --git a/test/rake/test_file_creation_task.rb b/test/rake/test_file_creation_task.rb index 1e5b177546..1f2af90399 100644 --- a/test/rake/test_file_creation_task.rb +++ b/test/rake/test_file_creation_task.rb @@ -4,7 +4,7 @@ require 'rake' require_relative 'filecreation' ###################################################################### -class TestFileCreationTask < Test::Unit::TestCase +class Rake::TestFileCreationTask < Test::Unit::TestCase include Rake include FileCreation diff --git a/test/rake/test_file_task.rb b/test/rake/test_file_task.rb index 203597b789..1b0c0a5614 100644 --- a/test/rake/test_file_task.rb +++ b/test/rake/test_file_task.rb @@ -4,7 +4,7 @@ require 'rake' require_relative 'filecreation' ###################################################################### -class TestFileTask < Test::Unit::TestCase +class Rake::TestFileTask < Test::Unit::TestCase include Rake include FileCreation @@ -89,7 +89,7 @@ class TestFileTask < Test::Unit::TestCase end ###################################################################### -class TestDirectoryTask < Test::Unit::TestCase +class Rake::TestDirectoryTask < Test::Unit::TestCase include Rake def setup diff --git a/test/rake/test_filelist.rb b/test/rake/test_filelist.rb index da7b37bd4b..08456a4da8 100644 --- a/test/rake/test_filelist.rb +++ b/test/rake/test_filelist.rb @@ -4,7 +4,7 @@ require 'rake' require_relative 'capture_stdout' -class TestFileList < Test::Unit::TestCase +class Rake::TestFileList < Test::Unit::TestCase FileList = Rake::FileList include CaptureStdout diff --git a/test/rake/test_fileutils.rb b/test/rake/test_fileutils.rb index c32e505ecb..5969d22455 100644 --- a/test/rake/test_fileutils.rb +++ b/test/rake/test_fileutils.rb @@ -4,7 +4,7 @@ require_relative 'filecreation' 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" diff --git a/test/rake/test_ftp.rb b/test/rake/test_ftp.rb index 8b64890e3e..2178eb7886 100644 --- a/test/rake/test_ftp.rb +++ b/test/rake/test_ftp.rb @@ -13,7 +13,7 @@ class FakeDate end -class TestFtpFile < Test::Unit::TestCase +class Rake::TestFtpFile < Test::Unit::TestCase def setup Rake::FtpFile.class_eval { @date_class = FakeDate; @time_class = FakeDate } diff --git a/test/rake/test_invocation_chain.rb b/test/rake/test_invocation_chain.rb index a5843bfd2a..2b06493773 100644 --- a/test/rake/test_invocation_chain.rb +++ b/test/rake/test_invocation_chain.rb @@ -2,7 +2,7 @@ require 'test/unit' require 'rake' ###################################################################### -class TestAnEmptyInvocationChain < Test::Unit::TestCase +class Rake::TestAnEmptyInvocationChain < Test::Unit::TestCase def setup @empty = Rake::InvocationChain::EMPTY @@ -20,7 +20,7 @@ class TestAnEmptyInvocationChain < Test::Unit::TestCase end ###################################################################### -class TestAnInvocationChainWithOneMember < Test::Unit::TestCase +class Rake::TestAnInvocationChainWithOneMember < Test::Unit::TestCase def setup @empty = Rake::InvocationChain::EMPTY @@ -47,7 +47,7 @@ class TestAnInvocationChainWithOneMember < Test::Unit::TestCase end ###################################################################### -class TestAnInvocationChainWithMultipleMember < Test::Unit::TestCase +class Rake::TestAnInvocationChainWithMultipleMember < Test::Unit::TestCase def setup @first_member = "A" diff --git a/test/rake/test_makefile_loader.rb b/test/rake/test_makefile_loader.rb index 69e09e1da3..15933b1f9b 100644 --- a/test/rake/test_makefile_loader.rb +++ b/test/rake/test_makefile_loader.rb @@ -2,7 +2,7 @@ require 'test/unit' require 'rake' require 'rake/loaders/makefile' -class TestMakefileLoader < Test::Unit::TestCase +class Rake::TestMakefileLoader < Test::Unit::TestCase include Rake def test_parse diff --git a/test/rake/test_multitask.rb b/test/rake/test_multitask.rb index d1178e6765..9711e7e77e 100644 --- a/test/rake/test_multitask.rb +++ b/test/rake/test_multitask.rb @@ -2,7 +2,7 @@ require 'test/unit' require 'rake' ###################################################################### -class TestMultiTask < Test::Unit::TestCase +class Rake::TestMultiTask < Test::Unit::TestCase include Rake def setup diff --git a/test/rake/test_namespace.rb b/test/rake/test_namespace.rb index 30608de122..bd513b6a10 100755 --- a/test/rake/test_namespace.rb +++ b/test/rake/test_namespace.rb @@ -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 diff --git a/test/rake/test_pathmap.rb b/test/rake/test_pathmap.rb index 3e9935f9ba..257529ab87 100644 --- a/test/rake/test_pathmap.rb +++ b/test/rake/test_pathmap.rb @@ -2,7 +2,7 @@ require 'test/unit' 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 @@ class TestPathMap < Test::Unit::TestCase 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 @@ class TestPathMapExplode < Test::Unit::TestCase 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 @@ class TestPathMapPartial < Test::Unit::TestCase 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 diff --git a/test/rake/test_pseudo_status.rb b/test/rake/test_pseudo_status.rb index 149aa5bf9f..8bafd5f80a 100644 --- a/test/rake/test_pseudo_status.rb +++ b/test/rake/test_pseudo_status.rb @@ -3,7 +3,7 @@ require 'rake' 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 diff --git a/test/rake/test_rake.rb b/test/rake/test_rake.rb index 0f0f6a843d..52230fe148 100644 --- a/test/rake/test_rake.rb +++ b/test/rake/test_rake.rb @@ -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') diff --git a/test/rake/test_rdoc_task.rb b/test/rake/test_rdoc_task.rb index 524057cf07..362c2c6800 100644 --- a/test/rake/test_rdoc_task.rb +++ b/test/rake/test_rdoc_task.rb @@ -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 diff --git a/test/rake/test_require.rb b/test/rake/test_require.rb index 236b992f78..8e6e2e9d5b 100644 --- a/test/rake/test_require.rb +++ b/test/rake/test_require.rb @@ -2,7 +2,7 @@ require 'test/unit' 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 diff --git a/test/rake/test_rules.rb b/test/rake/test_rules.rb index 4dbf75d1f0..6e4f22424d 100644 --- a/test/rake/test_rules.rb +++ b/test/rake/test_rules.rb @@ -4,7 +4,7 @@ require 'rake' require_relative 'filecreation' ###################################################################### -class TestRules < Test::Unit::TestCase +class Rake::TestRules < Test::Unit::TestCase include Rake include FileCreation diff --git a/test/rake/test_task_arguments.rb b/test/rake/test_task_arguments.rb index daecbcf730..deb5f19ea2 100644 --- a/test/rake/test_task_arguments.rb +++ b/test/rake/test_task_arguments.rb @@ -2,7 +2,7 @@ require 'test/unit' require 'rake' ###################################################################### -class TestTaskArguments < Test::Unit::TestCase +class Rake::TestTaskArguments < Test::Unit::TestCase def teardown ENV.delete('rev') ENV.delete('VER') diff --git a/test/rake/test_task_manager.rb b/test/rake/test_task_manager.rb index 2337946022..d414e75cf6 100644 --- a/test/rake/test_task_manager.rb +++ b/test/rake/test_task_manager.rb @@ -5,7 +5,7 @@ class TaskManager include Rake::TaskManager end -class TestTaskManager < Test::Unit::TestCase +class Rake::TestTaskManager < Test::Unit::TestCase def setup @tm = TaskManager.new @@ -146,7 +146,7 @@ class TestTaskManager < Test::Unit::TestCase 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) diff --git a/test/rake/test_tasklib.rb b/test/rake/test_tasklib.rb index a113d80f78..c8b9cecdb2 100644 --- a/test/rake/test_tasklib.rb +++ b/test/rake/test_tasklib.rb @@ -2,7 +2,7 @@ require 'test/unit' 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) diff --git a/test/rake/test_tasks.rb b/test/rake/test_tasks.rb index c4948ea389..02aea6ebb9 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 TestTask < Test::Unit::TestCase +class Rake::TestTask < Test::Unit::TestCase include CaptureStdout include Rake @@ -213,7 +213,7 @@ class TestTask < Test::Unit::TestCase end ###################################################################### -class TestTaskWithArguments < Test::Unit::TestCase +class Rake::TestTaskWithArguments < Test::Unit::TestCase include CaptureStdout include Rake diff --git a/test/rake/test_test_task.rb b/test/rake/test_test_task.rb index 1ba04ba9bd..a0dc7a0717 100644 --- a/test/rake/test_test_task.rb +++ b/test/rake/test_test_task.rb @@ -2,7 +2,7 @@ require 'tmpdir' require 'test/unit' require 'rake/testtask' -class TestTestTask < Test::Unit::TestCase +class Rake::TestTestTask < Test::Unit::TestCase include Rake def setup diff --git a/test/rake/test_top_level_functions.rb b/test/rake/test_top_level_functions.rb index c17fc73c4e..12a8cd1e36 100644 --- a/test/rake/test_top_level_functions.rb +++ b/test/rake/test_top_level_functions.rb @@ -2,7 +2,7 @@ require 'test/unit' require_relative 'capture_stdout' require 'rake' -class TestTopLevelFunctions < Test::Unit::TestCase +class Rake::TestTopLevelFunctions < Test::Unit::TestCase include CaptureStdout def setup diff --git a/test/rake/test_win32.rb b/test/rake/test_win32.rb index a1b73de9dd..07db16c140 100644 --- a/test/rake/test_win32.rb +++ b/test/rake/test_win32.rb @@ -3,7 +3,7 @@ require_relative 'in_environment' require 'rake' -class TestWin32 < Test::Unit::TestCase +class Rake::TestWin32 < Test::Unit::TestCase include InEnvironment Win32 = Rake::Win32 -- cgit v1.2.3