Flatten test hierarchy by one level, change test namespace to include…

… 'Rake' so we don't collide with other tests in ruby, change test file names to work with autotest.
evanphx · May 20, 2011 · 375f8e5 · 375f8e5
1 parent e93cefd
commit 375f8e5
Show file tree

Hide file tree

Showing 33 changed files with 95 additions and 104 deletions.
diff --git a/Rakefile b/Rakefile
@@ -71,11 +71,10 @@ task :tc => "test:contribs"
 task :test => "test:units"
 
 module TestFiles
-  UNIT = FileList['test/lib/*_test.rb']
+  UNIT = FileList['test/test_*.rb']
   FUNCTIONAL = FileList['test/functional/*_test.rb']
   CONTRIB = FileList['test/contrib/test*.rb']
-  TOP = FileList['test/*_test.rb']
-  ALL = TOP + UNIT + FUNCTIONAL + CONTRIB
+  ALL = UNIT + FUNCTIONAL + CONTRIB
 end
 
 namespace :test do

diff --git a/test/test_helper.rb → test/helper.rb b/test/test_helper.rb → test/helper.rb
diff --git a/test/lib/testtask_test.rb b/test/lib/testtask_test.rb
diff --git a/test/rake_test_setup.rb b/test/rake_test_setup.rb
@@ -10,7 +10,7 @@
 require 'flexmock/test_unit'
 require 'test/file_creation'
 require 'test/capture_stdout'
-require 'test/test_helper'
+require 'test/helper'
 
 module TestMethods
   # Shim method for compatibility

diff --git a/test/lib/rake_test.rb → test/test_rake.rb b/test/lib/rake_test.rb → test/test_rake.rb
diff --git a/test/lib/application_test.rb → test/test_rake_application.rb b/test/lib/application_test.rb → test/test_rake_application.rb
@@ -15,7 +15,7 @@
 TESTING_REQUIRE = [ ]
 
 ######################################################################
-class TestApplication < Test::Unit::TestCase
+class TestRakeApplication < Test::Unit::TestCase
   include CaptureStdout
   include InEnvironment
   include TestMethods
@@ -379,7 +379,7 @@ def test_deprecation_message
 
 
 ######################################################################
-class TestApplicationOptions < Test::Unit::TestCase
+class TestRakeApplicationOptions < Test::Unit::TestCase
   include CaptureStdout
   include TestMethods
   include InEnvironment
@@ -744,7 +744,7 @@ def @app.exit(*args)
   end
 end
 
-class TestTaskArgumentParsing < Test::Unit::TestCase
+class TestRakeTaskArgumentParsing < Test::Unit::TestCase
   def setup
     @app = Rake::Application.new
   end
@@ -787,7 +787,7 @@ def test_keeps_embedded_spaces
 
 end
 
-class TestTaskArgumentParsing < Test::Unit::TestCase
+class TestRakeTaskArgumentParsing < Test::Unit::TestCase
   include InEnvironment
 
   def test_terminal_width_using_env

diff --git a/test/lib/clean_test.rb → test/test_rake_clean.rb b/test/lib/clean_test.rb → test/test_rake_clean.rb
@@ -4,7 +4,7 @@
 require 'rake'
 require 'rake/clean'
 
-class TestClean < Test::Unit::TestCase
+class TestRakeClean < Test::Unit::TestCase
   include Rake
   def test_clean
     assert Task['clean'], "Should define clean"

diff --git a/test/lib/definitions_test.rb → test/test_rake_definitions.rb b/test/lib/definitions_test.rb → test/test_rake_definitions.rb
@@ -7,7 +7,7 @@
 require 'test/rake_test_setup'
 
 ######################################################################
-class TestDefinitions < Test::Unit::TestCase
+class TestRakeDefinitions < Test::Unit::TestCase
   include Rake
   include TestMethods
 

diff --git a/test/lib/dsl_test.rb → test/test_rake_dsl.rb b/test/lib/dsl_test.rb → test/test_rake_dsl.rb
@@ -11,7 +11,7 @@
 require 'rake'
 require 'test/rake_test_setup'
 
-class DslTest < Test::Unit::TestCase
+class TestRakeDsl < Test::Unit::TestCase
 
   def test_namespace_command
     namespace "n" do

diff --git a/test/lib/earlytime_test.rb → test/test_rake_early_time.rb b/test/lib/earlytime_test.rb → test/test_rake_early_time.rb
@@ -3,7 +3,7 @@
 require 'test/unit'
 require 'rake'
 
-class TestEarlyTime < Test::Unit::TestCase
+class TestRakeEarlyTime < Test::Unit::TestCase
   def test_create
     early = Rake::EarlyTime.instance
     assert early <= Time.now

diff --git a/test/lib/extension_test.rb → test/test_rake_extension.rb b/test/lib/extension_test.rb → test/test_rake_extension.rb
@@ -5,7 +5,7 @@
 require 'stringio'
 
 ######################################################################
-class TestExtension < Test::Unit::TestCase
+class TestRakeExtension < Test::Unit::TestCase
 
   module Redirect
     def error_redirect

diff --git a/test/lib/file_creation_task_test.rb → test/test_rake_file_creation_task.rb b/test/lib/file_creation_task_test.rb → test/test_rake_file_creation_task.rb
@@ -6,7 +6,7 @@
 require 'test/file_creation'
 
 ######################################################################
-class TestFileCreationTask < Test::Unit::TestCase
+class TestRakeFileCreationTask < Test::Unit::TestCase
   include Rake
   include FileCreation
 

diff --git a/test/lib/filelist_test.rb → test/test_rake_file_list.rb b/test/lib/filelist_test.rb → test/test_rake_file_list.rb
@@ -6,7 +6,7 @@
 require 'test/capture_stdout'
 require 'test/rake_test_setup'
 
-class TestFileList < Test::Unit::TestCase
+class TestRakeFileList < Test::Unit::TestCase
   FileList = Rake::FileList
   include CaptureStdout
   include TestMethods
@@ -90,19 +90,19 @@ def test_add_return
 
   def test_match
     fl = FileList.new
-    fl.include('test/lib/*_test.rb')
-    assert fl.include?("test/lib/filelist_test.rb")
+    fl.include('test/test_*.rb')
+    assert fl.include?("test/test_rake_file_list.rb")
     assert fl.size > 3
     fl.each { |fn| assert_match(/\.rb$/, fn) }
   end
 
   def test_add_matching
     fl = FileList.new
     fl << "a.java"
-    fl.include("test/lib/*.rb")
+    fl.include("test/*.rb")
     assert_equal "a.java", fl[0]
     assert fl.size > 2
-    assert fl.include?("test/lib/filelist_test.rb")
+    assert fl.include?("test/test_rake_file_list.rb")
   end
 
   def test_multiple_patterns
@@ -329,26 +329,26 @@ def test_egrep_returns_0_if_no_matches
   end
 
   def test_egrep_with_output
-    files = FileList['test/lib/*_test.rb']
+    files = FileList['test/test_*.rb']
     the_line_number = __LINE__ + 1
     out = capture_stdout do files.egrep(/PUGH/) end
     assert_match(/:#{the_line_number}:/, out)
   end
 
   def test_egrep_with_block
-    files = FileList['test/lib/*_test.rb']
+    files = FileList['test/test_*.rb']
     found = nil
     the_line_number = __LINE__ + 1
     files.egrep(/XYZZY/) do |fn, ln, line |
       found = [fn, ln, line]
     end
-    assert_equal 'test/lib/filelist_test.rb', found[0]
+    assert_equal 'test/test_rake_file_list.rb', found[0]
     assert_equal the_line_number, found[1]
     assert_match(/files\.egrep/, found[2])
   end
 
   def test_egrep_with_error
-    files = FileList['test/lib/*_test.rb']
+    files = FileList['test/test_*.rb']
     error_messages = capture_stderr do
       files.egrep(/ANYTHING/) do |fn, ln, line |
         fail "_EGREP_FAILURE_"

diff --git a/test/lib/file_task_test.rb → test/test_rake_file_task.rb b/test/lib/file_task_test.rb → test/test_rake_file_task.rb
@@ -7,7 +7,7 @@
 require 'test/rake_test_setup'
 
 ######################################################################
-class TestFileTask < Test::Unit::TestCase
+class TestRakeFileTask < Test::Unit::TestCase
   include Rake
   include FileCreation
   include TestMethods
@@ -93,7 +93,7 @@ def ztest_file_deletes_on_failure
 end
 
 ######################################################################
-class TestDirectoryTask < Test::Unit::TestCase
+class TestRakeDirectoryTask < Test::Unit::TestCase
   include Rake
 
   def setup

diff --git a/test/lib/fileutils_test.rb → test/test_rake_file_utils.rb b/test/lib/fileutils_test.rb → test/test_rake_file_utils.rb
@@ -7,7 +7,7 @@
 require 'stringio'
 require 'test/rake_test_setup'
 
-class TestFileUtils < Test::Unit::TestCase
+class TestRakeFileUtils < Test::Unit::TestCase
   include FileCreation
   include TestMethods
   include Rake::DSL

diff --git a/test/lib/ftp_test.rb → test/test_rake_ftp_file.rb b/test/lib/ftp_test.rb → test/test_rake_ftp_file.rb
@@ -15,7 +15,7 @@ def self.now
 end
 
 
-class TestFtpFile < Test::Unit::TestCase
+class TestRakeFtpFile < Test::Unit::TestCase
 
   def setup
     Rake::FtpFile.class_eval { @date_class = FakeDate; @time_class = FakeDate }

diff --git a/test/lib/invocation_chain_test.rb → test/test_rake_invocation_chain.rb b/test/lib/invocation_chain_test.rb → test/test_rake_invocation_chain.rb
@@ -5,7 +5,7 @@
 require 'test/rake_test_setup'
 
 ######################################################################
-class TestAnEmptyInvocationChain < Test::Unit::TestCase
+class TestRakeAnEmptyInvocationChain < Test::Unit::TestCase
   include TestMethods
 
   def setup
@@ -24,7 +24,7 @@ def test_to_s
 end
 
 ######################################################################
-class TestAnInvocationChainWithOneMember < Test::Unit::TestCase
+class TestRakeAnInvocationChainWithOneMember < Test::Unit::TestCase
   include TestMethods
 
   def setup
@@ -52,7 +52,7 @@ def test_to_s
 end
 
 ######################################################################
-class TestAnInvocationChainWithMultipleMember < Test::Unit::TestCase
+class TestRakeAnInvocationChainWithMultipleMember < Test::Unit::TestCase
   include TestMethods
 
   def setup

diff --git a/test/lib/makefile_loader_test.rb → test/test_rake_makefile_loader.rb b/test/lib/makefile_loader_test.rb → test/test_rake_makefile_loader.rb
@@ -4,7 +4,7 @@
 require 'rake'
 require 'rake/loaders/makefile'
 
-class TestMakefileLoader < Test::Unit::TestCase
+class TestRakeMakefileLoader < Test::Unit::TestCase
   include Rake
 
   def test_parse

diff --git a/test/lib/multitask_test.rb → test/test_rake_multi_task.rb b/test/lib/multitask_test.rb → test/test_rake_multi_task.rb
@@ -5,7 +5,7 @@
 require 'rake'
 
 ######################################################################
-class TestMultiTask < Test::Unit::TestCase
+class TestRakeMultiTask < Test::Unit::TestCase
   include Rake
 
   def setup

diff --git a/test/lib/namespace_test.rb → test/test_rake_name_space.rb b/test/lib/namespace_test.rb → test/test_rake_name_space.rb
@@ -11,7 +11,7 @@
 require 'rake'
 require 'test/rake_test_setup'
 
-class TestNameSpace < Test::Unit::TestCase
+class TestRakeNameSpace < Test::Unit::TestCase
   include TestMethods
 
   class TM

diff --git a/test/lib/package_task_test.rb → test/test_rake_package_task.rb b/test/lib/package_task_test.rb → test/test_rake_package_task.rb
@@ -4,7 +4,7 @@
 require 'rake/packagetask'
 require 'test/rake_test_setup'
 
-class TestPackageTask < Test::Unit::TestCase
+class TestRakePackageTask < Test::Unit::TestCase
   include TestMethods
 
   def test_initialize

diff --git a/test/lib/pathmap_test.rb → test/test_rake_path_map.rb b/test/lib/pathmap_test.rb → test/test_rake_path_map.rb
@@ -5,7 +5,7 @@
 require 'rake'
 
 # ====================================================================
-class TestPathMap < Test::Unit::TestCase
+class TestRakePathMap < Test::Unit::TestCase
   include TestMethods
 
   def test_returns_self_with_no_args
@@ -161,7 +161,7 @@ def test_complex_patterns
   end
 end
 
-class TestPathMapExplode < Test::Unit::TestCase
+class TestRakePathMapExplode < Test::Unit::TestCase
   def setup
     String.class_eval { public :pathmap_explode }
   end
@@ -188,7 +188,7 @@ def test_explode
   end
 end
 
-class TestPathMapPartial < Test::Unit::TestCase
+class TestRakePathMapPartial < Test::Unit::TestCase
   def test_pathmap_partial
     @path = "1/2/file"
     def @path.call(n)
@@ -204,7 +204,7 @@ def @path.call(n)
   end
 end
 
-class TestFileListPathMap < Test::Unit::TestCase
+class TestRakeFileListPathMap < 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/lib/pseudo_status_test.rb → test/test_rake_pseudo_status.rb b/test/lib/pseudo_status_test.rb → test/test_rake_pseudo_status.rb
@@ -6,7 +6,7 @@
 require 'test/capture_stdout'
 require 'test/rake_test_setup'
 
-class PseudoStatusTest < Test::Unit::TestCase
+class TestRakePseudoStatus < Test::Unit::TestCase
   def test_with_zero_exit_status
     s = Rake::PseudoStatus.new
     assert_equal 0, s.exitstatus

diff --git a/test/lib/rdoc_task_test.rb → test/test_rake_rdoc_task.rb b/test/lib/rdoc_task_test.rb → test/test_rake_rdoc_task.rb
@@ -11,7 +11,7 @@
 end
 require 'test/rake_test_setup'
 
-class TestRDocTask < Test::Unit::TestCase
+class TestRakeRDocTask < Test::Unit::TestCase
   include Rake
   include TestMethods
 

diff --git a/test/lib/require_test.rb → test/test_rake_require.rb b/test/lib/require_test.rb → test/test_rake_require.rb
@@ -5,7 +5,7 @@
 require 'test/rake_test_setup'
 
 # ====================================================================
-class TestRequire < Test::Unit::TestCase
+class TestRakeRequire < Test::Unit::TestCase
   include TestMethods
 
   def test_can_load_rake_library

diff --git a/test/lib/rules_test.rb → test/test_rake_rules.rb b/test/lib/rules_test.rb → test/test_rake_rules.rb
@@ -7,7 +7,7 @@
 require 'test/rake_test_setup'
 
 ######################################################################
-class TestRules < Test::Unit::TestCase
+class TestRakeRules < Test::Unit::TestCase
   include Rake
   include FileCreation
   include TestMethods