ZenTest 3.8.0 → 3.9.0

data/History.txt

@@ -1,3 +1,24 @@
+=== 3.9.0 / 2008-01-30
+
+* 15 minor enhancements:
+
+  * Added Wilson's patch to allow unit_diff to work with mspec. Adding rspec next.
+  * Minor overhaul for autotest:
+    * Added -f flag to start up without testing.
+    * Added -q flag to autotest to make it extra quiet. Patch by Aaron Patterson.
+    * Added ability to set test execution order, defaults to :random. EVIL!
+    * Added completed_re and failed_results_re to help subclasses like rspec.
+    * Added deprecation warnings for hooks. Deprecated :run.
+    * Added find_directories accessor, defaults to ['.']
+    * Added sleep accessor, defaults to 1 second.
+    * Changed find_files to order files in the same order as find_directories.
+    * Changed how autodiscover works with $:, added lib to the front.
+    * Cleaned out nearly every @ and use accessor methods instead. You should too.
+    * Made test_mappings ordered.
+    * Removed @files, adding @find_order and @known_files.
+    * Renamed tests_for_file to test_files_for.
+    * test_files_for now only returns known files.
+
 === 3.8.0 / 2008-01-12
 
 * 10 minor enhancements:

data/Rakefile

@@ -6,16 +6,9 @@ require 'rubygems'
 require 'hoe'
 require './lib/zentest.rb'
 
-Hoe.new("ZenTest", ZenTest::VERSION) do |p|
-  p.author = ['Ryan Davis', 'Eric Hodel']
-
-  changes = p.paragraphs_of("History.txt", 0..4).join("\n\n")
-  urls, summary, *description = p.paragraphs_of("README.txt", 1, 3, 3..8)
-
-  p.url = urls.gsub(/^\* /, '').split(/\n/)
-  p.changes = changes
-  p.summary = summary
-  p.description = description.join("\n\n")
+Hoe.new("ZenTest", ZenTest::VERSION) do |zentest|
+  zentest.developer('Ryan Davis', 'ryand-ruby@zenspider.com')
+  zentest.developer('Eric Hodel', 'drbrain@segment7.net')
 end
 
 task :autotest do

data/bin/autotest

@@ -2,6 +2,8 @@
 
 $v    ||= false
 $h    ||= false
+$f    ||= false
+$q    ||= false
 $help ||= false
 
 if $h or $help then
@@ -15,6 +17,11 @@ if $h or $help then
           "\t-v\t\tBe verbose.",
           "\t\t\tPrints files that autotest doesn't know how to map to",
           "\t\t\ttests.",
+          nil,
+          "\t-q\t\tBe more quiet.",
+          nil,
+          "\t-f\t\tFast start.",
+          "\t\t\tDoesn't initially run tests at start.",
          ]
   STDERR.puts help.join("\n")
   exit 1

data/lib/autotest.rb

@@ -57,6 +57,8 @@ $TESTING = false unless defined? $TESTING
 
 class Autotest
 
+  T0 = Time.at 0
+
   HOOKS = Hash.new { |h,k| h[k] = [] }
   unless defined? WINDOZE then
     WINDOZE = /win32/ =~ RUBY_PLATFORM
@@ -101,8 +103,9 @@ class Autotest
   def self.autodiscover
     style = []
 
-    $:.push(*Dir["vendor/plugins/*/lib"])
     paths = $:.dup
+    paths.push 'lib'
+    paths.push(*Dir["vendor/plugins/*/lib"])
 
     begin
       require 'rubygems'
@@ -112,8 +115,12 @@ class Autotest
     end
 
     paths.each do |d|
+      next unless File.directory? d
       f = File.join(d, 'autotest', 'discover.rb')
-      load f if File.exist? f
+      if File.exist? f then
+        $: << d unless $:.include? d
+        load f
+      end
     end
 
     @@discoveries.map { |proc| proc.call }.flatten.compact.sort.uniq
@@ -126,16 +133,22 @@ class Autotest
     new.run
   end
 
-  attr_accessor(:extra_class_map,
+  attr_writer :known_files
+  attr_accessor(:completed_re,
+                :extra_class_map,
                 :extra_files,
-                :files,
+                :failed_results_re,
                 :files_to_test,
+                :find_order,
                 :interrupted,
                 :last_mtime,
                 :libs,
+                :order,
                 :output,
                 :results,
+                :sleep,
                 :tainted,
+                :find_directories,
                 :unit_diff,
                 :wants_to_quit)
 
@@ -143,16 +156,24 @@ class Autotest
   # Initialize the instance and then load the user's .autotest file, if any.
 
   def initialize
+    # these two are set directly because they're wrapped with
+    # add/remove/clear accessor methods
     @exception_list = []
-    @extra_class_map = {}
-    @extra_files = []
-    @files = Hash.new Time.at(0)
-    @files_to_test = Hash.new { |h,k| h[k] = [] }
-    @libs = %w[. lib test].join(File::PATH_SEPARATOR)
-    @output = $stderr
-    @sleep = 1
-    @unit_diff = "unit_diff -u"
-    @test_mappings = {}
+    @test_mappings = []
+
+    self.completed_re = /\d+ tests, \d+ assertions, \d+ failures, \d+ errors/
+    self.extra_class_map = {}
+    self.extra_files = []
+    self.failed_results_re = /^\s+\d+\) (?:Failure|Error):\n(.*?)\((.*?)\)/
+    self.files_to_test = new_hash_of_arrays
+    self.find_order = []
+    self.known_files = nil
+    self.libs = %w[. lib test].join(File::PATH_SEPARATOR)
+    self.order = :random
+    self.output = $stderr
+    self.sleep = 1
+    self.find_directories = ['.']
+    self.unit_diff = "unit_diff -u"
 
     self.add_mapping(/^lib\/.*\.rb$/) do |filename, _|
       possible = File.basename(filename).gsub '_', '_?'
@@ -178,6 +199,8 @@ class Autotest
     reset
     add_sigint_handler
 
+    self.last_mtime = Time.now if $f
+
     loop do # ^c handler
       begin
         get_to_green
@@ -214,10 +237,10 @@ class Autotest
   def run_tests
     hook :run_command
 
-    self.find_files_to_test # failed + changed/affected
+    self.find_files_to_test
     cmd = self.make_test_cmd self.files_to_test
 
-    puts cmd
+    puts cmd unless $q
 
     old_sync = $stdout.sync
     $stdout.sync = true
@@ -262,7 +285,7 @@ class Autotest
         unless hook :interrupt then
           puts "Interrupt a second time to quit"
           self.interrupted = true
-          sleep 1.5
+          Kernel.sleep 1.5
         end
         raise Interrupt, nil # let the run loop catch it
       end
@@ -294,9 +317,9 @@ class Autotest
   # file.
 
   def consolidate_failures(failed)
-    filters = Hash.new { |h,k| h[k] = [] }
+    filters = new_hash_of_arrays
 
-    class_map = Hash[*self.files.keys.grep(/^test/).map { |f|
+    class_map = Hash[*self.find_order.grep(/^test/).map { |f| # TODO: ugly
                        [path_to_classname(f), f]
                      }.flatten]
     class_map.merge!(self.extra_class_map)
@@ -319,18 +342,23 @@ class Autotest
 
   def find_files
     result = {}
-    targets = ['.'] + self.extra_files
+    targets = self.find_directories + self.extra_files
 
-    Find.find(*targets) do |f|
-      Find.prune if f =~ self.exceptions
+    targets.each do |target|
+      order = []
+      Find.find(target) do |f|
+        Find.prune if f =~ self.exceptions
 
-      next if test ?d, f
-      next if f =~ /(swp|~|rej|orig)$/          # temporary/patch files
-      next if f =~ /\/\.?#/                     # Emacs autosave/cvs merge files
+        next if test ?d, f
+        next if f =~ /(swp|~|rej|orig)$/ # temporary/patch files
+        next if f =~ /\/\.?#/            # Emacs autosave/cvs merge files
 
-      filename = f.sub(/^\.\//, '')
+        filename = f.sub(/^\.\//, '')
 
-      result[filename] = File.stat(filename).mtime rescue next
+        result[filename] = File.stat(filename).mtime rescue next
+        order << filename
+      end
+      self.find_order.push(*order.sort)
     end
 
     return result
@@ -343,26 +371,16 @@ class Autotest
   # file.
 
   def find_files_to_test(files=find_files)
-    updated = files.select { |filename, mtime|
-      self.files[filename] < mtime
-    }
+    updated = files.select { |filename, mtime| self.last_mtime < mtime }
 
     p updated if $v unless updated.empty? or self.last_mtime.to_i == 0
 
-    # TODO: keep an mtime at app level and drop the files hash
-    updated.each do |filename, mtime|
-      self.files[filename] = mtime
+    updated.map { |f,m| test_files_for(f) }.flatten.uniq.each do |filename|
+      self.files_to_test[filename] # creates key with default value
     end
 
-    updated.each do |filename, mtime|
-      tests_for_file(filename).each do |f|
-        self.files_to_test[f] # creates key with default value
-      end
-    end
-
-    previous = self.last_mtime
-    self.last_mtime = self.files.values.max
-    self.last_mtime > previous
+    self.last_mtime = files.values.max
+    not updated.empty?
   end
 
   ##
@@ -370,25 +388,36 @@ class Autotest
   # there are failures record this.
 
   def handle_results(results)
-    failed = results.scan(/^\s+\d+\) (?:Failure|Error):\n(.*?)\((.*?)\)/)
-    completed = results =~ /\d+ tests, \d+ assertions, \d+ failures, \d+ errors/
+    failed = results.scan(self.failed_results_re)
+    completed = results =~ self.completed_re
 
     self.files_to_test = consolidate_failures failed if completed
 
-    hook completed && self.files_to_test.empty? ? :green : :red unless $TESTING
+    color = completed && self.files_to_test.empty? ? :green : :red
+    hook color unless $TESTING
 
     self.tainted = true unless self.files_to_test.empty?
   end
 
+  ##
+  # Lazy accessor for the known_files hash.
+
+  def known_files
+    unless @known_files then
+      @known_files = Hash[*find_order.map { |f| [f, true] }.flatten]
+    end
+    @known_files
+  end
+
   ##
   # Generate the commands to test the supplied files
 
   def make_test_cmd files_to_test
     cmds = []
-    full, partial = files_to_test.partition { |k,v| v.empty? }
+    full, partial = reorder(files_to_test).partition { |k,v| v.empty? }
 
     unless full.empty? then
-      classes = full.map {|k,v| k}.flatten.uniq.sort.join(' ')
+      classes = full.map {|k,v| k}.flatten.uniq.join(' ')
       cmds << "#{ruby} -I#{libs} -rtest/unit -e \"%w[#{classes}].each { |f| require f }\" | #{unit_diff}"
     end
 
@@ -400,12 +429,32 @@ class Autotest
     return cmds.join("#{SEP} ")
   end
 
+  def new_hash_of_arrays
+    Hash.new { |h,k| h[k] = [] }
+  end
+
+  def reorder files_to_test
+    case self.order
+    when :alpha then
+      files_to_test.sort_by { |k,v| k }
+    when :reverse then
+      files_to_test.sort_by { |k,v| k }.reverse
+    when :random then
+      files_to_test.sort_by { |k,v| rand }
+    when :natural then
+      (self.find_order & files_to_test.keys).map { |f| [f, files_to_test[f]] }
+    else
+      raise "unknown order type: #{self.order.inspect}"
+    end
+  end
+
   ##
   # Rerun the tests from cold (reset state)
 
   def rerun_all_tests
     reset
     run_tests
+
     hook :all_good if all_good
   end
 
@@ -414,12 +463,14 @@ class Autotest
   # interrupts will kill autotest.
 
   def reset
-    @interrupted = @wants_to_quit = false
-    @files.clear
-    @files_to_test.clear
-    @last_mtime = Time.at(0)
-    find_files_to_test # failed + changed/affected
-    @tainted = false
+    self.files_to_test.clear
+    self.find_order.clear
+    self.interrupted = false
+    self.known_files = nil
+    self.last_mtime = T0
+    self.tainted = false
+    self.wants_to_quit = false
+
     hook :reset
   end
 
@@ -430,9 +481,7 @@ class Autotest
     ruby = File.join(Config::CONFIG['bindir'],
                      Config::CONFIG['ruby_install_name'])
 
-    unless File::ALT_SEPARATOR.nil? then
-      ruby.gsub! File::SEPARATOR, File::ALT_SEPARATOR
-    end
+    ruby.gsub! File::SEPARATOR, File::ALT_SEPARATOR if File::ALT_SEPARATOR
 
     return ruby
   end
@@ -442,13 +491,16 @@ class Autotest
   # a +test_mapping+ that matches the file and executing the mapping's
   # proc.
 
-  def tests_for_file(filename)
+  def test_files_for(filename)
     result = @test_mappings.find { |file_re, ignored| filename =~ file_re }
+
+    p :test_file_for => [filename, result.first] if result and $DEBUG
+
     result = result.nil? ? [] : Array(result.last.call(filename, $~))
 
     output.puts "Dunno! #{filename}" if ($v or $TESTING) and result.empty?
 
-    result.sort.uniq
+    result.sort.uniq.select { |f| known_files[f] }
   end
 
   ##
@@ -457,7 +509,7 @@ class Autotest
   def wait_for_changes
     hook :waiting
     begin
-      sleep @sleep
+      Kernel.sleep self.sleep
     end until find_files_to_test
   end
 
@@ -468,9 +520,7 @@ class Autotest
   # Returns all known files in the codebase matching +regexp+.
 
   def files_matching regexp
-    @files.keys.select { |k|
-      k =~ regexp
-    }
+    self.find_order.select { |k| k =~ regexp }
   end
 
   ##
@@ -485,14 +535,16 @@ class Autotest
   #   end
 
   def add_mapping(regexp, &proc)
-    @test_mappings[regexp] = proc
+    @test_mappings << [regexp, proc]
   end
 
   ##
   # Removed a file mapping matching +regexp+.
 
   def remove_mapping regexp
-    @test_mappings.delete regexp
+    @test_mappings.delete_if do |k,v|
+      k == regexp
+    end
   end
 
   ##
@@ -537,7 +589,7 @@ class Autotest
   ##
   # Return a compiled regexp of exceptions for find_files or nil if no
   # filtering should take place. This regexp is generated from
-  # @exception_list.
+  # +exception_list+.
 
   def exceptions
     unless defined? @exceptions then
@@ -560,6 +612,14 @@ class Autotest
   # event.
 
   def hook(name)
+    deprecated = {
+      :run => :initialize,      # TODO: remove 2008-03-14 (pi day!)
+    }
+
+    if deprecated[name] and not HOOKS[name].empty? then
+      warn "hook #{name} has been deprecated, use #{deprecated[name]}"
+    end
+
     HOOKS[name].inject(false) do |handled,plugin|
       plugin[self] || handled
     end

data/lib/autotest/rails.rb

@@ -7,6 +7,13 @@ class Autotest::Rails < Autotest
 
     add_exception %r%^\./(?:db|doc|log|public|script|tmp|vendor)%
 
+    clear_mappings
+
+    self.add_mapping(/^lib\/.*\.rb$/) do |filename, _|
+      impl = File.basename(filename, '.rb')
+      files_matching %r%^test/unit/#{impl}_test.rb$%
+    end
+
     add_mapping %r%^test/fixtures/(.*)s.yml% do |_, m|
       ["test/unit/#{m[1]}_test.rb",
        "test/controllers/#{m[1]}_controller_test.rb",
@@ -62,12 +69,6 @@ class Autotest::Rails < Autotest
     end
   end
 
-  # Given the string filename as the path, determine
-  # the corresponding tests for it, in an array.
-  def tests_for_file(filename)
-    super.select { |f| @files.has_key? f }
-  end
-
   # Convert the pathname s to the name of class.
   def path_to_classname(s)
     sep = File::SEPARATOR

data/lib/autotest/timestamp.rb

@@ -1,9 +1,9 @@
 # -*- ruby -*-
 
 module Autotest::Timestamp
-  Autotest.add_hook :waiting do |at|
+  Autotest.add_hook :waiting do
     puts
-    puts "# Waiting at #{Time.now.strftime "%Y-%m-%d %H:%M:%S"}"
+    puts "# Waiting since #{Time.now.strftime "%Y-%m-%d %H:%M:%S"}"
     puts
   end
 end

data/lib/unit_diff.rb

@@ -82,14 +82,8 @@ class UnitDiff
         output.puts input.gets # the rest of "Finished in..."
         output.puts
        next
-      when /^\s*$/ then
+      when /^\s*$/, /^\(?\s*\d+\) (Failure|Error):/, /^\d+\)/ then
         print_lines = false
-        type = nil
-        current = []
-        data << current
-      when /^\(?\s*\d+\) (Failure|Error):/ then
-        print_lines = false # if line =~ /Failure|Error/
-        type = $1
         current = []
         data << current
       when /^Finished in \d/ then
@@ -111,6 +105,7 @@ class UnitDiff
     header = []
     expect = []
     butwas = []
+    footer = []
     found = false
     state = :header
 
@@ -118,19 +113,43 @@ class UnitDiff
       case state
       when :header then
         header << result.shift
-        state = :expect if result.first =~ /^</
+        state = :expect if result.first =~ /^<|^Expected/
       when :expect then
-        state = :butwas if result.first.sub!(/ expected but was/, '')
-        expect << result.shift
+        if result.first =~ /^Expected (.*?) to equal (.*?):$/ then
+          expect << $1
+          butwas << $2
+          state = :footer
+          result.shift
+        elsif result.first =~ /^Expected (.*?)$/ then
+          expect << "#{$1}\n"
+          result.shift
+        elsif result.first =~ /^to equal / then
+          state = :spec_butwas
+          bw = result.shift.sub(/^to equal (.*):?$/, '\1')
+          butwas << bw
+        else
+          state = :butwas if result.first.sub!(/ expected but was/, '')
+          expect << result.shift
+        end
       when :butwas then
         butwas = result[0..-1]
         result.clear
+      when :spec_butwas then
+        if result.first =~ /^\s+\S+ at |^:\s*$/
+          state = :footer
+        else
+          butwas << result.shift
+        end
+      when :footer then
+        butwas.last.sub!(/:$/, '')
+        footer = result.map {|l| l.chomp }
+        result.clear
       else
         raise "unknown state #{state}"
       end
     end
 
-    return header, expect, nil if butwas.empty?
+    return header, expect, nil, footer if butwas.empty?
 
     expect.last.chomp!
     expect.first.sub!(/^<\"/, '')
@@ -141,7 +160,7 @@ class UnitDiff
     butwas.first.sub!( /^<\"/, '')
     butwas.last.sub!(/\">$/, '')
 
-    return header, expect, butwas
+    return header, expect, butwas, footer
   end
 
   ##
@@ -164,12 +183,12 @@ class UnitDiff
       first = []
       second = []
 
-      if result.first !~ /Failure/ then
+      if result.first =~ /Error/ then
         output.push result.join('')
         next
       end
 
-      prefix, expect, butwas = parse_diff(result)
+      prefix, expect, butwas, result_footer = parse_diff(result)
 
       output.push prefix.compact.map {|line| line.strip}.join("\n")
 
@@ -188,7 +207,7 @@ class UnitDiff
             if result.empty? then
               output.push "[no difference--suspect ==]"
             else
-              output.push result.split("\n")
+              output.push result.map { |line| line.chomp }
             end
 
             if $k then
@@ -200,6 +219,7 @@ class UnitDiff
           end
         end
 
+        output.push result_footer
         output.push ''
       else
         output.push expect.join('')

data/lib/zentest.rb

@@ -56,7 +56,7 @@ end
 
 class ZenTest
 
-  VERSION = '3.8.0'
+  VERSION = '3.9.0'
 
   include ZenTestMapping
 

data/test/test_autotest.rb

@@ -27,6 +27,10 @@ end
 
 class TestAutotest < Test::Unit::TestCase
 
+  def deny test
+    assert ! test
+  end
+
   RUBY = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']) unless defined? RUBY
 
   def setup
@@ -42,10 +46,13 @@ class TestAutotest < Test::Unit::TestCase
     klassname.sub!(/^(\w+)(Autotest)$/, '\2::\1') unless klassname == "Autotest"
     @a = klassname.split(/::/).inject(Object) { |k,n| k.const_get(n) }.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)
+
+    @files = {}
+    @files[@impl] = Time.at(1)
+    @files[@test] = Time.at(2)
+
+    @a.find_order = @files.keys.sort
   end
 
   def test_add_exception
@@ -88,9 +95,11 @@ class TestAutotest < Test::Unit::TestCase
   end
 
   def test_consolidate_failures_experiment
-    @a.files.clear
-    @a.files[@impl] = Time.at(1)
-    @a.files[@test] = Time.at(2)
+    @files.clear
+    @files[@impl] = Time.at(1)
+    @files[@test] = Time.at(2)
+
+    @a.find_order = @files.keys.sort
 
     input = [['test_fail1', @test_class], ['test_fail2', @test_class], ['test_error1', @test_class], ['test_error2', @test_class]]
     result = @a.consolidate_failures input
@@ -105,7 +114,7 @@ class TestAutotest < Test::Unit::TestCase
   end
 
   def test_consolidate_failures_multiple_possibilities
-    @a.files[@other_test] = Time.at(42)
+   @files[@other_test] = Time.at(42)
     result = @a.consolidate_failures([['test_unmatched', @test_class]])
     expected = { @test => ['test_unmatched']}
     assert_equal expected, result
@@ -114,11 +123,14 @@ class TestAutotest < Test::Unit::TestCase
   end
 
   def test_consolidate_failures_nested_classes
-    @a.files.clear
-    @a.files['lib/outer.rb'] = Time.at(5)
-    @a.files['lib/outer/inner.rb'] = Time.at(5)
-    @a.files[@inner_test] = Time.at(5)
-    @a.files[@outer_test] = Time.at(5)
+    @files.clear
+    @files['lib/outer.rb'] = Time.at(5)
+    @files['lib/outer/inner.rb'] = Time.at(5)
+    @files[@inner_test] = Time.at(5)
+    @files[@outer_test] = Time.at(5)
+
+    @a.find_order = @files.keys.sort
+
     result = @a.consolidate_failures([['test_blah1', @inner_test_class]])
     expected = { @inner_test => ['test_blah1'] }
     assert_equal expected, result
@@ -154,10 +166,10 @@ class TestAutotest < Test::Unit::TestCase
   # TODO: lots of filename edgecases for find_files_to_test
   def test_find_files_to_test
     @a.last_mtime = Time.at(0)
-    assert @a.find_files_to_test(@a.files)
+    assert @a.find_files_to_test(@files)
 
-    @a.last_mtime = @a.files.values.sort.last + 1
-    assert ! @a.find_files_to_test(@a.files)
+    @a.last_mtime = @files.values.sort.last + 1
+    deny @a.find_files_to_test(@files)
   end
 
   def test_find_files_to_test_dunno
@@ -181,12 +193,12 @@ class TestAutotest < Test::Unit::TestCase
     assert_equal empty, @a.files_to_test
 
     # ensure we do nothing when nothing changes...
-    files = { @impl => @a.files[@impl] } # same time
-    assert ! @a.find_files_to_test(files)
+    files = { @impl => @files[@impl] } # same time
+    deny @a.find_files_to_test(files)
     assert_equal empty, @a.files_to_test
     assert_equal "", @a.output.string
 
-    files = { @impl => @a.files[@impl] } # same time
+    files = { @impl => @files[@impl] } # same time
     assert(! @a.find_files_to_test(files))
     assert_equal empty, @a.files_to_test
     assert_equal "", @a.output.string
@@ -197,11 +209,48 @@ class TestAutotest < Test::Unit::TestCase
     util_find_files_to_test(@test, @test => [])
   end
 
+  def test_reorder_alpha
+    @a.order = :alpha
+    expected = @files.sort
+
+    assert_equal expected, @a.reorder(@files)
+  end
+
+  def test_reorder_reverse
+    @a.order = :reverse
+    expected = @files.sort.reverse
+
+    assert_equal expected, @a.reorder(@files)
+  end
+
+  def test_reorder_random
+    srand 42
+    @a.order = :random
+    expected = ["test/test_blah.rb", "lib/blah.rb"].map { |f| [f, @files[f]] }
+
+    assert_equal expected, @a.reorder(@files)
+  end
+
+  def test_reorder_natural
+    srand 42
+
+    @files['lib/untested_blah.rb'] = Time.at(2)
+    @a.find_order = @files.keys.sort_by { rand }
+
+    @a.order = :natural
+    expected = @a.find_order.map { |f| [f, @files[f]] }
+
+    assert_equal expected, @a.reorder(@files)
+  end
+
   def test_handle_results
     @a.files_to_test.clear
-    @a.files.clear
-    @a.files[@impl] = Time.at(1)
-    @a.files[@test] = Time.at(2)
+    @files.clear
+    @files[@impl] = Time.at(1)
+    @files[@test] = Time.at(2)
+
+    @a.find_order = @files.keys.sort
+
     empty = {}
     assert_equal empty, @a.files_to_test, "must start empty"
 
@@ -246,7 +295,7 @@ test_error2(#{@test_class}):
         from -e:1
 '
     @a.files_to_test[@test] = Time.at(42)
-    @a.files[@test] = []
+    @files[@test] = []
     expected = { @test => Time.at(42) }
     assert_equal expected, @a.files_to_test
     @a.handle_results(s3)
@@ -256,7 +305,7 @@ test_error2(#{@test_class}):
 
     @a.handle_results(s1)
     assert_equal empty, @a.files_to_test
-    assert ! @a.tainted
+    deny @a.tainted
   end
 
   def test_hook_overlap
@@ -287,14 +336,14 @@ test_error2(#{@test_class}):
 
   def test_hook_response
     Autotest.clear_hooks
-    assert ! @a.hook(:blah)
+    deny @a.hook(:blah)
 
     Autotest.add_hook(:blah) { false }
-    assert ! @a.hook(:blah)
+    deny @a.hook(:blah)
 
     Autotest.add_hook(:blah) { false }
-    assert ! @a.hook(:blah)
-    
+    deny @a.hook(:blah)
+
     Autotest.add_hook(:blah) { true  }
     assert @a.hook(:blah)
   end
@@ -340,14 +389,14 @@ test_error2(#{@test_class}):
     assert_equal expect, actual
   end
 
-  def test_tests_for_file
-    assert_equal [@test], @a.tests_for_file(@impl)
-    assert_equal [@test], @a.tests_for_file(@test)
+  def test_test_files_for
+    assert_equal [@test], @a.test_files_for(@impl)
+    assert_equal [@test], @a.test_files_for(@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')
+    assert_equal [], @a.test_files_for('test/test_unknown.rb')
+    assert_equal [], @a.test_files_for('lib/unknown.rb')
+    assert_equal [], @a.test_files_for('unknown.rb')
+    assert_equal [], @a.test_files_for('test_unknown.rb')
   end
 
   def util_exceptions
@@ -360,12 +409,12 @@ test_error2(#{@test_class}):
 
     assert @a.find_files_to_test(files)
     assert_equal expected, @a.files_to_test
-    assert_equal t, @a.files[f]
+    assert_equal t, @a.last_mtime
     assert_equal "", @a.output.string
   end
 
   def util_mappings
-    @a.test_mappings.keys.sort_by { |x| x.to_s }
+    @a.test_mappings.map { |k,v| k }.sort_by { |x| x.to_s }
   end
 
   def util_path_to_classname(e,i)

data/test/test_rails_autotest.rb

@@ -42,152 +42,183 @@ class TestRailsAutotest < TestAutotest
                       test/views/articles_view_test.rb
                       test/views/layouts_view_test.rb)
 
-    @a.files.clear
+    @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)
+     @extra_files +
+     [@impl]).flatten.each_with_index do |path, t|
+      @files[path] = Time.at(t+1)
     end
-    @a.last_mtime = @a.files.values.sort.last
+
+    @a.find_order = @files.keys
+    @a.last_mtime = @files.values.sort.last
   end
 
   # 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)
-    @a.files['app/views/routes/edit.rhtml'] = Time.at(42)
-    @a.files['app/views/routes/list.rhtml'] = Time.at(42)
+    @files[@test2] = Time.at(42)
+    @files['app/views/routes/edit.rhtml'] = Time.at(42)
+    @files['app/views/routes/list.rhtml'] = Time.at(42)
+
+    @a.find_order = @files.keys
+
     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_tests_for_file
+  def test_reorder_random
+    srand 42
+    @a.order = :random
+    expected = ["test/views/admin/themes_view_test.rb",
+                "test/functional/articles_controller_test.rb",
+                "app/models/route.rb",
+                "test/views/articles_view_test.rb",
+                "test/views/route_view_test.rb",
+                "test/controllers/articles_controller_test.rb",
+                "test/functional/admin/themes_controller_test.rb",
+                "test/functional/route_controller_test.rb",
+                "test/unit/route_test.rb",
+                "test/functional/dummy_controller_test.rb",
+                "test/controllers/admin/themes_controller_test.rb",
+                "test/views/layouts_view_test.rb",
+                "test/controllers/dummy_controller_test.rb",
+                "test/controllers/route_controller_test.rb"]
+    expected.map! { |f| [f, @files[f]] }
+
+    assert_equal expected, @a.reorder(@files)
+  end
+
+  def test_test_files_for
     empty = []
-    assert_equal empty, @a.tests_for_file('blah.rb')
-    assert_equal empty, @a.tests_for_file('test_blah.rb')
+    assert_equal empty, @a.test_files_for('blah.rb')
+    assert_equal empty, @a.test_files_for('test_blah.rb')
 
     # controllers
-    util_tests_for_file('app/controllers/admin/themes_controller.rb',
+    util_test_files_for('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/application.rb',
+    util_test_files_for('app/controllers/application.rb',
                         @rails_controller_tests,
                         @rails_view_tests,
                         @rails_functional_tests)
 
-    util_tests_for_file('app/controllers/route_controller.rb',
+    util_test_files_for('app/controllers/route_controller.rb',
                         'test/controllers/route_controller_test.rb',
                         'test/functional/route_controller_test.rb')
 
-    util_tests_for_file('app/controllers/notest_controller.rb')
+    util_test_files_for('app/controllers/notest_controller.rb')
 
     # helpers
-    util_tests_for_file('app/helpers/application_helper.rb',
+    util_test_files_for('app/helpers/application_helper.rb',
                         @rails_view_tests,
                         @rails_functional_tests)
 
-    util_tests_for_file('app/helpers/route_helper.rb',
+    util_test_files_for('app/helpers/route_helper.rb',
                         'test/views/route_view_test.rb',
                         'test/functional/route_controller_test.rb')
 
     # model
-    util_tests_for_file('app/models/route.rb',
+    util_test_files_for('app/models/route.rb',
                         @test)
 
-    util_tests_for_file('app/models/notest.rb')
+    util_test_files_for('app/models/notest.rb')
 
     # views
-    util_tests_for_file('app/views/layouts/default.rhtml',
+    util_test_files_for('app/views/layouts/default.rhtml',
                         'test/views/layouts_view_test.rb')
 
-    util_tests_for_file('app/views/route/index.rhtml',
+    util_test_files_for('app/views/route/index.rhtml',
                         'test/views/route_view_test.rb',
                         'test/functional/route_controller_test.rb')
 
-    util_tests_for_file('app/views/route/xml.rxml',
+    util_test_files_for('app/views/route/xml.rxml',
                         'test/views/route_view_test.rb',
                         'test/functional/route_controller_test.rb')
 
-    util_tests_for_file('app/views/shared/notest.rhtml')
+    util_test_files_for('app/views/shared/notest.rhtml')
 
-    util_tests_for_file('app/views/articles/flag.rhtml',
+    util_test_files_for('app/views/articles/flag.rhtml',
                         'test/views/articles_view_test.rb',
                         'test/functional/articles_controller_test.rb')
 
     # tests
-    util_tests_for_file('test/fixtures/routes.yml',
+    util_test_files_for('test/fixtures/routes.yml',
                         @test,
                         'test/controllers/route_controller_test.rb',
                         'test/views/route_view_test.rb',
                         'test/functional/route_controller_test.rb')
 
-    util_tests_for_file('test/test_helper.rb',
+    util_test_files_for('test/test_helper.rb',
                         @rails_unit_tests, @rails_controller_tests,
                         @rails_view_tests, @rails_functional_tests)
 
-    util_tests_for_file(@test, @test)
+    util_test_files_for(@test, @test)
 
-    util_tests_for_file('test/controllers/route_controller_test.rb',
+    util_test_files_for('test/controllers/route_controller_test.rb',
                         'test/controllers/route_controller_test.rb')
 
-    util_tests_for_file('test/views/route_view_test.rb',
+    util_test_files_for('test/views/route_view_test.rb',
                         'test/views/route_view_test.rb')
 
-    util_tests_for_file('test/functional/route_controller_test.rb',
+    util_test_files_for('test/functional/route_controller_test.rb',
                         'test/functional/route_controller_test.rb')
 
-    util_tests_for_file('test/functional/admin/themes_controller_test.rb',
+    util_test_files_for('test/functional/admin/themes_controller_test.rb',
                         'test/functional/admin/themes_controller_test.rb')
 
     # global conf thingies
-    util_tests_for_file('config/boot.rb',
+    util_test_files_for('config/boot.rb',
                         @rails_unit_tests, @rails_controller_tests,
                         @rails_view_tests, @rails_functional_tests)
 
-    util_tests_for_file('config/database.yml',
+    util_test_files_for('config/database.yml',
                         @rails_unit_tests, @rails_controller_tests,
                         @rails_view_tests, @rails_functional_tests)
 
-    util_tests_for_file('config/environment.rb',
+    util_test_files_for('config/environment.rb',
                         @rails_unit_tests, @rails_controller_tests,
                         @rails_view_tests, @rails_functional_tests)
 
-    util_tests_for_file('config/environments/test.rb',
+    util_test_files_for('config/environments/test.rb',
                         @rails_unit_tests, @rails_controller_tests,
                         @rails_view_tests, @rails_functional_tests)
 
-    util_tests_for_file('config/routes.rb',
+    util_test_files_for('config/routes.rb',
                         @rails_controller_tests,
                         @rails_view_tests, @rails_functional_tests)
 
     # ignored crap
-    util_tests_for_file('vendor/plugins/cartographer/lib/keys.rb')
+    util_test_files_for('vendor/plugins/cartographer/lib/keys.rb')
 
-    util_tests_for_file('Rakefile')
+    util_test_files_for('Rakefile')
   end
 
   def test_consolidate_failures_multiple_matches_before
     @test_class = 'BlahTest'
-    @a.files.clear
-    @a.files['app/model/blah.rb'] = Time.at(42)
-    @a.files['app/model/different_blah.rb'] = Time.at(42)
-    @a.files['test/unit/blah_test.rb'] = Time.at(42)
-    @a.files['test/unit/different_blah_test.rb'] = Time.at(42)
+    @files.clear
+    @files['app/model/blah.rb'] = Time.at(42)
+    @files['app/model/different_blah.rb'] = Time.at(42)
+    @files['test/unit/blah_test.rb'] = Time.at(42)
+    @files['test/unit/different_blah_test.rb'] = Time.at(42)
+
+    @a.find_order = @files.keys
+
     result = @a.consolidate_failures([['test_matched', @test_class]])
     expected = { 'test/unit/blah_test.rb' => [ 'test_matched' ] }
     assert_equal expected, result
     assert_equal "", @a.output.string
   end
 
-  def util_tests_for_file(file, *expected)
+  def util_test_files_for(file, *expected)
     assert_equal(expected.flatten.sort.uniq,
-                 @a.tests_for_file(file).sort.uniq, "tests for #{file}")
+                 @a.test_files_for(file).sort.uniq, "tests for #{file}")
   end
 
   def test_path_to_classname
@@ -200,7 +231,8 @@ class TestRailsAutotest < TestAutotest
     util_path_to_classname 'BlahTest', 'test/controllers/blah_test.rb'
     util_path_to_classname 'BlahTest', 'test/helpers/blah_test.rb'
 
-    util_path_to_classname 'OuterTest::InnerTest', 'test/controllers/outer/inner_test.rb'
+    util_path_to_classname('OuterTest::InnerTest',
+                           'test/controllers/outer/inner_test.rb')
   end
 end
 

data/test/test_unit_diff.rb

@@ -25,6 +25,85 @@ class TestUnitDiff < Test::Unit::TestCase
     util_unit_diff(header, input, expected, :parse_input)
   end
 
+  def test_input_mini_rspec
+    header = <<-HEADER
+Started
+.......F
+Finished in 0.1 seconds
+
+    HEADER
+
+    failure = <<-FAILURE
+1)
+The unless expression should fail FAILED
+Expected nil to equal "baz":
+    FAILURE
+
+    backtrace = <<-BACKTRACE
+      PositiveExpectation#== at spec/mini_rspec.rb:217
+          main.__script__ {} at spec/language/unless_spec.rb:49
+                   Proc#call at kernel/core/proc.rb:127
+               SpecRunner#it at spec/mini_rspec.rb:368
+                     main.it at spec/mini_rspec.rb:412
+          main.__script__ {} at spec/language/unless_spec.rb:48
+                   Proc#call at kernel/core/proc.rb:127
+         SpecRunner#describe at spec/mini_rspec.rb:378
+               main.describe at spec/mini_rspec.rb:408
+             main.__script__ at spec/language/unless_spec.rb:3
+    CompiledMethod#as_script at kernel/bootstrap/primitives.rb:41
+                   main.load at kernel/core/compile.rb:150
+          main.__script__ {} at last_mspec.rb:11
+               Array#each {} at kernel/core/array.rb:545
+       Integer(Fixnum)#times at kernel/core/integer.rb:15
+                  Array#each at kernel/core/array.rb:545
+             main.__script__ at last_mspec.rb:16
+    CompiledMethod#as_script at kernel/bootstrap/primitives.rb:41
+                   main.load at kernel/core/compile.rb:150
+             main.__script__ at kernel/loader.rb:145
+    BACKTRACE
+
+    footer = "\n8 examples, 1 failures\n"
+    input = header + failure + backtrace + footer
+
+    expected_backtrace = backtrace.split("\n").map {|l| "#{l}\n"}
+    expected = [[["1)\n", "The unless expression should fail FAILED\n",
+      "Expected nil to equal \"baz\":\n",
+      *expected_backtrace]],
+      ["\n", "8 examples, 1 failures\n"]]
+    util_unit_diff(header, input, expected, :parse_input)
+  end
+
+  def test_input_mini_rspec_multiline
+    header = <<-HEADER
+Started
+.......F
+Finished in 0.1 seconds
+
+    HEADER
+
+failure = <<-FAILURE
+1)
+Compiler compiles a case without an argument FAILED
+Expected #<TestGenerator [[:push, :false], [:gif, #<Label 5>], [:push_literal, "foo"], [:string_dup], [:goto, #<Label 19>], [:set_label, #<Label 5>], [:push, :nil], [:gif, #<Label 10>], [:push_literal, "foo"], [:string_dup], [:goto, #<Label 19>], [:set_label, #<Label 10>], [:push, 2], [:push, 1], [:send, :==, 1, false], [:gif, #<Label 17>], [:push_literal, "bar"], [:string_dup], [:goto, #<Label 19>], [:set_label, #<Label 17>], [:push_literal, "baz"], [:string_dup], [:set_label, #<Label 19>]]
+to equal #<TestGenerator [[:push, false], [:gif, #<Label 5>], [:push, "foo"], [:string_dup], [:goto, #<Label 6>], [:set_label, #<Label 5>], [:push, nil], [:set_label, #<Label 6>], [:pop], [:push, nil], [:gif, #<Label 12>], [:push, "foo"], [:string_dup], [:goto, #<Label 13>], [:set_label, #<Label 12>], [:push, nil], [:set_label, #<Label 13>], [:pop], [:push, 2], [:push, 1], [:send, :==, 1], [:gif, #<Label 21>], [:push, "bar"], [:string_dup], [:goto, #<Label 23>], [:set_label, #<Label 21>], [:push_literal, "baz"], [:string_dup], [:set_label, #<Label 23>], [:sret]]:
+      FAILURE
+
+backtrace = <<-BACKTRACE
+      PositiveExpectation#== at spec/mini_rspec.rb:216
+                    main.gen at ./compiler2/spec/helper.rb:125
+          main.__script__ {} at compiler2/spec/control_spec.rb:448
+    BACKTRACE
+
+    footer = "\n8 examples, 1 failures\n"
+    input = header + failure + backtrace + footer
+
+    expected_backtrace = backtrace.split("\n").map {|l| "#{l}\n"}
+    expected_failure = failure.split("\n").map {|l| "#{l}\n"}
+    expected = [[[*(expected_failure + expected_backtrace)]],
+      ["\n", "8 examples, 1 failures\n"]]
+    util_unit_diff(header, input, expected, :parse_input)
+  end
+
   def test_unit_diff_empty # simulates broken pipe at the least
     input = ""
     expected = ""
@@ -38,7 +117,7 @@ class TestUnitDiff < Test::Unit::TestCase
              "<\"<body>\">.\n"
             ]
 
-    expected = [["  1) Failure:\n", "test_test1(TestBlah) [./blah.rb:25]:\n"], ["<html>"], ["<body>"]]
+    expected = [["  1) Failure:\n", "test_test1(TestBlah) [./blah.rb:25]:\n"], ["<html>"], ["<body>"], []]
 
     assert_equal expected, @diff.parse_diff(input)
   end
@@ -50,7 +129,7 @@ class TestUnitDiff < Test::Unit::TestCase
              "<\"line4\\nline5\\nline6\\n\">.\n"
             ]
 
-    expected = [["  1) Failure:\n", "test_test1(TestBlah) [./blah.rb:25]:\n"], ["line1\\nline2\\nline3\\n"], ["line4\\nline5\\nline6\\n"]]
+    expected = [["  1) Failure:\n", "test_test1(TestBlah) [./blah.rb:25]:\n"], ["line1\\nline2\\nline3\\n"], ["line4\\nline5\\nline6\\n"], []]
 
     assert_equal expected, @diff.parse_diff(input)
   end
@@ -65,7 +144,8 @@ class TestUnitDiff < Test::Unit::TestCase
     expected = [["  2) Failure:\n",
                  "test_test2(TestBlah) [./blah.rb:29]:\n"],
                 ["line1"],
-                ["line2\\nline3\\n\\n"]
+                ["line2\\nline3\\n\\n"],
+                []
                ]
 
     assert_equal expected, @diff.parse_diff(input)
@@ -77,7 +157,7 @@ class TestUnitDiff < Test::Unit::TestCase
              "Unknown expected data.\n",
              "<false> is not true.\n"]
 
-    expected = [[" 13) Failure:\n", "test_case_stmt(TestRubyToRubyC) [./r2ctestcase.rb:1198]:\n", "Unknown expected data.\n"], ["<false> is not true.\n"], nil]
+    expected = [[" 13) Failure:\n", "test_case_stmt(TestRubyToRubyC) [./r2ctestcase.rb:1198]:\n", "Unknown expected data.\n"], ["<false> is not true.\n"], nil, []]
 
     assert_equal expected, @diff.parse_diff(input)
   end
@@ -90,7 +170,7 @@ class TestUnitDiff < Test::Unit::TestCase
     expected = [["1) Failure:\n",
                  "test_util_capture(AssertionsTest) [test/test_zentest_assertions.rb:53]:\n"],
                 ["out"],
-                ["out"]]
+                ["out"], []]
 
     assert_equal expected, @diff.parse_diff(input)
   end
@@ -103,7 +183,34 @@ class TestUnitDiff < Test::Unit::TestCase
     expected = [["1) Failure:\n",
                  "test_util_capture(AssertionsTest) [test/test_zentest_assertions.rb:53]:\n"],
                 ["out"],
-                ["out\\n"]]
+                ["out\\n"], []]
+
+    assert_equal expected, @diff.parse_diff(input)
+  end
+
+  def test_parse_diff_mini_rspec
+    input = ["1)\n", "The unless expression should fail FAILED\n",
+      "Expected nil to equal \"baz\":\n",
+      "    PositiveExpectation#== at spec/mini_rspec.rb:217\n"]
+
+    expected = [["1)\n", "The unless expression should fail FAILED\n"],
+      ["nil"],
+      ["\"baz\""],
+      ["    PositiveExpectation#== at spec/mini_rspec.rb:217"]]
+
+    assert_equal expected, @diff.parse_diff(input)
+  end
+
+  def test_parse_diff_mini_rspec_multiline
+    input = ["1)\n", "The unless expression should fail FAILED\n",
+    "Expected #<TestGenerator [[:push, :true],\n", "  [:dup]\n", "]\n",
+    "to equal #<TestGenerator [[:pop],\n", "  [:dup]\n", "]:\n",
+    "    PositiveExpectation#== at spec/mini_rspec.rb:217\n"]
+
+    expected = [["1)\n", "The unless expression should fail FAILED\n"],
+      ["#<TestGenerator [[:push, :true],\n", "  [:dup]\n", "]"],
+      ["#<TestGenerator [[:pop],\n", "  [:dup]\n", "]"],
+      ["    PositiveExpectation#== at spec/mini_rspec.rb:217"]]
 
     assert_equal expected, @diff.parse_diff(input)
   end
@@ -160,7 +267,7 @@ class TestUnitDiff < Test::Unit::TestCase
   def util_unit_diff(header, input, expected, msg=:unit_diff)
     output = StringIO.new("")
     actual = @diff.send(msg, StringIO.new(input), output)
-    assert_equal header, output.string
+    assert_equal header, output.string, "header output"
     assert_equal expected, actual
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ZenTest
 version: !ruby/object:Gem::Version 
-  version: 3.8.0
+  version: 3.9.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-14 00:00:00 -08:00
+date: 2008-01-31 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,10 +20,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        version: 1.5.0
     version: 
 description: "ZenTest provides 4 different tools and 1 library: zentest, unit_diff, autotest, multiruby, and Test::Rails.  ZenTest scans your target and unit-test code and writes your missing code based on simple naming rules, enabling XP at a much quicker pace. ZenTest only works with Ruby and Test::Unit.  unit_diff is a command-line filter to diff expected results from actual results and allow you to quickly see exactly what is wrong.  autotest is a continous testing facility meant to be used during development. As soon as you save a file, autotest will run the corresponding dependent tests.  multiruby runs anything you want on multiple versions of ruby. Great for compatibility checking!  Test::Rails helps you build industrial-strength Rails code."
-email: ryand-ruby@zenspider.com
+email: 
+- ryand-ruby@zenspider.com
+- drbrain@segment7.net
 executables: 
 - autotest
 - multiruby
@@ -127,7 +129,7 @@ rubyforge_project: zentest
 rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
-summary: "ZenTest provides 4 different tools and 1 library: zentest, unit_diff, autotest, multiruby, and Test::Rails."
+summary: "ZenTest provides 4 different tools and 1 library: zentest, unit_diff, autotest, multiruby, and Test::Rails"
 test_files: 
 - test/test_autotest.rb
 - test/test_help.rb