activeldap 1.2.1 → 1.2.2

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

@@ -117,27 +117,21 @@ module Test
         if File.exist?(config_file)
           load_config(config_file)
         else
-          global_config_file = File.expand_path("~/.test-unit.xml")
-          load_config(global_config_file) if File.exist?(global_config_file)
+          load_global_config
         end
         yield(self) if block_given?
       end
 
       def process_args(args = ARGV)
-        default_arguments = @default_arguments.dup
         begin
-          @default_arguments.concat(args)
-          options.order!(@default_arguments) {|arg| @to_run << arg}
+          args.unshift(*@default_arguments)
+          options.order!(args) {|arg| @to_run << arg}
         rescue OptionParser::ParseError => e
           puts e
           puts options
           exit(false)
-        else
-          @filters << proc{false} unless(@filters.empty?)
         end
         not @to_run.empty?
-      ensure
-        @default_arguments = default_arguments
       end
 
       def options
@@ -186,9 +180,9 @@ module Test
             n = (%r{\A/(.*)/\Z} =~ n ? Regexp.new($1) : n)
             case n
             when Regexp
-              @filters << proc{|t| n =~ t.method_name ? true : nil}
+              @filters << proc{|t| n =~ t.method_name ? true : false}
             else
-              @filters << proc{|t| n == t.method_name ? true : nil}
+              @filters << proc{|t| n == t.method_name}
             end
           end
 
@@ -198,17 +192,17 @@ module Test
             n = (%r{\A/(.*)/\Z} =~ n ? Regexp.new($1) : n)
             case n
             when Regexp
-              @filters << proc{|t| n =~ t.class.name ? true : nil}
+              @filters << proc{|t| n =~ t.class.name ? true : false}
             else
-              @filters << proc{|t| n == t.class.name ? true : nil}
+              @filters << proc{|t| n == t.class.name}
             end
           end
 
           priority_filter = Proc.new do |test|
-            if @filters.size > 2
-              nil
+            if @filters == [priority_filter]
+              Priority::Checker.new(test).need_to_run?
             else
-              Priority::Checker.new(test).need_to_run? or nil
+              nil
             end
           end
           o.on("--[no-]priority-mode",
@@ -346,6 +340,17 @@ module Test
       def default_collector
         self.class.collector(@standalone ? :load : :descendant)
       end
+
+      def global_config_file
+        File.expand_path("~/.test-unit.yml")
+      rescue ArgumentError
+        nil
+      end
+
+      def load_global_config
+        file = global_config_file
+        load_config(file) if file and File.exist?(file)
+      end
     end
   end
 end

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

@@ -23,14 +23,7 @@ module Test
       def include?(test)
         return true if(@filters.empty?)
         @filters.each do |filter|
-          result = filter[test]
-          if(result.nil?)
-            next
-          elsif(!result)
-            return false
-          else
-            return true
-          end
+          return false if filter[test] == false
         end
         true
       end

data/test-unit/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 /\A(?:CVS|\.svn)\z/ =~ e
+                next if /\A(?:CVS|\.svn|\.git)\z/ =~ e
                 sub_suite = recursive_collect(e_name, already_gathered)
                 sub_suites << sub_suite unless(sub_suite.empty?)
               else

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

@@ -14,8 +14,8 @@ module Test
         def initialize
           super
           @system_excludes = [/~\z/, /\A\.\#/]
-          @system_directory_excludes = [/\A(?:CVS|\.svn)\z/]
-          @patterns = [/\Atest[_\-].+\.rb\z/m]
+          @system_directory_excludes = [/\A(?:CVS|\.svn|\.git)\z/]
+          @patterns = [/\Atest[_\-].+\.rb\z/m, /[_\-]test\.rb\z/]
           @excludes = []
           @base = nil
         end
@@ -28,11 +28,17 @@ module Test
         def collect(*froms)
           add_load_path(@base) do
             froms = ["."] if froms.empty?
-            test_suites = froms.collect do |from|
-              test_suite = collect_recursive(resolve_path(from), find_test_cases)
-              test_suite = nil if test_suite.tests.empty?
-              test_suite
-            end.compact
+            test_suites = []
+            already_gathered = find_test_cases
+            froms.each do |from|
+              from = resolve_path(from)
+              if from.directory?
+                test_suite = collect_recursive(from, already_gathered)
+                test_suites << test_suite unless test_suite.tests.empty?
+              else
+                collect_file(from, test_suites, already_gathered)
+              end
+            end
 
             if test_suites.size > 1
               test_suite = TestSuite.new("[#{froms.join(', ')}]")
@@ -88,6 +94,8 @@ module Test
         end
 
         def collect_file(path, test_suites, already_gathered)
+          @program_file ||= File.expand_path($0)
+          return if @program_file == path.to_s
           add_load_path(path.expand_path.dirname) do
             require(path.to_s)
             find_test_cases(already_gathered).each do |test_case|

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

@@ -8,8 +8,12 @@ module Test
       class << self
         @@default = nil
         def default
-          @@default ||= new("success" => Color.new("green", :bold => true),
-                            "failure" => Color.new("red", :bold => true),
+          @@default ||= new("success" =>
+                              Color.new("green", :foreground => false) +
+                              Color.new("white", :bold => true),
+                            "failure" =>
+                              Color.new("red", :foreground => false) +
+                              Color.new("white", :bold => true),
                             "pending" => Color.new("magenta", :bold => true),
                             "omission" => Color.new("blue", :bold => true),
                             "notification" => Color.new("cyan", :bold => true),

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

@@ -1,4 +1,11 @@
 # port of Python's difflib.
+#
+# Copyright (c) 2001-2008 Python Software Foundation; All Rights Reserved
+# Copyright (c) 2008-2010 Kouhei Sutou; All Rights Reserved
+#
+# It is free software, and is distributed under the Ruby
+# license and/or the PSF license. See the COPYING file and
+# PSFL file.
 
 module Test
   module Unit
@@ -717,7 +724,16 @@ module Test
 
       def diff(differ_class, from, to, options={})
         differ = differ_class.new(from.split(/\r?\n/), to.split(/\r?\n/))
-        differ.diff(options).join("\n")
+        lines = differ.diff(options)
+        if Object.const_defined?(:EncodingError)
+          begin
+            lines.join("\n")
+          rescue EncodingError
+            lines.collect {|line| line.force_encoding("ASCII-8BIT")}.join("\n")
+          end
+        else
+          lines.join("\n")
+        end
       end
     end
   end

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

@@ -60,6 +60,10 @@ module Test
       def to_s
         long_display
       end
+
+      def critical?
+        true
+      end
     end
 
     module ErrorHandler

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

@@ -59,6 +59,10 @@ module Test
         long_display
       end
 
+      def critical?
+        true
+      end
+
       def diff
         @diff ||= compute_diff
       end

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

@@ -41,6 +41,10 @@ module Test
       def to_s
         long_display
       end
+
+      def critical?
+        false
+      end
     end
 
     class NotifiedError < StandardError
@@ -79,16 +83,16 @@ module Test
     module NotificationHandler
       class << self
         def included(base)
-          base.exception_handler(:handle_Notified_error)
+          base.exception_handler(:handle_notified_error)
         end
       end
 
       private
-      def handle_Notified_error(exception)
+      def handle_notified_error(exception)
         return false unless exception.is_a?(NotifiedError)
         notification = Notification.new(name,
-                                filter_backtrace(exception.backtrace),
-                                exception.message)
+                                        filter_backtrace(exception.backtrace),
+                                        exception.message)
         add_notification(notification)
         true
       end

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

@@ -41,6 +41,10 @@ module Test
       def to_s
         long_display
       end
+
+      def critical?
+        true
+      end
     end
 
     class OmittedError < StandardError

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

@@ -41,6 +41,10 @@ module Test
       def to_s
         long_display
       end
+
+      def critical?
+        true
+      end
     end
 
     class PendedError < StandardError

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

@@ -1,6 +1,3 @@
-require "fileutils"
-require "tmpdir"
-
 module Test
   module Unit
     module Priority
@@ -20,6 +17,8 @@ module Test
         end
 
         def enable
+          require "fileutils"
+          require "tmpdir"
           @@enabled = true
         end
 

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

@@ -19,6 +19,7 @@ require 'test/unit/priority'
 require 'test/unit/testsuite'
 require 'test/unit/assertionfailederror'
 require 'test/unit/util/backtracefilter'
+require 'test/unit/util/output'
 require 'test/unit/util/method-owner-finder'
 
 module Test
@@ -82,6 +83,7 @@ module Test
       include Priority
       include Assertions
       include Util::BacktraceFilter
+      include Util::Output
 
       STARTED = name + "::STARTED" # :nodoc:
       FINISHED = name + "::FINISHED" # :nodoc:
@@ -94,10 +96,15 @@ module Test
           DESCENDANTS << sub_class
         end
 
-        @@added_methods = []
+        @@added_methods = {}
         def method_added(name) # :nodoc:
           super
-          @@added_methods << name.to_s
+          added_methods = (@@added_methods[self] ||= [])
+          stringified_name = name.to_s
+          if added_methods.include?(stringified_name)
+            attribute(:redefined, true, {}, stringified_name)
+          end
+          added_methods << stringified_name
         end
 
         # Rolls up all of the test* methods in the fixture into
@@ -191,12 +198,12 @@ module Test
         def shutdown
         end
 
-        @@test_order = AVAILABLE_ORDERS.first
+        @@test_orders = {}
 
         # Returns the current test order. This returns
         # +:alphabetic+ by default.
         def test_order
-          @@test_order
+          @@test_orders[self] || AVAILABLE_ORDERS.first
         end
 
         # Sets the current test order.
@@ -209,7 +216,7 @@ module Test
         # [:defined]
         #   Tests are sorted in defined order.
         def test_order=(order)
-          @@test_order = order
+          @@test_orders[self] = order
         end
 
         # Defines a test in declarative syntax.
@@ -266,9 +273,10 @@ module Test
         end
 
         def sort_test_names_in_defined_order(test_names)
+          added_methods = @@added_methods[self]
           test_names.sort do |test1, test2|
-            test1_defined_order = @@added_methods.index(test1)
-            test2_defined_order = @@added_methods.index(test2)
+            test1_defined_order = added_methods.index(test1)
+            test2_defined_order = added_methods.index(test2)
             if test1_defined_order and test2_defined_order
               test1_defined_order <=> test2_defined_order
             elsif test1_defined_order
@@ -438,6 +446,9 @@ module Test
       end
 
       def run_test
+        if self.class.get_attribute(@method_name, :redefined)
+          notify("#{self.class}\##{@method_name} was redefined")
+        end
         __send__(@method_name)
       end
 

data/test-unit/lib/test/unit/ui/console/testrunner.rb

@@ -39,6 +39,7 @@ module Test
             @progress_row_max ||= guess_progress_row_max
             @already_outputted = false
             @n_successes = 0
+            @n_omissions = 0
             @indent = 0
             @top_level = true
             @faults = []
@@ -84,7 +85,8 @@ module Test
           def add_fault(fault)
             @faults << fault
             output_progress(fault.single_character_display, fault_color(fault))
-            @already_outputted = true
+            @n_omissions += 1 if fault.is_a?(Omission)
+            @already_outputted = true if fault.critical?
           end
           
           def started(result)
@@ -107,7 +109,7 @@ module Test
             output("Finished in #{elapsed_time} seconds.")
             nl
             output(@result, result_color)
-            n_tests = @result.run_count
+            n_tests = @result.run_count - @n_omissions
             if n_tests.zero?
               pass_percentage = 0
             else
@@ -186,7 +188,7 @@ module Test
             right_space = 8 * 2
             left_space = @progress_row_max - right_space
             left_space = left_space - indent.size - name.size
-            tab_stop = "\t" * ((left_space - 1) / 8)
+            tab_stop = "\t" * ([left_space - 1, 0].max / 8)
             output_single("#{indent}#{name}:#{tab_stop}", nil, VERBOSE)
             @test_start = Time.now
           end

data/test-unit/lib/test/unit/util/backtracefilter.rb

@@ -9,6 +9,7 @@ module Test
         module_function
         def filter_backtrace(backtrace, prefix=nil)
           return ["No backtrace"] unless(backtrace)
+          return backtrace if ENV["TEST_UNIT_ALL_BACKTRACE"]
           split_p = if(prefix)
             prefix.split(TESTUNIT_FILE_SEPARATORS)
           else

data/test-unit/lib/test/unit/util/output.rb

@@ -0,0 +1,31 @@
+module Test
+  module Unit
+    module Util
+      module Output
+        ##
+        # Returns output for standard output and standard
+        # error as string.
+        #
+        # Example:
+        #   capture_output do
+        #     puts("stdout")
+        #     warn("stderr")
+        #   end # -> ["stdout\n", "stderr\n"]
+        def capture_output
+          require 'stringio'
+
+          output = StringIO.new
+          error = StringIO.new
+          stdout_save, stderr_save = $stdout, $stderr
+          $stdout, $stderr = output, error
+          begin
+            yield
+            [output.string, error.string]
+          ensure
+            $stdout, $stderr = stdout_save, stderr_save
+          end
+        end
+      end
+    end
+  end
+end