ZenTest 3.2.0 → 3.3.0

data/lib/test/rails/rake_tasks.rb

@@ -1,25 +1,25 @@
 require 'code_statistics'
 
-namespace :test do
-  desc 'Run the view tests in test/views'
-  Rake::TestTask.new :views => [ 'db:test:prepare' ] do |t|
+def define_test_task(test_type)
+  desc "Run the #{test_type} tests in test/#{test_type}s"
+  Rake::TestTask.new "#{test_type}s" => [ 'db:test:prepare' ] do |t|
     t.libs << 'test'
-    t.pattern = 'test/views/**/*_test.rb'
+    t.pattern = "test/#{test_type}s/**/*_test.rb"
     t.verbose = true
   end
+end
 
-  desc 'Run the controller tests in test/controllers'
-  Rake::TestTask.new :controllers => [ 'db:test:prepare' ] do |t|
-    t.libs << 'test'
-    t.pattern = 'test/controllers/**/*_test.rb'
-    t.verbose = true
-  end
+namespace :test do
+  define_test_task 'helper'
+  define_test_task 'view'
+  define_test_task 'controller'
 end
 
 desc 'Run all tests'
 task :test => %w[
   test:units
   test:controllers
+  test:helpers
   test:views
   test:functionals
   test:integration
@@ -32,6 +32,7 @@ dirs = [
   %w[Components         components],
   %w[Controllers        app/controllers],
   %w[Controller\ tests  test/controllers],
+  %w[Helper\ tests      test/helpers],
   %w[View\ tests        test/views],
   %w[Functional\ tests  test/functional],
   %w[Integration\ tests test/integration],
@@ -44,6 +45,6 @@ dirs = dirs.select { |name, dir| File.directory? dir }
 
 STATS_DIRECTORIES.replace dirs
 
-CodeStatistics::TEST_TYPES << 'View tests'
-CodeStatistics::TEST_TYPES << 'Controller tests'
+new_test_types = ['Controller tests', 'Helper tests', 'View tests']
+CodeStatistics::TEST_TYPES.push(*new_test_types)
 

data/lib/test/rails/view_test_case.rb

@@ -71,8 +71,8 @@
 #       @request.request_uri = '/foo'
 #       assigns[:action_title] = 'Hello & Goodbye'
 #   
-#       # Render an empty string with the 'default' layout.
-#       render :text => '', :layout => 'default'
+#       # Render an empty string with the 'application' layout.
+#       render :text => '', :layout => 'application'
 #   
 #       # Assert content just like a regular view test.
 #       assert_links_to '/', 'Home'

data/lib/test/zentest_assertions.rb

@@ -17,6 +17,14 @@ module Test::Unit::Assertions
 
   alias deny_equal assert_not_equal
 
+  ##
+  # Asserts that +obj+ responds to #empty? and #empty? returns true.
+
+  def assert_empty(obj)
+    assert_respond_to obj, :empty?
+    assert_equal true, obj.empty?
+  end
+
   ##
   # Asserts that +obj+ responds to #empty? and #empty? returns false.
 
@@ -42,5 +50,36 @@ module Test::Unit::Assertions
     assert_equal false, obj.include?(item), message
   end
 
+  ##
+  # Captures $stdout and $stderr to StringIO objects and returns them.
+  # Restores $stdout and $stderr when done.
+  #
+  # Usage:
+  #   def test_puts
+  #     out, err = capture do
+  #       puts 'hi'
+  #       STDERR.puts 'bye!'
+  #     end
+  #     assert_equal "hi\n", out.string
+  #     assert_equal "bye!\n", err.string
+  #   end
+
+  def util_capture
+    require 'stringio'
+    orig_stdout = $stdout.dup
+    orig_stderr = $stderr.dup
+    captured_stdout = StringIO.new
+    captured_stderr = StringIO.new
+    $stdout = captured_stdout
+    $stderr = captured_stderr
+    yield
+    captured_stdout.rewind
+    captured_stderr.rewind
+    return captured_stdout, captured_stderr
+  ensure
+    $stdout = orig_stdout
+    $stderr = orig_stderr
+  end
+
 end
 

data/lib/unit_diff.rb

@@ -28,7 +28,7 @@ def temp_file(data)
   data = data.map { |l| '%3d) %s' % [count+=1, l] } if $l
   data = data.join('')
   # unescape newlines, strip <> from entire string
-  data = data.gsub(/\\n/, "\n").gsub(/\A</m, '').gsub(/>\Z/m, '').gsub(/0x[a-f0-9]+/m, '0xXXXXXX')
+  data = data.gsub(/\\n/, "\n").gsub(/0x[a-f0-9]+/m, '0xXXXXXX') + "\n"
   temp.print data
   temp.puts unless data =~ /\n\Z/m
   temp.flush
@@ -80,6 +80,7 @@ class UnitDiff
   # Handy wrapper for UnitDiff#unit_diff.
 
   def self.unit_diff(input)
+    trap 'INT' do exit 1 end
     ud = UnitDiff.new
     ud.unit_diff(input)
   end
@@ -193,8 +194,10 @@ class UnitDiff
       end
     end
 
-    footer.shift if footer.first.strip.empty?
-    output.push footer.compact.map {|line| line.strip}.join("\n")
+    if footer then
+      footer.shift if footer.first.strip.empty?
+      output.push footer.compact.map {|line| line.strip}.join("\n")
+    end
 
     return output.flatten.join("\n")
   end

data/lib/zentest.rb

@@ -71,7 +71,7 @@ end
 
 class ZenTest
 
-  VERSION = '3.2.0'
+  VERSION = '3.3.0'
 
   if $TESTING then
     attr_reader :missing_methods

data/test/test_autotest.rb

@@ -1,269 +1,221 @@
+#!/usr/local/bin/ruby -w
+
 $TESTING = true
 
+require 'test/unit/testcase'
+require 'test/unit' if $0 == __FILE__
 require 'stringio'
-require 'test/unit'
-
 require 'autotest'
 
-Dir.chdir File.join(File.dirname(__FILE__), "..")
-
-class Autotest
-
-  attr_accessor :system_responses
-  attr_reader :files
-
-  def system(cmd)
-    @system_responses ||= []
-    raise 'Out of system responses' if @system_responses.empty?
-    return @system_responses.shift
-  end
-
-  attr_accessor :backtick_responses
-
-  def `(cmd)                            # ` appeases emacs
-    @backtick_responses ||= []
-    raise 'Out of backtick responses' if @backtick_responses.empty?
-    return @backtick_responses.shift
-  end
-
-end
+# NOT TESTED:
+#   class_run
+#   add_sigint_handler
+#   all_good
+#   get_to_green
+#   reset
+#   ruby
+#   run
+#   run_tests
 
 class TestAutotest < Test::Unit::TestCase
-
   def setup
-    @normal_tests_dir = 'test/data/normal'
-
-    @blah_file           = 'lib/blah.rb'
-    @photo_file          = 'lib/photo.rb'
-    @photo_test_file     = 'test/test_photo.rb'
-    @route_test_file     = 'test/test_route.rb'
-    @user_test_file      = 'test/test_user.rb'
-    @camelcase_test_file = 'test/test_camelcase.rb'
+    @test_class = 'TestBlah'
+    @test = 'test/test_blah.rb'
+    @impl = 'lib/blah.rb'
 
-    @file_map = {}
+    @a = Object.const_get(self.class.name[4..-1]).new
+    @a.output = StringIO.new
+    @a.files.clear
+    @a.files[@impl] = Time.at(1)
+    @a.files[@test] = Time.at(2)
+    @a.last_mtime = Time.at(2)
+  end
 
-    @all_files = [ @blah_file, @photo_file, @photo_test_file, @route_test_file, @user_test_file, @camelcase_test_file ]
+  def test_hooks
+    @a.instance_variable_set :@reset1, false
+    @a.instance_variable_set :@reset2, false
+    @a.instance_variable_set :@reset3, false
 
-    Dir.chdir @normal_tests_dir do
-      util_touch @photo_file, (Time.now - 60)
-      util_touch @photo_test_file, (Time.now - 60)
-      util_touch @camelcase_test_file, (Time.now - 60)
+    Autotest.add_hook(:reset) do |at|
+      at.instance_variable_set :@reset1, true
     end
 
-    @at = Autotest.new
-  end
-
-  def test_consolidate_failures
-    failed = [
-      %w[test_a TestOne],
-      %w[test_b TestOne],
-      %w[test_c TestOne],
-      %w[test_d TestTwo],
-    ]
-
-    expected = [
-      ["'/^(test_a|test_b|test_c)$/'", /one/],
-      ["'/^(test_d)$/'", /two/],
-    ]
-
-    assert_equal expected,
-                 @at.consolidate_failures(failed).sort_by { |f,k| k.source }
-  end
+    Autotest.add_hook(:reset) do |at|
+      at.instance_variable_set :@reset2, true
+    end
 
-  # 0 files update, 0 run
-  def test_failed_test_files_no_updates
-    tests = [@user_test_file, @photo_test_file]
-    updated_files = []
+    Autotest.add_hook(:reset) do |at|
+      at.instance_variable_set :@reset3, true
+    end
 
-    failed_files = @at.failed_test_files(/photo/, tests, updated_files)
+    @a.reset
 
-    assert_equal [], failed_files
+    assert @a.instance_variable_get(:@reset1), "Hook1 should work on reset"
+    assert @a.instance_variable_get(:@reset2), "Hook2 should work on reset"
+    assert @a.instance_variable_get(:@reset3), "Hook3 should work on reset"
   end
 
-  # 1 test changes, 1 test runs
-  def test_failed_test_files_test_updated
-    tests = [@user_test_file, @photo_test_file]
-    updated_files = [@photo_test_file]
+  # TODO BUG /usr/local/bin/ruby -I.:lib:test test/test_rails_autotest.rb -n "/^(test_hooks)$/" | unit_diff -u; /usr/local/bin/ruby -I.:lib:test test/test_autotest.rb -n "/^(test_hooks|test_hooks)$/" | unit_diff -u
 
-    failed_files = @at.failed_test_files(/photo/, tests, updated_files)
+  def test_consolidate_failures_experiment
+    @a.files.clear
+    @a.files['lib/autotest.rb'] = Time.at(1)
+    @a.files['test/test_autotest.rb'] = Time.at(2)
 
-    assert_equal [@photo_test_file], failed_files
+    input = [['test_fail1', 'TestAutotest'], ['test_fail2', 'TestAutotest'], ['test_error1', 'TestAutotest'], ['test_error2', 'TestAutotest']]
+    result = @a.consolidate_failures input
+    expected = { 'test/test_autotest.rb' => %w( test_fail1 test_fail2 test_error1 test_error2 ) }
+    assert_equal expected, result
   end
 
-  # non-matching test class changed, 0 test runs
-  def test_failed_test_files_unrelated_test_updated
-    tests = [@user_test_file, @photo_test_file]
-    updated_files = [@user_test_file]
-
-    failed_files = @at.failed_test_files(/photo/, tests, updated_files)
-
-    assert_equal [], failed_files
+  def test_consolidate_failures_green
+    result = @a.consolidate_failures([])
+    expected = {}
+    assert_equal expected, result
   end
 
-  # tests handling of camelcase test matching
-  def test_failed_test_files_camelcase_updated
-    tests = [@camelcase_test_file]
-    updated_files = [@camelcase_test_file]
-
-    failed_files = @at.failed_test_files(/camel_?case/, tests, updated_files)
-
-    assert_equal [@camelcase_test_file], failed_files
+  def test_consolidate_failures_multiple_matches
+    @a.files['test/test_blah_again.rb'] = Time.at(42)
+    result = @a.consolidate_failures([['test_unmatched', @test_class]])
+    expected = {}
+    assert_equal expected, result
+    expected = "multiple files matched class TestBlah [\"test/test_blah.rb\", \"test/test_blah_again.rb\"].\n"
+    assert_equal expected, @a.output.string
   end
 
-  # running back to back with different classes should give updates for each
-  # class.
-  def test_failed_test_files_implementation_updated_both
-    tests = [@photo_test_file, @user_test_file]
-    updated_files = [@blah_file]
-
-    failed_files = @at.failed_test_files(/photo/, tests, updated_files)
-
-    assert_equal [@photo_test_file], failed_files
-
-    failed_files = @at.failed_test_files(/user/, tests, updated_files)
-
-    assert_equal [@user_test_file], failed_files
+  def test_consolidate_failures_no_match
+    result = @a.consolidate_failures([['test_blah1', @test_class], ['test_blah2', @test_class], ['test_blah1', 'TestUnknown']])
+    expected = {@test => ['test_blah1', 'test_blah2']}
+    assert_equal expected, result
+    expected = "Unable to map class TestUnknown to a file\n"
+    assert_equal expected, @a.output.string
   end
 
-  # "general" file changes, run all failures + mapped file
-  def test_failed_test_files_implementation_updated
-    tests = [@user_test_file, @photo_test_file]
-    updated_files = [@blah_file]
-
-    failed_files = @at.failed_test_files(/photo/, tests, updated_files)
-
-    assert_equal [@photo_test_file], failed_files
+  def test_consolidate_failures_red
+    result = @a.consolidate_failures([['test_blah1', @test_class], ['test_blah2', @test_class]])
+    expected = {@test => ['test_blah1', 'test_blah2']}
+    assert_equal expected, result
   end
 
-  def test_failure_report
-    @at.files['test/test_one.rb'] = Time.at 0
-    @at.files['test/test_two.rb'] = Time.at 0
+  # TODO: lots of filename edgecases for find_files_to_test
 
-    failures = [
-      ["'/^(test_a|test_b|test_c)/'", /one/],
-      ["'/^(test_d)/'", /two/],
-    ]
+  def test_find_files_to_test
+    @a.last_mtime = Time.at(0)
+    assert @a.find_files_to_test(@a.files)
 
-    expected = "# failures remain in 2 files:
-#  test/test_one.rb:
-#    test_a
-#    test_b
-#    test_c
-#  test/test_two.rb:
-#    test_d"
-
-    assert_equal expected, @at.failure_report(failures)
+    @a.last_mtime = @a.files.values.sort.last + 1
+    assert ! @a.find_files_to_test(@a.files)
   end
 
-  def test_map_file_names
-    util_add_map('lib/untested.rb', [])
-    util_add_map('lib/autotest.rb', ['test/test_autotest.rb'])
-    util_add_map('lib/auto_test.rb', ['test/test_autotest.rb'])
-    util_add_map('test/test_autotest.rb', ['test/test_autotest.rb'])
-
-    @file_map.keys.each { |file| @at.files[file] = Time.at 0 }
+  def test_find_files_to_test_dunno
+    empty = {}
 
-    util_test_map_file_names @normal_tests_dir
+    files = { "fooby.rb" => Time.at(42) }
+    assert @a.find_files_to_test(files)  # we find fooby,
+    assert_equal empty, @a.files_to_test # but it isn't something to test
+    assert_equal "Dunno! fooby.rb\n", @a.output.string
   end
 
-  def test_retest_failed_modified
-    Dir.chdir @normal_tests_dir do
-      @all_files.each do |f| @at.updated? f; end
-
-      failed = [['test_route', /photo/]]
-      tests = [@photo_test_file]
-
-      @at.backtick_responses = ['1 tests, 1 assertions, 0 failures, 0 errors']
-
-      util_touch @photo_test_file
-
-      out, err = util_capture do
-        @at.retest_failed failed, tests
-      end
-
-      out = out.split $/
-
-      assert_equal "# Waiting for changes", out.shift
-      assert_equal "# Rerunning failures: #{@photo_test_file}", out.shift
-      assert_equal "+ #{@at.ruby} -Ilib:test #{@photo_test_file} -n test_route | unit_diff -u", out.shift
+  def test_flunk
+    flunk
+  end
 
-      assert_equal true, @at.backtick_responses.empty?
-    end
+  def test_find_files_to_test_lib
+    # ensure we add test_blah.rb when blah.rb updates
+    util_find_files_to_test(@impl, @test => [])
   end
 
-  def test_reset_times
-    Dir.chdir @normal_tests_dir do
-      @at.updated?(@photo_test_file)
+  def test_find_files_to_test_no_change
+    empty = {}
 
-      assert_equal false, @at.updated?(@photo_test_file), 'In @files'
-      time = @at.files[@photo_test_file]
+    # ensure world is virginal
+    assert_equal empty, @a.files_to_test
 
-      @at.reset_times
+    # ensure we do nothing when nothing changes...
+    files = { @impl => @a.files[@impl] } # same time
+    assert ! @a.find_files_to_test(files)
+    assert_equal empty, @a.files_to_test
+    assert_equal "", @a.output.string
 
-      assert_not_equal time, @at.files[@photo_test_file]
-      assert_equal true, @at.updated?(@photo_test_file), 'Time reset to 0'
-    end
+    files = { @impl => @a.files[@impl] } # same time
+    assert(! @a.find_files_to_test(files))
+    assert_equal empty, @a.files_to_test
+    assert_equal "", @a.output.string
   end
 
-  def test_ruby
-    this_ruby = File.join(Config::CONFIG['bindir'],
-                          Config::CONFIG['ruby_install_name'])
-    assert_equal this_ruby, @at.ruby
+  def test_find_files_to_test_test
+    # ensure we add test_blah.rb when test_blah.rb itself updates
+    util_find_files_to_test(@test, @test => [])
   end
 
-  def test_updated_eh
-    Dir.chdir @normal_tests_dir do
-      assert_equal true,  @at.updated?(@photo_test_file), 'Not in @files'
-      assert_equal false, @at.updated?(@photo_test_file), 'In @files'
-      @at.files[@photo_test_file] = Time.at 1
-      util_touch @photo_test_file
-      assert_equal true,  @at.updated?(@photo_test_file), 'Touched'
-    end
-  end
+  def test_handle_results
+    @a.files_to_test.clear
+    @a.files.clear
+    @a.files['lib/autotest.rb'] = Time.at(1)
+    @a.files['test/test_autotest.rb'] = Time.at(2)
+    empty = {}
+    assert_equal empty, @a.files_to_test, "must start empty"
 
-  def test_updated_files
-    Dir.chdir @normal_tests_dir do
-      @at.updated_files
+    s1 = "Loaded suite -e
+Started
+............
+Finished in 0.001655 seconds.
 
-      expected = Hash[*@all_files.map { |f| [f, File.stat(f).mtime] }.flatten]
+12 tests, 18 assertions, 0 failures, 0 errors
+"
 
-      assert_equal expected, @at.files
+    @a.handle_results(s1)
+    assert_equal empty, @a.files_to_test, "must stay empty"
 
-      util_touch @photo_test_file
+    s2 = "
+  1) Failure:
+test_fail1(TestAutotest) [./test/test_autotest.rb:59]:
+  2) Failure:
+test_fail2(TestAutotest) [./test/test_autotest.rb:59]:
+  3) Error:
+test_error1(TestAutotest):
+  3) Error:
+test_error2(TestAutotest):
+"
 
-      assert_not_equal expected['test/test_photo.rb'], @at.files
-    end
-  end
+    @a.handle_results(s2)
+    expected = { "test/test_autotest.rb" => %w( test_fail1 test_fail2 test_error1 test_error2 ) }
+    assert_equal expected, @a.files_to_test
 
-  def util_add_map(file, *tests)
-    @file_map[file] = tests
+    @a.handle_results(s1)
+    assert_equal empty, @a.files_to_test
   end
 
-  def util_test_map_file_names(dir)
-    Dir.chdir dir do
-      @file_map.each do |name, expected|
-        assert_equal expected, @at.map_file_names([name.dup]), "test #{name}"
-      end
-    end
-  end
+  def test_make_test_cmd
+    ruby_cmd = Config::CONFIG['ruby_install_name']
+    f = {
+      @test => [],
+      'test/test_fooby.rb' => [ 'test_something1', 'test_something2' ]
+    }
+    expected = [ "/usr/local/bin/#{ruby_cmd} -I.:lib:test -rtest/unit -e \"%w[#{@test}].each { |f| load f }\" | unit_diff -u",
+                 "/usr/local/bin/#{ruby_cmd} -I.:lib:test test/test_fooby.rb -n \"/^(test_something1|test_something2)$/\" | unit_diff -u" ].join("; ")
 
-  def util_capture
-    old_stdout = $stdout
-    old_stderr = $stderr
-    out = StringIO.new
-    err = StringIO.new
-    $stdout = out
-    $stderr = err
-    yield
-    return out.string, err.string
-  ensure
-    $stdout = old_stdout
-    $stderr = old_stderr
+    result = @a.make_test_cmd f
+    assert_equal expected, result
   end
 
-  def util_touch(file, t = Time.now)
-    File.utime(t, t, file)
+  def test_tests_for_file
+    assert_equal [@test], @a.tests_for_file(@impl)
+    assert_equal [@test], @a.tests_for_file(@test)
+
+    assert_equal ['test/test_unknown.rb'], @a.tests_for_file('test/test_unknown.rb')
+    assert_equal [], @a.tests_for_file('lib/unknown.rb')
+    assert_equal [], @a.tests_for_file('unknown.rb')
+    assert_equal [], @a.tests_for_file('test_unknown.rb')
   end
 
-end
+  def util_find_files_to_test(f, expected)
+    t = @a.last_mtime + 1
+    files = { f => t }
 
+    assert @a.find_files_to_test(files)
+    assert_equal expected, @a.files_to_test
+    assert_equal t, @a.files[f]
+    assert_equal "", @a.output.string
+  end
+end