ZenTest 3.2.0 → 3.3.0

data/test/test_rails_autotest.rb

@@ -1,3 +1,4 @@
+require 'test/unit' if $0 == __FILE__
 require 'test_autotest'
 require 'rails_autotest'
 
@@ -6,190 +7,166 @@ class TestRailsAutotest < TestAutotest
   def setup
     super
 
-    @at = RailsAutotest.new
+    @test_class = 'RouteTest'
+    @test = 'test/unit/route_test.rb'
+    @impl = 'app/models/route.rb'
 
-    @rails_tests_dir = 'test/data/rails'
+    @rails_unit_tests = [@test]
 
-    @rails_unit_tests = ['test/unit/route_test.rb']
+    @rails_controller_tests = %w(test/controllers/admin/themes_controller_test.rb
+                                 test/controllers/articles_controller_test.rb
+                                 test/controllers/dummy_controller_test.rb
+                                 test/controllers/route_controller_test.rb)
 
-    @rails_controller_tests = [
-                               'test/controllers/admin/themes_controller_test.rb',
-                               'test/controllers/articles_controller_test.rb',
-                               'test/controllers/dummy_controller_test.rb',
-                               'test/controllers/route_controller_test.rb',
-                              ]
+    @rails_view_tests = %w(test/views/admin/themes_view_test.rb
+                           test/views/articles_view_test.rb
+                           test/views/layouts_view_test.rb
+                           test/views/route_view_test.rb)
 
-    @rails_view_tests = [
-                         'test/views/admin/themes_view_test.rb',
-                         'test/views/articles_view_test.rb',
-                         'test/views/layouts_view_test.rb',
-                         'test/views/route_view_test.rb',
-                        ]
-
-    @rails_functional_tests = [
-                               'test/functional/admin/themes_controller_test.rb',
-                               'test/functional/articles_controller_test.rb',
-                               'test/functional/dummy_controller_test.rb',
-                               'test/functional/route_controller_test.rb',
-                              ]
+    @rails_functional_tests = %w(test/functional/admin/themes_controller_test.rb
+                                 test/functional/articles_controller_test.rb
+                                 test/functional/dummy_controller_test.rb
+                                 test/functional/route_controller_test.rb)
 
     # These files aren't put in @file_map, so add them to it
-    @extra_files = [
-                    'test/controllers/admin/themes_controller_test.rb',
-                    'test/controllers/articles_controller_test.rb',
-                    'test/controllers/dummy_controller_test.rb',
-                    'test/views/admin/themes_view_test.rb',
-                    'test/views/articles_view_test.rb',
-                    'test/views/layouts_view_test.rb',
-                    'test/functional/articles_controller_test.rb',
-                    'test/functional/dummy_controller_test.rb',
-                   ]
+    @extra_files = %w(test/controllers/admin/themes_controller_test.rb
+                      test/controllers/articles_controller_test.rb
+                      test/controllers/dummy_controller_test.rb
+                      test/functional/articles_controller_test.rb
+                      test/functional/dummy_controller_test.rb
+                      test/views/admin/themes_view_test.rb
+                      test/views/articles_view_test.rb
+                      test/views/layouts_view_test.rb)
+
+    @a.files.clear
+
+    (@rails_unit_tests +
+     @rails_controller_tests +
+     @rails_view_tests +
+     @rails_functional_tests +
+     @extra_files).flatten.each_with_index do |path, t|
+      @a.files[path] = Time.at(t+1)
+    end
+    @a.last_mtime = @a.files.values.sort.last
   end
 
-  # Remove test_failed_test_files tests from RailsAutoTest because these
-  # tests are regular-mode dependent.
-  superclass.instance_methods.each do |meth|
-    undef_method meth if meth =~ /^test_failed_test_files/
+  # Overridden from superclass... the scenario just doesn't happen the same way.
+  def test_consolidate_failures_multiple_matches
+    @test2 = 'test/unit/route_again_test.rb'
+    @a.files[@test2] = Time.at(42)
+    result = @a.consolidate_failures([['test_unmatched', @test_class]])
+    expected = {"test/unit/route_test.rb"=>["test_unmatched"]}
+    assert_equal expected, result
+    assert_equal '', @a.output.string
   end
 
-  def test_map_file_names
-    # util_add_map(sourcefile, unit_tests, controller_tests,
-    #                          view_tests, functional_tsets)
+  def test_tests_for_file
+    empty = []
+    assert_equal empty, @a.tests_for_file('blah.rb')
+    assert_equal empty, @a.tests_for_file('test_blah.rb')
 
     # controllers
-    util_add_map("app/controllers/admin/themes_controller.rb",
-                 [], ["test/controllers/admin/themes_controller_test.rb"],
-                 [], ["test/functional/admin/themes_controller_test.rb"])
+    util_tests_for_file('app/controllers/admin/themes_controller.rb',
+                        'test/controllers/admin/themes_controller_test.rb',
+                        'test/functional/admin/themes_controller_test.rb')
 
-    util_add_map("app/controllers/application.rb",
-                 [], ["test/controllers/dummy_controller_test.rb"],
-                 [], ["test/functional/dummy_controller_test.rb"])
+    util_tests_for_file('app/controllers/application.rb',
+                        'test/controllers/dummy_controller_test.rb',
+                        'test/functional/dummy_controller_test.rb')
 
-    util_add_map("app/controllers/route_controller.rb",
-                 [], ["test/controllers/route_controller_test.rb"],
-                 [], ["test/functional/route_controller_test.rb"])
+    util_tests_for_file('app/controllers/route_controller.rb',
+                        'test/controllers/route_controller_test.rb',
+                        'test/functional/route_controller_test.rb')
 
-    util_add_map("app/controllers/notest_controller.rb")
+    util_tests_for_file('app/controllers/notest_controller.rb')
 
     # helpers
-    util_add_map("app/helpers/application_helper.rb",
-                 [], [], @rails_view_tests, @rails_functional_tests)
+    util_tests_for_file('app/helpers/application_helper.rb',
+                        @rails_view_tests + @rails_functional_tests)
 
-    util_add_map("app/helpers/route_helper.rb",
-                 [], [], ["test/views/route_view_test.rb"],
-                 ["test/functional/route_controller_test.rb"])
+    util_tests_for_file('app/helpers/route_helper.rb',
+                        'test/views/route_view_test.rb',
+                        'test/functional/route_controller_test.rb')
 
     # model
-    util_add_map("app/models/route.rb",
-                 ["test/unit/route_test.rb"], [], [], [])
+    util_tests_for_file('app/models/route.rb',
+                        @test)
 
-    util_add_map("app/models/notest.rb")
+    util_tests_for_file('app/models/notest.rb')
 
     # views
-    util_add_map("app/views/layouts/default.rhtml", [], [],
-                 ["test/views/layouts_view_test.rb"], [])
+    util_tests_for_file('app/views/layouts/default.rhtml',
+                        'test/views/layouts_view_test.rb')
 
-    util_add_map("app/views/route/index.rhtml",
-                 [], [], ["test/views/route_view_test.rb"],
-                 ["test/functional/route_controller_test.rb"])
+    util_tests_for_file('app/views/route/index.rhtml',
+                        'test/views/route_view_test.rb',
+                        'test/functional/route_controller_test.rb')
 
-    util_add_map("app/views/route/xml.rxml",
-                 [], [], ["test/views/route_view_test.rb"],
-                 ["test/functional/route_controller_test.rb"])
+    util_tests_for_file('app/views/route/xml.rxml',
+                        'test/views/route_view_test.rb',
+                        'test/functional/route_controller_test.rb')
 
-    util_add_map("app/views/shared/notest.rhtml")
+    util_tests_for_file('app/views/shared/notest.rhtml')
 
-    util_add_map("app/views/articles/flag.rhtml",
-                 [], [], ["test/views/articles_view_test.rb"],
-                 ["test/functional/articles_controller_test.rb"])
+    util_tests_for_file('app/views/articles/flag.rhtml',
+                        'test/views/articles_view_test.rb',
+                        'test/functional/articles_controller_test.rb')
 
     # tests
-    util_add_map("test/fixtures/routes.yml",
-                 ["test/unit/route_test.rb"],
-                 ["test/controllers/route_controller_test.rb"],
-                 ["test/views/route_view_test.rb"],
-                 ["test/functional/route_controller_test.rb"])
+    util_tests_for_file('test/fixtures/routes.yml',
+                        @test,
+                        'test/controllers/route_controller_test.rb',
+                        'test/views/route_view_test.rb',
+                        'test/functional/route_controller_test.rb')
 
-    util_add_map("test/test_helper.rb",
-                 @rails_unit_tests, @rails_controller_tests,
-                 @rails_view_tests, @rails_functional_tests)
+    util_tests_for_file('test/test_helper.rb',
+                        @rails_unit_tests, @rails_controller_tests,
+                        @rails_view_tests, @rails_functional_tests)
 
-    util_add_map("test/unit/route_test.rb",
-                 ["test/unit/route_test.rb"], [], [], [])
+    util_tests_for_file(@test, @test)
 
-    util_add_map("test/controllers/route_controller_test.rb",
-                 [], ["test/controllers/route_controller_test.rb"], [], [])
+    util_tests_for_file('test/controllers/route_controller_test.rb',
+                        'test/controllers/route_controller_test.rb')
 
-    util_add_map("test/views/route_view_test.rb",
-                 [], [], ["test/views/route_view_test.rb"], [])
+    util_tests_for_file('test/views/route_view_test.rb',
+                        'test/views/route_view_test.rb')
 
-    util_add_map("test/functional/route_controller_test.rb",
-                 [], [], [], ["test/functional/route_controller_test.rb"])
+    util_tests_for_file('test/functional/route_controller_test.rb',
+                        'test/functional/route_controller_test.rb')
 
-    util_add_map("test/functional/admin/themes_controller_test.rb",
-                 [], [], [], ["test/functional/admin/themes_controller_test.rb"])
+    util_tests_for_file('test/functional/admin/themes_controller_test.rb',
+                        'test/functional/admin/themes_controller_test.rb')
 
     # global conf thingies
-    util_add_map("config/boot.rb",
-                 @rails_unit_tests, @rails_controller_tests,
-                 @rails_view_tests, @rails_functional_tests)
+    util_tests_for_file('config/boot.rb',
+                        @rails_unit_tests, @rails_controller_tests,
+                        @rails_view_tests, @rails_functional_tests)
 
-    util_add_map("config/database.yml",
-                 @rails_unit_tests, @rails_controller_tests,
-                 @rails_view_tests, @rails_functional_tests)
+    util_tests_for_file('config/database.yml',
+                        @rails_unit_tests, @rails_controller_tests,
+                        @rails_view_tests, @rails_functional_tests)
 
-    util_add_map("config/environment.rb",
-                 @rails_unit_tests, @rails_controller_tests,
-                 @rails_view_tests, @rails_functional_tests)
+    util_tests_for_file('config/environment.rb',
+                        @rails_unit_tests, @rails_controller_tests,
+                        @rails_view_tests, @rails_functional_tests)
 
-    util_add_map("config/environments/test.rb",
-                 @rails_unit_tests, @rails_controller_tests,
-                 @rails_view_tests, @rails_functional_tests)
+    util_tests_for_file('config/environments/test.rb',
+                        @rails_unit_tests, @rails_controller_tests,
+                        @rails_view_tests, @rails_functional_tests)
 
-    util_add_map("config/routes.rb",
-                 [], @rails_controller_tests, @rails_view_tests,
-                 @rails_functional_tests)
+    util_tests_for_file('config/routes.rb',
+                        @rails_controller_tests,
+                        @rails_view_tests, @rails_functional_tests)
 
     # ignored crap
-    util_add_map("vendor/plugins/cartographer/lib/keys.rb")
-
-    util_add_map("Rakefile")
+    util_tests_for_file('vendor/plugins/cartographer/lib/keys.rb')
 
-    (@file_map.keys + @extra_files).each { |file| @at.files[file] = Time.at 0 }
-
-    util_test_map_file_names @rails_tests_dir
+    util_tests_for_file('Rakefile')
   end
 
-  def test_updated_files_rails
-    expected = [
-      "app/controllers/admin/theme_controller.rb",
-      "app/controllers/route_controller.rb",
-      "app/models/flickr_photo.rb",
-      "app/models/route.rb",
-      "app/views/route/index.rhtml",
-      "config/environment.rb",
-      "config/routes.rb",
-      "test/controllers/route_controller_test.rb",
-      "test/fixtures/routes.yml",
-      "test/functional/admin/themes_controller_test.rb",
-      "test/functional/dummy_controller_test.rb",
-      "test/functional/route_controller_test.rb",
-      "test/unit/flickr_photo_test.rb",
-      "test/unit/photo_test.rb",
-      "test/unit/route_test.rb",
-      "test/views/route_view_test.rb",
-    ]
-
-    Dir.chdir @rails_tests_dir do
-      assert_equal expected, @at.updated_files.sort
-    end
+  def util_tests_for_file(file, *expected)
+    assert_equal(expected.flatten.sort.uniq,
+                 @a.tests_for_file(file).sort.uniq, "tests for #{file}")
   end
-
-  def util_add_map(file, *tests)
-    tests = [[], [], [], []] if tests.empty?
-
-    super(file, *tests)
-  end
-
 end
 

data/test/test_ruby_fork.rb

@@ -0,0 +1,172 @@
+$TESTING = true
+
+require 'test/unit'
+require 'test/zentest_assertions'
+require 'ruby_fork'
+
+class TestRubyFork < Test::Unit::TestCase
+
+  def test_parse_client_args
+    expected = util_make_settings
+    settings = RubyFork.parse_client_args []
+    assert_equal expected, settings
+  end
+
+  def test_parse_client_args_help
+    util_capture do
+      assert_raises SystemExit do
+        RubyFork.parse_client_args ['-h']
+      end
+
+      assert_raises SystemExit do
+        RubyFork.parse_client_args ['--help']
+      end
+    end
+  end
+
+  def test_parse_client_args_port
+    expected = util_make_settings [], [], [], 5
+
+    settings = RubyFork.parse_client_args ['-p', '5']
+    assert_equal expected, settings
+
+    settings = RubyFork.parse_client_args ['--port', '5']
+    assert_equal expected, settings
+  end
+
+  def test_parse_server_args
+    settings = RubyFork.parse_server_args []
+    expected = util_make_settings nil, nil, nil, nil, false
+    assert_equal expected, settings
+  end
+
+  def test_parse_server_args_daemonize
+    expected = util_make_settings [], [], [], RubyFork::PORT, true
+
+    settings = RubyFork.parse_server_args ['-d']
+    assert_equal expected, settings
+
+    settings = RubyFork.parse_server_args ['--daemonize']
+    assert_equal expected, settings
+  end
+
+  def test_parse_server_args_execute
+    expected = util_make_settings [], ['foo']
+
+    settings = RubyFork.parse_server_args ['-e', 'foo']
+    assert_equal expected, settings
+
+    expected = util_make_settings [], ['foo', 'bar']
+
+    settings = RubyFork.parse_server_args ['-e', 'foo', '-e', 'bar']
+    assert_equal expected, settings
+  end
+
+  def test_parse_server_args_include
+    expected = util_make_settings nil, nil, ['lib'], nil, false
+
+    settings = RubyFork.parse_server_args ['-I', 'lib']
+    assert_equal expected, settings
+
+    expected = util_make_settings nil, nil, ['lib', 'test'], nil, false
+
+    settings = RubyFork.parse_server_args ['-I', 'lib', '-I', 'test']
+    assert_equal expected, settings
+
+    expected = util_make_settings nil, nil, ['lib:test'], nil, false
+
+    settings = RubyFork.parse_server_args ['-I', 'lib:test']
+    assert_equal expected, settings
+  end
+
+  def test_parse_server_args_help
+    util_capture do
+      assert_raises SystemExit do
+        RubyFork.parse_server_args ['-h']
+      end
+
+      assert_raises SystemExit do
+        RubyFork.parse_server_args ['--help']
+      end
+    end
+  end
+
+  def test_parse_server_args_port
+    expected = util_make_settings nil, nil, nil, 5, false
+
+    settings = RubyFork.parse_server_args ['-p', '5']
+    assert_equal expected, settings
+
+    settings = RubyFork.parse_server_args ['--port', '5']
+    assert_equal expected, settings
+  end
+
+  def test_parse_server_args_execute
+    expected = util_make_settings ['zentest'], nil, nil, nil, false
+
+    settings = RubyFork.parse_server_args ['-r', 'zentest']
+    assert_equal expected, settings
+
+    expected = util_make_settings ['zentest', 'unit_diff'], nil, nil, nil, false
+
+    settings = RubyFork.parse_server_args ['-r', 'zentest', '-r', 'unit_diff']
+    assert_equal expected, settings
+  end
+
+  def test_setup_environment_extra_paths
+    load_path = $LOAD_PATH.dup
+
+    RubyFork.setup_environment :extra_paths => ['no_such_dir'],
+                               :requires => [], :code => []
+
+    assert_equal 'no_such_dir', $LOAD_PATH.first
+  ensure
+    $LOAD_PATH.replace load_path
+  end
+
+  def test_setup_environment_extra_paths_with_colon
+    load_path = $LOAD_PATH.dup
+
+    RubyFork.setup_environment :extra_paths => ['no_such_dir:other_bad_dir'],
+                               :requires => [], :code => []
+
+    assert_equal 'other_bad_dir', $LOAD_PATH[0]
+    assert_equal 'no_such_dir',   $LOAD_PATH[1]
+  ensure
+    $LOAD_PATH.replace load_path
+  end
+
+  def test_setup_environment_requires
+    assert_raises LoadError do
+      RubyFork.setup_environment :extra_paths => [],
+                                 :requires => ['no_such_file'], :code => []
+    end
+  end
+
+  def test_setup_environment_code
+    RubyFork.setup_environment :extra_paths => [],
+                               :requires => [], :code => ['$trf_env_code = 0']
+
+    assert_equal 0, $trf_env_code
+  end
+
+  def util_make_settings(requires = nil, code = nil, extra_paths = nil,
+                         port = nil, daemonize = nil)
+    settings = {
+      :requires => [],
+      :code => [],
+      :extra_paths => [],
+      :port => RubyFork::PORT,
+    }
+
+    settings[:code] = code unless code.nil?
+    settings[:daemonize] = daemonize unless daemonize.nil?
+    settings[:extra_paths] = extra_paths unless extra_paths.nil?
+    settings[:port] = port unless port.nil?
+    settings[:requires] = requires unless requires.nil?
+
+    return settings
+  end
+
+end
+