test-unit 1.2.3 → 2.0.0

data/lib/test/unit/autorunner.rb

@@ -1,10 +1,27 @@
 require 'test/unit'
-require 'test/unit/ui/testrunnerutilities'
 require 'optparse'
 
 module Test
   module Unit
     class AutoRunner
+      RUNNERS = {}
+      COLLECTORS = {}
+      ADDITIONAL_OPTIONS = []
+
+      class << self
+        def register_runner(id, runner_builder=Proc.new)
+          RUNNERS[id] = runner_builder
+        end
+
+        def register_collector(id, collector_builder=Proc.new)
+          COLLECTORS[id] = collector_builder
+        end
+
+        def setup_option(option_builder=Proc.new)
+          ADDITIONAL_OPTIONS << option_builder
+        end
+      end
+
       def self.run(force_standalone=false, default_dir=nil, argv=ARGV, &block)
         r = new(force_standalone || standalone?, &block)
         r.base = default_dir
@@ -20,69 +37,57 @@ module Test
         true
       end
 
-      RUNNERS = {
-        :console => proc do |r|
-          require 'test/unit/ui/console/testrunner'
-          Test::Unit::UI::Console::TestRunner
-        end,
-        :gtk => proc do |r|
-          require 'test/unit/ui/gtk/testrunner'
-          Test::Unit::UI::GTK::TestRunner
-        end,
-        :gtk2 => proc do |r|
-          require 'test/unit/ui/gtk2/testrunner'
-          Test::Unit::UI::GTK2::TestRunner
-        end,
-        :fox => proc do |r|
-          require 'test/unit/ui/fox/testrunner'
-          Test::Unit::UI::Fox::TestRunner
-        end,
-        :tk => proc do |r|
-          require 'test/unit/ui/tk/testrunner'
-          Test::Unit::UI::Tk::TestRunner
-        end,
-      }
-
-      OUTPUT_LEVELS = [
-        [:silent, UI::SILENT],
-        [:progress, UI::PROGRESS_ONLY],
-        [:normal, UI::NORMAL],
-        [:verbose, UI::VERBOSE],
-      ]
-
-      COLLECTORS = {
-        :objectspace => proc do |r|
-          require 'test/unit/collector/objectspace'
-          c = Collector::ObjectSpace.new
-          c.filter = r.filters
-          c.collect($0.sub(/\.rb\Z/, ''))
-        end,
-        :dir => proc do |r|
-          require 'test/unit/collector/dir'
-          c = Collector::Dir.new
-          c.filter = r.filters
-          c.pattern.concat(r.pattern) if(r.pattern)
-          c.exclude.concat(r.exclude) if(r.exclude)
-          c.base = r.base
-          $:.push(r.base) if r.base
-          c.collect(*(r.to_run.empty? ? ['.'] : r.to_run))
-        end,
-      }
-
-      attr_reader :suite
-      attr_accessor :output_level, :filters, :to_run, :pattern, :exclude, :base, :workdir
+      register_collector(:descendant) do |auto_runner|
+        require 'test/unit/collector/descendant'
+        collector = Collector::Descendant.new
+        collector.filter = auto_runner.filters
+        collector.collect($0.sub(/\.rb\Z/, ''))
+      end
+
+      register_collector(:load) do |auto_runner|
+        require 'test/unit/collector/load'
+        collector = Collector::Load.new
+        collector.patterns.concat(auto_runner.pattern) if auto_runner.pattern
+        collector.excludes.concat(auto_runner.exclude) if auto_runner.exclude
+        collector.base = auto_runner.base
+        collector.filter = auto_runner.filters
+        collector.collect(*auto_runner.to_run)
+      end
+
+      # deprecated
+      register_collector(:object_space) do |auto_runner|
+        require 'test/unit/collector/objectspace'
+        c = Collector::ObjectSpace.new
+        c.filter = auto_runner.filters
+        c.collect($0.sub(/\.rb\Z/, ''))
+      end
+
+      # deprecated
+      register_collector(:dir) do |auto_runner|
+        require 'test/unit/collector/dir'
+        c = Collector::Dir.new
+        c.filter = auto_runner.filters
+        c.pattern.concat(auto_runner.pattern) if auto_runner.pattern
+        c.exclude.concat(auto_runner.exclude) if auto_runner.exclude
+        c.base = auto_runner.base
+        $:.push(auto_runner.base) if auto_runner.base
+        c.collect(*(auto_runner.to_run.empty? ? ['.'] : auto_runner.to_run))
+      end
+
+      attr_reader :suite, :runner_options
+      attr_accessor :filters, :to_run, :pattern, :exclude, :base, :workdir
       attr_writer :runner, :collector
 
       def initialize(standalone)
         Unit.run = true
         @standalone = standalone
-        @runner = RUNNERS[:console]
-        @collector = COLLECTORS[(standalone ? :dir : :objectspace)]
+        @runner = default_runner
+        @collector = default_collector
         @filters = []
         @to_run = []
-        @output_level = UI::NORMAL
+        @runner_options = {}
         @workdir = nil
-        yield(self) if(block_given?)
+        yield(self) if block_given?
       end
 
       def process_args(args = ARGV)
@@ -163,15 +168,25 @@ module Test
             end
           end
 
+          priority_filter = Proc.new do |test|
+            Priority::Checker.new(test).need_to_run? or nil
+          end
+          o.on("--[no-]priority-mode",
+               "Runs some tests based on their priority.") do |priority_mode|
+            if priority_mode
+              @filters |= [priority_filter]
+            else
+              @filters -= [priority_filter]
+            end
+          end
+
           o.on('-I', "--load-path=DIR[#{File::PATH_SEPARATOR}DIR...]",
                "Appends directory list to $LOAD_PATH.") do |dirs|
             $LOAD_PATH.concat(dirs.split(File::PATH_SEPARATOR))
           end
 
-          o.on('-v', '--verbose=[LEVEL]', OUTPUT_LEVELS,
-               "Set the output level (default is verbose).",
-               "(" + keyword_display(OUTPUT_LEVELS) + ")") do |l|
-            @output_level = l || UI::VERBOSE
+          ADDITIONAL_OPTIONS.each do |option_builder|
+            option_builder.call(self, o)
           end
 
           o.on('--',
@@ -189,14 +204,11 @@ module Test
             @runner = RUNNERS[:console]
           end
 
-          o.on_tail('--gtk', 'GTK runner (use --runner).') do
-            warn("Deprecated option (--gtk).")
-            @runner = RUNNERS[:gtk]
-          end
-
-          o.on_tail('--fox', 'Fox runner (use --runner).') do
-            warn("Deprecated option (--fox).")
-            @runner = RUNNERS[:fox]
+          if RUNNERS[:fox]
+            o.on_tail('--fox', 'Fox runner (use --runner).') do
+              warn("Deprecated option (--fox).")
+              @runner = RUNNERS[:fox]
+            end
           end
 
           o.on_tail
@@ -210,11 +222,29 @@ module Test
       end
 
       def run
-        @suite = @collector[self]
-        result = @runner[self] or return false
+        suite = @collector[self]
+        return false if suite.nil?
+        runner = @runner[self]
+        return false if runner.nil?
         Dir.chdir(@workdir) if @workdir
-        result.run(@suite, @output_level).passed?
+        runner.run(suite, @runner_options).passed?
+      end
+
+      private
+      def default_runner
+        if ENV["EMACS"] == "t"
+          RUNNERS[:emacs]
+        else
+          RUNNERS[:console]
+        end
+      end
+
+      def default_collector
+        COLLECTORS[@standalone ? :load : :descendant]
       end
     end
   end
 end
+
+require 'test/unit/runner/console'
+require 'test/unit/runner/emacs'

data/lib/test/unit/collector/descendant.rb

@@ -0,0 +1,23 @@
+require 'test/unit/collector'
+
+module Test
+  module Unit
+    module Collector
+      class Descendant
+        include Collector
+
+        NAME = 'collected from the subclasses of TestCase'
+
+        def collect(name=NAME)
+          suite = TestSuite.new(name)
+          sub_suites = []
+          TestCase::DESCENDANTS.each do |descendant_test_case|
+            add_suite(sub_suites, descendant_test_case.suite)
+          end
+          sort(sub_suites).each {|s| suite << s}
+          suite
+        end
+      end
+    end
+  end
+end

data/lib/test/unit/collector/dir.rb

@@ -60,7 +60,7 @@ module Test
               next if(e == '.' || e == '..')
               e_name = dir_name ? @file.join(dir_name, e) : e
               if @file.directory?(realdir(e_name))
-                next if /\ACVS\z/ =~ e
+                next if /\A(?:CVS|\.svn)\z/ =~ e
                 sub_suite = recursive_collect(e_name, already_gathered)
                 sub_suites << sub_suite unless(sub_suite.empty?)
               else

data/lib/test/unit/collector/load.rb

@@ -0,0 +1,135 @@
+require 'pathname'
+
+require 'test/unit/testsuite'
+require 'test/unit/collector'
+
+module Test
+  module Unit
+    module Collector
+      class Load
+        include Collector
+
+        attr_reader :patterns, :excludes, :base
+
+        def initialize
+          super
+          @system_excludes = [/~\z/, /\A\.\#/]
+          @system_directory_excludes = [/\A(?:CVS|\.svn)\z/]
+          @patterns = [/\Atest_.+\.rb\z/m]
+          @excludes = []
+          @base = nil
+        end
+
+        def base=(base)
+          base = Pathname(base) unless base.nil?
+          @base = base
+        end
+
+        def collect(*froms)
+          add_load_path(@base) do
+            froms = ["."] if froms.empty?
+            test_suites = froms.collect do |from|
+              test_suite = collect_recursive(from, find_test_cases)
+              test_suite = nil if test_suite.tests.empty?
+              test_suite
+            end.compact
+
+            if test_suites.size > 1
+              test_suite = TestSuite.new("[#{froms.join(', ')}]")
+              sort(test_suites).each do |sub_test_suite|
+                test_suite << sub_test_suite
+              end
+              test_suite
+            else
+              test_suites.first
+            end
+          end
+        end
+
+        def find_test_cases(ignore=[])
+          test_cases = []
+          TestCase::DESCENDANTS.each do |test_case|
+            test_cases << test_case unless ignore.include?(test_case)
+          end
+          ignore.concat(test_cases)
+          test_cases
+        end
+
+        private
+        def collect_recursive(name, already_gathered)
+          sub_test_suites = []
+
+          path = resolve_path(name)
+          if path.directory?
+            directories, files = path.children.partition do |child|
+              child.directory?
+            end
+
+            files.each do |child|
+              next if excluded_file?(child.basename.to_s)
+              collect_file(child, sub_test_suites, already_gathered)
+            end
+
+            directories.each do |child|
+              next if excluded_directory?(child.basename.to_s)
+              sub_test_suite = collect_recursive(child, already_gathered)
+              sub_test_suites << sub_test_suite unless sub_test_suite.empty?
+            end
+          else
+            collect_file(path, sub_test_suites, already_gathered)
+          end
+
+          test_suite = TestSuite.new(path.basename.to_s)
+          sort(sub_test_suites).each do |sub_test_suite|
+            test_suite << sub_test_suite
+          end
+          test_suite
+        end
+
+        def collect_file(path, test_suites, already_gathered)
+          add_load_path(path.expand_path.dirname) do
+            require(path.to_s)
+            find_test_cases(already_gathered).each do |test_case|
+              add_suite(test_suites, test_case.suite)
+            end
+          end
+        end
+
+        def resolve_path(path)
+          if @base
+            @base + path
+          else
+            Pathname(path)
+          end
+        end
+
+        def add_load_path(path)
+          $LOAD_PATH.push(path.to_s) if path
+          yield
+        ensure
+          $LOAD_PATH.delete_at($LOAD_PATH.rindex(path.to_s)) if path
+        end
+
+        def excluded_directory?(base)
+          @system_directory_excludes.any? {|pattern| pattern =~ base}
+        end
+
+        def excluded_file?(base)
+          return true if @system_excludes.any? {|pattern| pattern =~ base}
+
+          patterns = @patterns || []
+          unless patterns.empty?
+            return true unless patterns.any? {|pattern| pattern =~ base}
+          end
+
+          excludes = @excludes || []
+          unless excludes.empty?
+            return true if excludes.any? {|pattern| pattern =~ base}
+          end
+
+          false
+        end
+      end
+    end
+  end
+end

data/lib/test/unit/color.rb

@@ -0,0 +1,61 @@
+module Test
+  module Unit
+    class Color
+      NAMES = ["black", "red", "green", "yellow",
+               "blue", "magenta", "cyan", "white"]
+      def initialize(name, options={})
+        @name = name
+        @foreground = options[:foreground]
+        @foreground = true if @foreground.nil?
+        @intensity = options[:intensity]
+        @bold = options[:bold]
+        @italic = options[:italic]
+        @underline = options[:underline]
+      end
+
+      def sequence
+        sequence = []
+        if @name == "none"
+        elsif @name == "reset"
+          sequence << "0"
+        else
+          foreground_parameter = @foreground ? 3 : 4
+          foreground_parameter += 6 if @intensity
+          sequence << "#{foreground_parameter}#{NAMES.index(@name)}"
+        end
+        sequence << "1" if @bold
+        sequence << "3" if @italic
+        sequence << "4" if @underline
+        sequence
+      end
+
+      def escape_sequence
+        "\e[#{sequence.join(';')}m"
+      end
+
+      def +(other)
+        MixColor.new([self, other])
+      end
+    end
+
+    class MixColor
+      def initialize(colors)
+        @colors = colors
+      end
+
+      def sequence
+        @colors.inject([]) do |result, color|
+          result + color.sequence
+        end
+      end
+
+      def escape_sequence
+        "\e[#{sequence.join(';')}m"
+      end
+
+      def +(other)
+        self.class.new([self, other])
+      end
+    end
+  end
+end