activeldap 1.0.1 → 1.0.2

data/test-unit/lib/test/unit/autorunner.rb

@@ -1,4 +1,5 @@
 require 'test/unit'
+require 'test/unit/color-scheme'
 require 'optparse'
 
 module Test
@@ -11,10 +12,24 @@ module Test
       class << self
         def register_runner(id, runner_builder=Proc.new)
           RUNNERS[id] = runner_builder
+          RUNNERS[id.to_s] = runner_builder
+        end
+
+        def runner(id)
+          RUNNERS[id.to_s]
         end
 
         def register_collector(id, collector_builder=Proc.new)
           COLLECTORS[id] = collector_builder
+          COLLECTORS[id.to_s] = collector_builder
+        end
+
+        def collector(id)
+          COLLECTORS[id.to_s]
+        end
+
+        def register_color_scheme(id, scheme)
+          ColorScheme[id] = scheme
         end
 
         def setup_option(option_builder=Proc.new)
@@ -76,6 +91,7 @@ module Test
 
       attr_reader :suite, :runner_options
       attr_accessor :filters, :to_run, :pattern, :exclude, :base, :workdir
+      attr_accessor :color_scheme
       attr_writer :runner, :collector
 
       def initialize(standalone)
@@ -85,8 +101,11 @@ module Test
         @collector = default_collector
         @filters = []
         @to_run = []
+        @color_scheme = ColorScheme.default
         @runner_options = {}
         @workdir = nil
+        default_config_file = "test-unit.yml"
+        load_config(default_config_file) if File.exist?(default_config_file)
         yield(self) if block_given?
       end
 
@@ -96,8 +115,7 @@ module Test
         rescue OptionParser::ParseError => e
           puts e
           puts options
-          $! = nil
-          abort
+          exit(false)
         else
           @filters << proc{false} unless(@filters.empty?)
         end
@@ -116,7 +134,7 @@ module Test
             @runner = r
           end
 
-          if(@standalone)
+          if (@standalone)
             o.on('-b', '--basedir=DIR', "Base directory of test suites.") do |b|
               @base = b
             end
@@ -169,13 +187,19 @@ module Test
           end
 
           priority_filter = Proc.new do |test|
-            Priority::Checker.new(test).need_to_run? or nil
+            if @filters.size > 2
+              nil
+            else
+              Priority::Checker.new(test).need_to_run? or nil
+            end
           end
           o.on("--[no-]priority-mode",
                "Runs some tests based on their priority.") do |priority_mode|
             if priority_mode
+              Priority.enable
               @filters |= [priority_filter]
             else
+              Priority.disable
               @filters -= [priority_filter]
             end
           end
@@ -185,6 +209,18 @@ module Test
             $LOAD_PATH.concat(dirs.split(File::PATH_SEPARATOR))
           end
 
+          color_schemes = ColorScheme.all
+          o.on("--color-scheme=SCHEME", color_schemes,
+               "Use SCHEME as color scheme.",
+               "(#{keyword_display(color_schemes)})") do |scheme|
+            @color_scheme = scheme
+          end
+
+          o.on("--config=FILE",
+               "Use YAML fomat FILE content as configuration file.") do |file|
+            load_config(file)
+          end
+
           ADDITIONAL_OPTIONS.each do |option_builder|
             option_builder.call(self, o)
           end
@@ -201,13 +237,13 @@ module Test
 
           o.on_tail('--console', 'Console runner (use --runner).') do
             warn("Deprecated option (--console).")
-            @runner = RUNNERS[:console]
+            @runner = self.class.runner(:console)
           end
 
           if RUNNERS[:fox]
             o.on_tail('--fox', 'Fox runner (use --runner).') do
               warn("Deprecated option (--fox).")
-              @runner = RUNNERS[:fox]
+              @runner = self.class.runner(:fox)
             end
           end
 
@@ -215,10 +251,12 @@ module Test
         end
       end
 
-      def keyword_display(array)
-        list = array.collect {|e, *| e.to_s}
-        Array === array or list.sort!
-        list.collect {|e| e.sub(/^(.)([A-Za-z]+)(?=\w*$)/, '\\1[\\2]')}.join(", ")
+      def keyword_display(keywords)
+        keywords.collect do |keyword, _|
+          keyword.to_s
+        end.uniq.sort.collect do |keyword|
+          keyword.sub(/^(.)([A-Za-z]+)(?=\w*$)/, '\\1[\\2]')
+        end.join(", ")
       end
 
       def run
@@ -226,21 +264,40 @@ module Test
         return false if suite.nil?
         runner = @runner[self]
         return false if runner.nil?
+        @runner_options[:color_scheme] ||= @color_scheme
         Dir.chdir(@workdir) if @workdir
         runner.run(suite, @runner_options).passed?
       end
 
+      def load_config(file)
+        require 'yaml'
+        config = YAML.load(File.read(file))
+        runner_name = config["runner"]
+        @runner = self.class.runner(runner_name) || @runner
+        @collector = self.class.collector(config["collector"]) || @collector
+        (config["color_schemes"] || {}).each do |name, options|
+          ColorScheme[name] = options
+        end
+        runner_options = {}
+        (config["#{runner_name}_options"] || {}).each do |key, value|
+          key = key.to_sym
+          value = ColorScheme[value] if key == :color_scheme
+          runner_options[key.to_sym] = value
+        end
+        @runner_options = @runner_options.merge(runner_options)
+      end
+
       private
       def default_runner
         if ENV["EMACS"] == "t"
-          RUNNERS[:emacs]
+          self.class.runner(:emacs)
         else
-          RUNNERS[:console]
+          self.class.runner(:console)
         end
       end
 
       def default_collector
-        COLLECTORS[@standalone ? :load : :descendant]
+        self.class.collector(@standalone ? :load : :descendant)
       end
     end
   end

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

@@ -36,7 +36,7 @@ module Test
       end
 
       def sort(suites)
-        suites.sort_by{|s| s.name}
+        suites.sort_by {|suite| suite.name || suite.to_s}
       end
     end
   end

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

@@ -15,7 +15,7 @@ module Test
           super
           @system_excludes = [/~\z/, /\A\.\#/]
           @system_directory_excludes = [/\A(?:CVS|\.svn)\z/]
-          @patterns = [/\Atest_.+\.rb\z/m]
+          @patterns = [/\Atest[_\-].+\.rb\z/m]
           @excludes = []
           @base = nil
         end

data/test-unit/lib/test/unit/color-scheme.rb

@@ -0,0 +1,86 @@
+require 'test/unit/color'
+
+module Test
+  module Unit
+    class ColorScheme
+      include Enumerable
+
+      class << self
+        @@default = nil
+        def default
+          @@default ||= new("success" => Color.new("green", :bold => true),
+                            "failure" => Color.new("red", :bold => true),
+                            "pending" => Color.new("magenta", :bold => true),
+                            "omission" => Color.new("blue", :bold => true),
+                            "notification" => Color.new("cyan", :bold => true),
+                            "error" => Color.new("yellow", :bold => true) +
+                                       Color.new("black", :foreground => false))
+        end
+
+        @@schemes = {}
+        def all
+          @@schemes.merge("default" => default)
+        end
+
+        def [](id)
+          @@schemes[id.to_s]
+        end
+
+        def []=(id, scheme_or_spec)
+          if scheme_or_spec.is_a?(self)
+            scheme = scheme_or_spec
+          else
+            scheme = new(scheme_or_spec)
+          end
+          @@schemes[id.to_s] = scheme
+        end
+      end
+
+      def initialize(scheme_spec)
+        @scheme = {}
+        scheme_spec.each do |key, color_spec|
+          self[key] = color_spec
+        end
+      end
+
+      def [](name)
+        @scheme[name.to_s]
+      end
+
+      def []=(name, color_spec)
+        @scheme[name.to_s] = make_color(color_spec)
+      end
+
+      def each(&block)
+        @scheme.each(&block)
+      end
+
+      def to_hash
+        hash = {}
+        @scheme.each do |key, color|
+          hash[key] = color
+        end
+        hash
+      end
+
+      private
+      def make_color(color_spec)
+        if color_spec.is_a?(Color) or color_spec.is_a?(MixColor)
+          color_spec
+        else
+          color_name = nil
+          normalized_color_spec = {}
+          color_spec.each do |key, value|
+            key = key.to_sym
+            if key == :name
+              color_name = value
+            else
+              normalized_color_spec[key] = value
+            end
+          end
+          Color.new(color_name, normalized_color_spec)
+        end
+      end
+    end
+  end
+end

data/test-unit/lib/test/unit/color.rb

@@ -3,6 +3,8 @@ module Test
     class Color
       NAMES = ["black", "red", "green", "yellow",
                "blue", "magenta", "cyan", "white"]
+
+      attr_reader :name
       def initialize(name, options={})
         @name = name
         @foreground = options[:foreground]
@@ -13,19 +15,47 @@ module Test
         @underline = options[:underline]
       end
 
+      def foreground?
+        @foreground
+      end
+
+      def intensity?
+        @intensity
+      end
+
+      def bold?
+        @bold
+      end
+
+      def italic?
+        @italic
+      end
+
+      def underline?
+        @underline
+      end
+
+      def ==(other)
+        self.class === other and
+          [name, foreground?, intensity?,
+           bold?, italic?, underline?] ==
+          [other.name, other.foreground?, other.intensity?,
+           other.bold?, other.italic?, other.underline?]
+      end
+
       def sequence
         sequence = []
         if @name == "none"
         elsif @name == "reset"
           sequence << "0"
         else
-          foreground_parameter = @foreground ? 3 : 4
-          foreground_parameter += 6 if @intensity
+          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 << "1" if bold?
+        sequence << "3" if italic?
+        sequence << "4" if underline?
         sequence
       end
 
@@ -39,6 +69,7 @@ module Test
     end
 
     class MixColor
+      attr_reader :colors
       def initialize(colors)
         @colors = colors
       end
@@ -56,6 +87,10 @@ module Test
       def +(other)
         self.class.new([self, other])
       end
+
+      def ==(other)
+        self.class === other and colors == other.colors
+      end
     end
   end
 end

data/test-unit/lib/test/unit/diff.rb

@@ -507,6 +507,20 @@ module Test
       end
 
       module_function
+      def need_fold?(diff)
+        /^[-+].{79}/ =~ diff
+      end
+
+      def fold(string)
+        string.split(/\r?\n/).collect do |line|
+          line.gsub(/(.{78})/, "\\1\n")
+        end.join("\n")
+      end
+
+      def folded_readable(from, to, options={})
+        readable(fold(from), fold(to), options)
+      end
+
       def readable(from, to, options={})
         diff(ReadableDiffer, from, to, options)
       end

data/test-unit/lib/test/unit/fixture.rb

@@ -90,17 +90,14 @@ module Test
         end
 
         def add_fixture_method_name(how, variable_name, method_name)
-          unless self.instance_variable_defined?(variable_name)
-            self.instance_variable_set(variable_name, [])
-          end
-          methods = self.instance_variable_get(variable_name)
+          methods = instance_eval("#{variable_name} ||= []")
 
           if how == :prepend
             methods = [method_name] | methods
           else
             methods = methods | [method_name]
           end
-          self.instance_variable_set(variable_name, methods)
+          instance_variable_set(variable_name, methods)
         end
 
         def registered_methods_variable_name(fixture, order)
@@ -144,19 +141,13 @@ module Test
           interested_ancestors.inject([]) do |result, ancestor|
             if ancestor.is_a?(Class)
               ancestor.class_eval do
-                methods = []
-                unregistered_methods = []
-                if instance_variable_defined?(methods_variable)
-                  methods = instance_variable_get(methods_variable)
-                end
-                if instance_variable_defined?(unregistered_methods_variable)
-                  unregistered_methods =
-                    instance_variable_get(unregistered_methods_variable)
-                end
-                result + methods - unregistered_methods
+                methods = instance_eval("#{methods_variable} ||= []")
+                unregistered_methods =
+                  instance_eval("#{unregistered_methods_variable} ||= []")
+                (result | methods) - unregistered_methods
               end
             else
-              []
+              result
             end
           end
         end

data/test-unit/lib/test/unit/notification.rb

@@ -56,6 +56,15 @@ module Test
         end
       end
 
+      # Notify some information.
+      #
+      # Example:
+      #   def test_notification
+      #     notify("I'm here!")
+      #     # Reached here
+      #     notify("Special!") if special_case?
+      #     # Reached here too
+      #   end
       def notify(message, &block)
         notification = Notification.new(name, filter_backtrace(caller), message)
         add_notification(notification)