activeldap 1.0.1 → 1.0.2

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

@@ -56,6 +56,20 @@ module Test
         end
       end
 
+      # Omit the test of part of the test.
+      #
+      # Example:
+      #   def test_omission
+      #     omit
+      #     # Not reached here
+      #   end
+      #
+      #   def test_omission_with_here
+      #     omit do
+      #       # Not ran here
+      #     end
+      #     # Reached here
+      #   end
       def omit(message=nil, &block)
         message ||= "omitted."
         if block_given?

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

@@ -56,6 +56,22 @@ module Test
         end
       end
 
+      # Marks the test or part of the test is pending.
+      #
+      # Example:
+      #   def test_pending
+      #     pend
+      #     # Not reached here
+      #   end
+      #
+      #   def test_pending_with_here
+      #     pend do
+      #       # Ran here
+      #       # Fails if the block doesn't raise any error.
+      #       # Because it means the block is passed unexpectedly.
+      #     end
+      #     # Reached here
+      #   end
       def pend(message=nil, &block)
         message ||= "pended."
         if block_given?

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

@@ -13,6 +13,19 @@ module Test
             teardown :priority_teardown, :after => :append
           end
         end
+
+        @@enabled = false
+        def enabled?
+          @@enabled
+        end
+
+        def enable
+          @@enabled = true
+        end
+
+        def disable
+          @@enabled = false
+        end
       end
 
       class Checker
@@ -90,7 +103,7 @@ module Test
         def result_dir
           components = [".test-result",
                         @test.class.name || "AnonymousTestCase",
-                        @test.method_name.to_s]
+                        escaped_method_name]
           parent_directories = [File.dirname($0), Dir.pwd]
           if Process.respond_to?(:uid)
             parent_directories << File.join(Dir.tmpdir, Process.uid.to_s)
@@ -112,7 +125,7 @@ module Test
         end
 
         def escaped_method_name
-          @method_name.to_s.gsub(/[!?=]$/) do |matched|
+          @test.method_name.to_s.gsub(/[!?=]$/) do |matched|
             case matched
             when "!"
               ".destructive"
@@ -135,10 +148,12 @@ module Test
       end
 
       def priority_setup
+        return unless Priority.enabled?
         Checker.new(self).setup
       end
 
       def priority_teardown
+        return unless Priority.enabled?
         Checker.new(self).teardown
       end
     end

data/test-unit/lib/test/unit/runner/console.rb

@@ -31,8 +31,8 @@ module Test
         ["true", true],
       ]
       opts.on("--[no-]use-color=[auto]", use_color_options,
-              "Use color output",
-              "(default is auto") do |use_color|
+              "Uses color output",
+              "(default is auto)") do |use_color|
         case use_color
         when nil
           use_color = true
@@ -41,6 +41,12 @@ module Test
         end
         auto_runner.runner_options[:use_color] = use_color
       end
+
+      opts.on("--progress-row-max=MAX", Integer,
+              "Uses MAX as max terminal width for progress mark",
+              "(default is auto)") do |max|
+        auto_runner.runner_options[:progress_row_max] = max
+      end
     end
   end
 end

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

@@ -17,6 +17,7 @@ require 'test/unit/priority'
 require 'test/unit/testsuite'
 require 'test/unit/assertionfailederror'
 require 'test/unit/util/backtracefilter'
+require 'test/unit/util/method-owner-finder'
 
 module Test
   module Unit
@@ -26,6 +27,47 @@ module Test
     # wrapping those tests into a suite. It also does the
     # nitty-gritty of actually running an individual test and
     # collecting its results into a Test::Unit::TestResult object.
+    #
+    # You can run two hooks before/after a TestCase run.
+    #
+    # Example:
+    #   class TestMyClass < Test::Unit::TestCase
+    #     class << self
+    #       def startup
+    #         ...
+    #       end
+    #
+    #       def shutdown
+    #         ...
+    #       end
+    #     end
+    #
+    #     def setup
+    #       ...
+    #     end
+    #
+    #     def teardown
+    #       ...
+    #     end
+    #
+    #     def test_my_method1
+    #       ...
+    #     end
+    #
+    #     def test_my_method2
+    #       ...
+    #     end
+    #   end
+    #
+    # Here is a call order:
+    #  * startup
+    #  * setup
+    #  * test_my_method1
+    #  * teardown
+    #  * setup
+    #  * test_my_method2
+    #  * teardown
+    #  * shutdown
     class TestCase
       include Attribute
       include Fixture
@@ -68,6 +110,79 @@ module Test
           end
           suite
         end
+
+        # Called before every test case runs. Can be used
+        # to set up fixture information used in test case
+        # scope.
+        #
+        # Here is an example test case:
+        #   class TestMyClass < Test::Unit::TestCase
+        #     class << self
+        #       def startup
+        #         ...
+        #       end
+        #     end
+        #
+        #     def setup
+        #       ...
+        #     end
+        #
+        #     def test_my_class1
+        #       ...
+        #     end
+        #
+        #     def test_my_class2
+        #       ...
+        #     end
+        #   end
+        #
+        # Here is a call order:
+        #   * startup
+        #   * setup
+        #   * test_my_class1 (or test_my_class2)
+        #   * setup
+        #   * test_my_class2 (or test_my_class1)
+        #
+        # Note that you should not assume test order. Tests
+        # should be worked in any order.
+        def startup
+        end
+
+        # Called after every test case runs. Can be used to tear
+        # down fixture information used in test case scope.
+        #
+        # Here is an example test case:
+        #   class TestMyClass < Test::Unit::TestCase
+        #     class << self
+        #       def shutdown
+        #         ...
+        #       end
+        #     end
+        #
+        #     def teardown
+        #       ...
+        #     end
+        #
+        #     def test_my_class1
+        #       ...
+        #     end
+        #
+        #     def test_my_class2
+        #       ...
+        #     end
+        #   end
+        #
+        # Here is a call order:
+        #   * test_my_class1 (or test_my_class2)
+        #   * teardown
+        #   * test_my_class2 (or test_my_class1)
+        #   * teardown
+        #   * shutdown
+        #
+        # Note that you should not assume test order. Tests
+        # should be worked in any order.
+        def shutdown
+        end
       end
 
       attr_reader :method_name
@@ -76,9 +191,15 @@ module Test
       # test represented by test_method_name.
       def initialize(test_method_name)
         throw :invalid_test unless respond_to?(test_method_name)
-        throw :invalid_test if method(test_method_name).arity > 0
+        test_method = method(test_method_name)
+        throw :invalid_test if test_method.arity > 0
+        owner = Util::MethodOwnerFinder.find(self, test_method_name)
+        if owner.class != Module and self.class != owner
+          throw :invalid_test
+        end
         @method_name = test_method_name
         @test_passed = true
+        @interrupted = false
       end
 
       # Runs the individual test method represented by this
@@ -90,8 +211,9 @@ module Test
           yield(STARTED, name)
           begin
             run_setup
-            __send__(@method_name)
+            run_test
           rescue Exception
+            @interrupted = true
             raise unless handle_exception($!)
           ensure
             begin
@@ -109,11 +231,67 @@ module Test
 
       # Called before every test method runs. Can be used
       # to set up fixture information.
+      #
+      # You can add additional setup tasks by the following
+      # code:
+      #   class TestMyClass < Test::Unit::TestCase
+      #     def setup
+      #       ...
+      #     end
+      #
+      #     setup
+      #     def my_setup1
+      #       ...
+      #     end
+      #
+      #     setup
+      #     def my_setup2
+      #       ...
+      #     end
+      #
+      #     def test_my_class
+      #       ...
+      #     end
+      #   end
+      #
+      # Here is a call order:
+      #   * setup
+      #   * my_setup1
+      #   * my_setup2
+      #   * test_my_class
       def setup
       end
 
       # Called after every test method runs. Can be used to tear
       # down fixture information.
+      #
+      # You can add additional teardown tasks by the following
+      # code:
+      #   class TestMyClass < Test::Unit::TestCase
+      #     def teardown
+      #       ...
+      #     end
+      #
+      #     teardown
+      #     def my_teardown1
+      #       ...
+      #     end
+      #
+      #     teardown
+      #     def my_teardown2
+      #       ...
+      #     end
+      #
+      #     def test_my_class
+      #       ...
+      #     end
+      #   end
+      #
+      # Here is a call order:
+      #   * test_my_class
+      #   * my_teardown2
+      #   * my_teardown1
+      #   * teardown
       def teardown
       end
       
@@ -143,11 +321,19 @@ module Test
         self.class == other.class
       end
 
+      def interrupted?
+        @interrupted
+      end
+
       private
       def current_result
         @_result
       end
 
+      def run_test
+        __send__(@method_name)
+      end
+
       def handle_exception(exception)
         self.class.exception_handlers.each do |handler|
           return true if send(handler, exception)

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

@@ -4,7 +4,7 @@
 # Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
 # License:: Ruby license.
 
-require 'test/unit/color'
+require 'test/unit/color-scheme'
 require 'test/unit/ui/testrunner'
 require 'test/unit/ui/testrunnermediator'
 require 'test/unit/ui/console/outputlevel'
@@ -18,17 +18,6 @@ module Test
         class TestRunner < UI::TestRunner
           include OutputLevel
 
-          COLOR_SCHEMES = {
-            :default => {
-              "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),
-            },
-          }
-
           # Creates a new TestRunner for running the passed
           # suite. If quiet_mode is true, the output while
           # running is limited to progress dots, errors and
@@ -41,8 +30,11 @@ module Test
             @output = @options[:output] || STDOUT
             @use_color = @options[:use_color]
             @use_color = guess_color_availability if @use_color.nil?
-            @color_scheme = COLOR_SCHEMES[:default]
+            @color_scheme = @options[:color_scheme] || ColorScheme.default
             @reset_color = Color.new("reset")
+            @progress_row = 0
+            @progress_row_max = @options[:progress_row_max]
+            @progress_row_max ||= guess_progress_row_max
             @already_outputted = false
             @faults = []
           end
@@ -84,9 +76,7 @@ module Test
           
           def add_fault(fault)
             @faults << fault
-            output_single(fault.single_character_display,
-                          fault_color(fault),
-                          PROGRESS_ONLY)
+            output_progress(fault.single_character_display, fault_color(fault))
             @already_outputted = true
           end
           
@@ -124,7 +114,7 @@ module Test
           
           def test_finished(name)
             unless @already_outputted
-              output_single(".", @color_scheme["success"], PROGRESS_ONLY)
+              output_progress(".", color("success"))
             end
             nl(VERBOSE)
             @already_outputted = false
@@ -141,7 +131,7 @@ module Test
           end
           
           def output_single(something, color=nil, level=NORMAL)
-            return unless output?(level)
+            return false unless output?(level)
             if @use_color and color
               something = "%s%s%s" % [color.escape_sequence,
                                       something,
@@ -149,31 +139,47 @@ module Test
             end
             @output.write(something)
             @output.flush
+            true
           end
-          
+
+          def output_progress(mark, color=nil)
+            if output_single(mark, color, PROGRESS_ONLY)
+              return unless @progress_row_max > 0
+              @progress_row += mark.size
+              if @progress_row >= @progress_row_max
+                nl unless @output_level == VERBOSE
+                @progress_row = 0
+              end
+            end
+          end
+
           def output?(level)
             level <= @output_level
           end
 
+          def color(name)
+            @color_scheme[name] || ColorScheme.default[name]
+          end
+
           def fault_color(fault)
-            @color_scheme[fault.class.name.split(/::/).last.downcase]
+            color(fault.class.name.split(/::/).last.downcase)
           end
 
           def result_color
             if @result.passed?
               if @result.pending_count > 0
-                @color_scheme["pending"]
+                color("pending")
               elsif @result.omission_count > 0
-                @color_scheme["omission"]
+                color("omission")
               elsif @result.notification_count > 0
-                @color_scheme["notification"]
+                color("notification")
               else
-                @color_scheme["success"]
+                color("success")
               end
             elsif @result.error_count > 0
-              @color_scheme["error"]
+              color("error")
             elsif @result.failure_count > 0
-              @color_scheme["failure"]
+              color("failure")
             end
           end
 
@@ -184,6 +190,25 @@ module Test
             return true if ENV["EMACS"] == "t"
             false
           end
+
+          def guess_progress_row_max
+            term_width = guess_term_width
+            if term_width.zero?
+              if ENV["EMACS"] == "t"
+                -1
+              else
+                79
+              end
+            else
+              term_width
+            end
+          end
+
+          def guess_term_width
+            Integer(ENV["TERM_WIDTH"] || 0)
+          rescue ArgumentError
+            0
+          end
         end
       end
     end