Restructured tests into subdirectories and switched to the *_test.rb …

…convention.
jimweirich · May 15, 2009 · 63d419d · 63d419d
1 parent ee6cb80
commit 63d419d
Show file tree

Hide file tree

Showing 31 changed files with 13 additions and 13 deletions.
diff --git a/Rakefile b/Rakefile
@@ -64,22 +64,22 @@ task :test => :test_units
 
 Rake::TestTask.new(:test_all) do |t|
   t.test_files = FileList[
-    'test/test*.rb',
-    'test/contrib/test*.rb',
-    'test/fun*.rb'
+    'test/lib/*_test.rb',
+    'test/contrib/*_test.rb',
+    'test/functional/*_test.rb'
   ]
   t.warning = true
   t.verbose = false
 end
 
 Rake::TestTask.new(:test_units) do |t|
-  t.test_files = FileList['test/test*.rb']
+  t.test_files = FileList['test/lib/*_test.rb']
   t.warning = true
   t.verbose = false
 end
 
 Rake::TestTask.new(:test_functional) do |t|
-  t.test_files = FileList['test/fun*.rb']
+  t.test_files = FileList['test/functional/*_test.rb']
   t.warning = true
   t.verbose = false
 end

diff --git a/test/functional.rb → test/functional/functional_test.rb b/test/functional.rb → test/functional/functional_test.rb
@@ -11,5 +11,5 @@
 
 if defined?(Session)
   puts "RUNNING WITH SESSIONS"
-  require 'test/session_functional'
+  require 'test/functional/session_based_tests.rb'
 end
diff --git a/test/session_functional.rb → test/functional/session_based_tests.rb b/test/session_functional.rb → test/functional/session_based_tests.rb
diff --git a/test/test_application.rb → test/lib/application_test.rb b/test/test_application.rb → test/lib/application_test.rb
diff --git a/test/test_clean.rb → test/lib/clean_test.rb b/test/test_clean.rb → test/lib/clean_test.rb
diff --git a/test/test_definitions.rb → test/lib/definitions_test.rb b/test/test_definitions.rb → test/lib/definitions_test.rb
diff --git a/test/test_earlytime.rb → test/lib/earlytime_test.rb b/test/test_earlytime.rb → test/lib/earlytime_test.rb
diff --git a/test/test_extension.rb → test/lib/extension_test.rb b/test/test_extension.rb → test/lib/extension_test.rb
diff --git a/test/test_file_creation_task.rb → test/lib/file_creation_task_test.rb b/test/test_file_creation_task.rb → test/lib/file_creation_task_test.rb
diff --git a/test/test_file_task.rb → test/lib/file_task_test.rb b/test/test_file_task.rb → test/lib/file_task_test.rb
diff --git a/test/test_filelist.rb → test/lib/filelist_test.rb b/test/test_filelist.rb → test/lib/filelist_test.rb
@@ -90,19 +90,19 @@ def test_add_return
 
   def test_match
     fl = FileList.new
-    fl.include('test/test*.rb')
-    assert fl.include?("test/test_filelist.rb")
+    fl.include('test/lib/*_test.rb')
+    assert fl.include?("test/lib/filelist_test.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/*.rb")
+    fl.include("test/lib/*.rb")
     assert_equal "a.java", fl[0]
     assert fl.size > 2
-    assert fl.include?("test/test_filelist.rb")
+    assert fl.include?("test/lib/filelist_test.rb")
   end
 
   def test_multiple_patterns
@@ -324,18 +324,18 @@ def test_gsub!
   end
 
   def test_egrep_with_output
-    files = FileList['test/test*.rb']
+    files = FileList['test/lib/*_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/test*.rb']
+    files = FileList['test/lib/*_test.rb']
     found = false
     the_line_number = __LINE__ + 1
     files.egrep(/XYZZY/) do |fn, ln, line |
-      assert_equal 'test/test_filelist.rb', fn
+      assert_equal 'test/lib/filelist_test.rb', fn
       assert_equal the_line_number, ln
       assert_match(/files\.egrep/, line)
       found = true

diff --git a/test/test_fileutils.rb → test/lib/fileutils_test.rb b/test/test_fileutils.rb → test/lib/fileutils_test.rb
diff --git a/test/test_ftp.rb → test/lib/ftp_test.rb b/test/test_ftp.rb → test/lib/ftp_test.rb
diff --git a/test/test_invocation_chain.rb → test/lib/invocation_chain_test.rb b/test/test_invocation_chain.rb → test/lib/invocation_chain_test.rb
diff --git a/test/test_makefile_loader.rb → test/lib/makefile_loader_test.rb b/test/test_makefile_loader.rb → test/lib/makefile_loader_test.rb
diff --git a/test/test_multitask.rb → test/lib/multitask_test.rb b/test/test_multitask.rb → test/lib/multitask_test.rb
diff --git a/test/test_namespace.rb → test/lib/namespace_test.rb b/test/test_namespace.rb → test/lib/namespace_test.rb
diff --git a/test/test_package_task.rb → test/lib/package_task_test.rb b/test/test_package_task.rb → test/lib/package_task_test.rb
diff --git a/test/test_pathmap.rb → test/lib/pathmap_test.rb b/test/test_pathmap.rb → test/lib/pathmap_test.rb
diff --git a/test/test_pseudo_status.rb → test/lib/pseudo_status_test.rb b/test/test_pseudo_status.rb → test/lib/pseudo_status_test.rb
diff --git a/test/test_rake.rb → test/lib/rake_test.rb b/test/test_rake.rb → test/lib/rake_test.rb
diff --git a/test/test_rdoc_task.rb → test/lib/rdoc_task_test.rb b/test/test_rdoc_task.rb → test/lib/rdoc_task_test.rb
diff --git a/test/test_require.rb → test/lib/require_test.rb b/test/test_require.rb → test/lib/require_test.rb
diff --git a/test/test_rules.rb → test/lib/rules_test.rb b/test/test_rules.rb → test/lib/rules_test.rb
diff --git a/test/test_task_arguments.rb → test/lib/task_arguments_test.rb b/test/test_task_arguments.rb → test/lib/task_arguments_test.rb
diff --git a/test/test_task_manager.rb → test/lib/task_manager_test.rb b/test/test_task_manager.rb → test/lib/task_manager_test.rb
diff --git a/test/test_tasklib.rb → test/lib/tasklib_test.rb b/test/test_tasklib.rb → test/lib/tasklib_test.rb
diff --git a/test/test_tasks.rb → test/lib/tasks_test.rb b/test/test_tasks.rb → test/lib/tasks_test.rb
diff --git a/test/test_test_task.rb → test/lib/test_task_test.rb b/test/test_test_task.rb → test/lib/test_task_test.rb
diff --git a/test/test_top_level_functions.rb → test/lib/top_level_functions_test.rb b/test/test_top_level_functions.rb → test/lib/top_level_functions_test.rb
diff --git a/test/test_win32.rb → test/lib/win32_test.rb b/test/test_win32.rb → test/lib/win32_test.rb