ZenTest 3.0.0 → 3.1.0

data/lib/rails_autotest.rb

@@ -9,7 +9,7 @@ class RailsAutotest < Autotest
 
   def initialize # :nodoc:
     super
-    @exceptions = %r%(?:^\./(?:db|doc|log|public|script))|(?:.rhtml$)%
+    @exceptions = %r%(?:^\./(?:db|doc|log|public|script|vendor/rails))|(?:.rhtml$)%
   end
 
   def map_file_names(updated) # :nodoc:
@@ -21,34 +21,48 @@ class RailsAutotest < Autotest
 
       case filename
       when %r%^test/fixtures/(.*)s.yml% then
-        model_test = "test/unit/#{$1}_test.rb"
-        functional_test = "test/functional/#{$1}_controller_test.rb"
-        model_tests << model_test if File.exists? model_test
-        functional_tests << functional_test if File.exists? functional_test
+        model_tests << "test/unit/#{$1}_test.rb"
+        functional_tests << "test/functional/#{$1}_controller_test.rb"
       when %r%^test/unit/.*rb$% then
         model_tests << filename
       when %r%^app/models/(.*)\.rb$% then
-        model_tests << "test/unit/#{$1}_test.rb"
+        test_file = "test/unit/#{$1}_test.rb"
+        model_tests << test_file
       when %r%^test/functional/.*\.rb$% then
         functional_tests << filename
       when %r%^app/helpers/application_helper.rb% then
         functional_tests.push(*Dir['test/functional/*_test.rb'])
       when %r%^app/helpers/(.*)_helper.rb% then
-        functional_tests << "test/functional/#{$1}_controller_test.rb"
+        test_file = "test/functional/#{$1}_controller_test.rb"
+        functional_tests << test_file
       when %r%^app/controllers/application.rb$% then
-        functional_tests << "test/functional/dummy_controller_test.rb"
-      when %r%^app/controllers/(.*)\.rb$% then
-        functional_tests << "test/functional/#{$1}_test.rb"
+        test_file = "test/functional/dummy_controller_test.rb"
+        functional_tests << test_file
+      when %r%^app/controllers/(.*/)?(.*)\.rb$% then
+        test_file = "test/functional/#{$1}#{$2}_test.rb"
+        functional_tests << test_file
       when %r%^app/views/layouts/% then
       when %r%^app/views/(.*)/% then
-        functional_tests << "test/functional/#{$1}_controller_test.rb"
+        test_file = "test/functional/#{$1}_controller_test.rb"
+        functional_tests << test_file
+      when %r%^config/routes.rb$% then
+        functional_tests.push(*Dir['test/functional/**/*_test.rb'].sort)
+      when %r%^test/test_helper.rb$%,
+           %r%^config/boot.rb%,
+           %r%^config/database.yml%,
+           %r%^config/environment.rb%,
+           %r%^config/environments/test.rb% then
+        model_tests.push(*Dir['test/unit/**/*_test.rb'].sort)
+        functional_tests.push(*Dir['test/functional/**/*_test.rb'].sort)
+      when %r%^vendor/%, /^Rakefile$/ then
+        # ignore standard rails files
       else
-        puts "dunno! #{filename}"
+        STDERR.puts "Dunno! #{filename}" if $v or $TESTING
       end
     end
 
-    model_tests.uniq!
-    functional_tests.uniq!
+    model_tests = model_tests.uniq.select { |f| @files.has_key? f }
+    functional_tests = functional_tests.uniq.select { |f| @files.has_key? f }
 
     return model_tests, functional_tests
   end

data/lib/unit_diff.rb

@@ -73,6 +73,9 @@ end
 
 class UnitDiff
 
+  WINDOZE  = /win32/ =~ RUBY_PLATFORM
+  DIFF = (WINDOZE ? 'diff.exe' : 'diff')
+
   ##
   # Handy wrapper for UnitDiff#unit_diff.
 
@@ -177,7 +180,7 @@ class UnitDiff
         diff_flags = $u ? "-u" : $c ? "-c" : ""
         diff_flags += " -b" if $b
 
-        result = `diff #{diff_flags} #{a.path} #{b.path}`
+        result = `#{DIFF} #{diff_flags} #{a.path} #{b.path}`
         if result.empty? then
           output.push "[no difference--suspect ==]"
         else

data/lib/{ZenTest.rb → zentest.rb}

@@ -25,7 +25,7 @@ end
 
 class ZenTest
 
-  VERSION = '3.0.0'
+  VERSION = '3.1.0'
 
   if $TESTING then
     attr_reader :missing_methods
@@ -94,6 +94,7 @@ class ZenTest
     klass_methods = klass_methods.map { |m| "self." + m }
     public_methods += klass_methods
     public_methods -= Kernel.methods unless full
+    public_methods -= %w(pretty_print pretty_print_cycle)
     klassmethods = {}
     public_methods.each do |meth|
       puts "# found method #{meth}" if $DEBUG
@@ -282,8 +283,8 @@ class ZenTest
     '>'   => 'gt',
     '>='  => 'ge',
     '>>'  => 'gt2',
-    '@+'  => 'unary_plus',
-    '@-'  => 'unary_minus',
+    '+@'  => 'unary_plus',
+    '-@'  => 'unary_minus',
     '[]'  => 'index',
     '[]=' => 'index_equals',
     '^'   => 'carat',

data/test/test_autotest.rb

@@ -5,6 +5,8 @@ require 'test/unit'
 
 require 'autotest'
 
+Dir.chdir File.join(File.dirname(__FILE__), "..")
+
 class Autotest
 
   attr_accessor :system_responses
@@ -29,133 +31,216 @@ end
 class TestAutotest < Test::Unit::TestCase
 
   def setup
-    @photo_file          = 'test/data/normal/lib/photo.rb'
-    @photo_test_file     = 'test/data/normal/test/test_photo.rb'
-    @route_test_file     = 'test/data/normal/test/test_route.rb'
-    @user_test_file      = 'test/data/normal/test/test_user.rb'
-    @camelcase_test_file = 'test/data/normal/test/test_camelcase.rb'
+    @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'
 
-    util_touch @photo_file, (Time.now - 60)
-    util_touch @photo_test_file, (Time.now - 60)
-    util_touch @camelcase_test_file, (Time.now - 60)
+    @file_map = {}
+
+    @all_files = [ @blah_file, @photo_file, @photo_test_file, @route_test_file, @user_test_file, @camelcase_test_file ]
+
+    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)
+    end
 
     @at = Autotest.new
   end
 
-  def test_failed_test_files_not_updated
-    klass = 'TestPhoto'
-    tests = [@user_test_file, @photo_test_file]
+  def test_consolidate_failures
+    failed = [
+      %w[test_a TestOne],
+      %w[test_b TestOne],
+      %w[test_c TestOne],
+      %w[test_d TestTwo],
+    ]
 
-    @at.updated? @photo_test_file
+    expected = [
+      ["'/^(test_a|test_b|test_c)/'", /one/],
+      ["'/^(test_d)/'", /two/],
+    ]
 
-    failed_files = @at.failed_test_files klass, tests
+    assert_equal expected,
+                 @at.consolidate_failures(failed).sort_by { |f,k| k.source }
+  end
+
+  # 0 files update, 0 run
+  def test_failed_test_files_no_updates
+    tests = [@user_test_file, @photo_test_file]
+    updated_files = []
+
+    failed_files = @at.failed_test_files(/photo/, tests, updated_files)
 
     assert_equal [], failed_files
   end
 
-  def test_failed_test_files_updated
-    klass = 'TestPhoto'
+  # 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]
 
-    @at.updated? @photo_test_file
-    util_touch @photo_test_file
-
-    failed_files = @at.failed_test_files klass, tests
+    failed_files = @at.failed_test_files(/photo/, tests, updated_files)
 
     assert_equal [@photo_test_file], failed_files
   end
 
-  def test_failed_test_files_updated_camelcase
-    klass = 'TestCamelCase'
-    tests = [@camelcase_test_file]
+  # 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]
 
-    @at.updated? @camelcase_test_file
-    util_touch @camelcase_test_file
+    failed_files = @at.failed_test_files(/photo/, tests, updated_files)
+
+    assert_equal [], failed_files
+  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 klass, tests
+    failed_files = @at.failed_test_files(/camel_?case/, tests, updated_files)
 
     assert_equal [@camelcase_test_file], failed_files
   end
 
-  def test_failed_test_files_updated_implementation
-    klass = 'TestPhoto'
-    tests = [@user_test_file, @photo_test_file]
+  # 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
+  end
 
-    @at.updated? @photo_file
-    util_touch @photo_file
+  # "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 klass, tests
+    failed_files = @at.failed_test_files(/photo/, tests, updated_files)
 
     assert_equal [@photo_test_file], failed_files
   end
 
-  def test_map_file_names
-    @at.files['test/test_autotest.rb'] = Time.at 1
-    @at.files['lib/autotest.rb'] = Time.at 1
+  def test_failure_report
+    @at.files['test/test_one.rb'] = Time.at 0
+    @at.files['test/test_two.rb'] = Time.at 0
 
-    file_names = [
-      'lib/autotest.rb',
-      'lib/auto_test.rb',
-      'test/test_autotest.rb',
+    failures = [
+      ["'/^(test_a|test_b|test_c)/'", /one/],
+      ["'/^(test_d)/'", /two/],
     ]
 
-    expected = [
-      [['test/test_autotest.rb']],
-      [['test/test_autotest.rb']],
-      [['test/test_autotest.rb']],
-    ]
+    expected = "# failures remain in 2 files:
+#  test/test_one.rb:
+#    test_a
+#    test_b
+#    test_c
+#  test/test_two.rb:
+#    test_d"
 
-    file_names.each_with_index do |name, i|
-      assert_equal expected[i], @at.map_file_names([name]), "test #{i}, #{name}"
-    end
+    assert_equal expected, @at.failure_report(failures)
+  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 }
+
+    util_test_map_file_names @normal_tests_dir
   end
 
   def test_retest_failed_modified
-    failed = [['test_route', 'TestPhoto']]
-    tests = [@photo_test_file]
+    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
 
-    @at.system_responses = [true]
+      out, err = util_capture do
+        @at.retest_failed failed, tests
+      end
 
-    util_touch @photo_test_file
+      out = out.split $/
 
-    out, err = util_capture do
-      @at.retest_failed failed, tests
+      assert_equal "# Waiting for changes", out.shift
+      assert_equal "# Rerunning failures: #{@photo_test_file}", out.shift
+      assert_equal "+ ruby -Ilib:test #{@photo_test_file} -n test_route | unit_diff -u", out.shift
+
+      assert_equal true, @at.backtick_responses.empty?
     end
+  end
 
-    out = out.split $/
+  def test_reset_times
+    Dir.chdir @normal_tests_dir do
+      @at.updated?(@photo_test_file)
 
-    assert_equal "# Rerunning failures: #{@photo_test_file}", out.shift
-    assert_equal "+ ruby -Ilib:test -S testrb -n test_route #{@photo_test_file}", out.shift
+      assert_equal false, @at.updated?(@photo_test_file), 'In @files'
+      time = @at.files[@photo_test_file]
 
-    assert_equal true, @at.system_responses.empty?
+      @at.reset_times
+
+      assert_not_equal time, @at.files[@photo_test_file]
+      assert_equal true, @at.updated?(@photo_test_file), 'Time reset to 0'
+    end
   end
 
   def test_updated_eh
-    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'
+    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_updated_files
-    Dir.chdir 'test/data/normal' do
+    Dir.chdir @normal_tests_dir do
       @at.updated_files
-    end
 
-    expected = {
-      'lib/photo.rb'           => File.stat(@photo_file).mtime,
-      'test/test_photo.rb'     => File.stat(@photo_test_file).mtime,
-      'test/test_route.rb'     => File.stat(@route_test_file).mtime,
-      'test/test_user.rb'      => File.stat(@user_test_file).mtime,
-      'test/test_camelcase.rb' => File.stat(@camelcase_test_file).mtime,
-    }
+      expected = Hash[*@all_files.map { |f| [f, File.stat(f).mtime] }.flatten]
 
-    assert_equal expected, @at.files
+      assert_equal expected, @at.files
 
-    util_touch @photo_test_file
+      util_touch @photo_test_file
 
-    assert_not_equal expected['test_photo.rb'], @at.files
+      assert_not_equal expected['test/test_photo.rb'], @at.files
+    end
+  end
+
+  def util_add_map(file, *tests)
+    tests = [[],[]] if tests.empty?
+    
+    @file_map[file] = tests
+  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 util_capture
@@ -175,5 +260,6 @@ class TestAutotest < Test::Unit::TestCase
   def util_touch(file, t = Time.now)
     File.utime(t, t, file)
   end
+
 end
 

data/test/test_rails_autotest.rb

@@ -5,50 +5,97 @@ class TestRailsAutotest < TestAutotest
 
   def setup
     super
+
     @at = RailsAutotest.new
+
+    @rails_tests_dir = 'test/data/rails'
+
+    @rails_photo_file = 'app/models/photo.rb'
+    @rails_unit_tests = [
+                         'test/unit/flickr_photo_test.rb',
+                         'test/unit/photo_test.rb',
+                         'test/unit/route_test.rb',
+                        ]
+
+    @rails_functional_tests = [
+                               'test/functional/admin/themes_controller_test.rb',
+                               'test/functional/dummy_controller_test.rb',
+                               'test/functional/route_controller_test.rb',
+                              ]
+
+    @rails_all_tests = [@rails_unit_tests, @rails_functional_tests]
+  end
+
+  (instance_methods.sort - Object.instance_methods).each do |meth|
+    undef_method meth if meth =~ /^test_failed_test_files/
   end
 
   def test_map_file_names
-    file_names = [
-      './app/helpers/application_helper.rb',
-      './test/fixtures/routes.yml',
-      './test/unit/photo_test.rb',
-      './app/models/photo.rb',
-      './app/controllers/application.rb',
-      './app/controllers/route_controller.rb',
-      './app/views/layouts/default.rhtml',
-      './app/views/route/index.rhtml',
-      './app/helpers/route_helper.rb',
-    ]
-
-    expected = [
-      # ApplicationHelper
-      [[], ['test/functional/route_controller_test.rb']],
-      # fixture
-      [['test/unit/route_test.rb'],
-       ['test/functional/route_controller_test.rb']],
-      # test
-      [['test/unit/photo_test.rb'], []],
-      # model
-      [['test/unit/photo_test.rb'], []],
-      # ApplicationController
-      [[], ['test/functional/dummy_controller_test.rb']],
-      # controller
-      [[], ['test/functional/route_controller_test.rb']],
-      # layout
-      [[], []],
-      # view
-      [[], ['test/functional/route_controller_test.rb']],
-      # helper
-      [[], ['test/functional/route_controller_test.rb']],
-    ]
-
-    Dir.chdir 'test/data/rails' do
-      file_names.each_with_index do |name, i|
-        assert_equal expected[i], @at.map_file_names([name]),
-                     "test #{i}, #{name}"
-      end
+    # controllers
+    util_add_map("./app/controllers/admin/themes_controller.rb",
+                 [], ["test/functional/admin/themes_controller_test.rb"])
+    util_add_map("./app/controllers/application.rb",
+                 [], ["test/functional/dummy_controller_test.rb"])
+    util_add_map("./app/controllers/route_controller.rb",
+                 [], ["test/functional/route_controller_test.rb"])
+    util_add_map("./app/controllers/notest_controller.rb")
+
+    # helpers
+    util_add_map("./app/helpers/application_helper.rb",
+                 [], ["test/functional/dummy_controller_test.rb",
+                      "test/functional/route_controller_test.rb"])
+    util_add_map("./app/helpers/route_helper.rb",
+                 [], ["test/functional/route_controller_test.rb"])
+
+    # model
+    util_add_map("./app/models/route.rb",
+                 ["test/unit/route_test.rb"], [])
+    util_add_map("./app/models/notest.rb")
+
+    # views
+    util_add_map("./app/views/layouts/default.rhtml")
+    util_add_map("./app/views/route/index.rhtml",
+                 [], ["test/functional/route_controller_test.rb"])
+    util_add_map("./app/views/route/xml.rxml",
+                 [], ["test/functional/route_controller_test.rb"])
+    util_add_map("./app/views/shared/notest.rhtml")
+
+    # tests
+    util_add_map("./test/fixtures/routes.yml",
+                 ["test/unit/route_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_add_map("./test/functional/route_controller_test.rb",
+                 [], ["test/functional/route_controller_test.rb"])
+
+    util_add_map("./test/unit/photo_test.rb",
+                 ["test/unit/photo_test.rb"], [])
+
+    util_add_map("./test/test_helper.rb",
+                 @rails_unit_tests, @rails_functional_tests )
+
+    # global conf thingies
+    util_add_map("./config/boot.rb",
+                 @rails_unit_tests, @rails_functional_tests )
+    util_add_map("./config/database.yml",
+                 @rails_unit_tests, @rails_functional_tests )
+    util_add_map("./config/environment.rb",
+                 @rails_unit_tests, @rails_functional_tests )
+    util_add_map("./config/environments/test.rb",
+                 @rails_unit_tests, @rails_functional_tests )
+    util_add_map("./config/routes.rb",
+                 [], @rails_functional_tests)
+
+    # ignored crap
+    util_add_map("./vendor/plugins/cartographer/lib/keys.rb")
+    util_add_map("./Rakefile")
+
+    @rails_all_tests.flatten.each do |t|
+      @at.files[t] = Time.at(0)
     end
+
+    util_test_map_file_names @rails_tests_dir
   end
 
 end