activeldap 1.1.0 → 1.2.0

data/test-unit/History.txt

@@ -1,4 +1,4 @@
-=== 2.0.3 / 2009-07-17
+=== 2.0.3 / 2009-07-19
 
 * 6 major enhancements
   * add assert_predicate.

data/test-unit/Manifest.txt

@@ -31,12 +31,14 @@ lib/test/unit/pending.rb
 lib/test/unit/priority.rb
 lib/test/unit/runner/console.rb
 lib/test/unit/runner/emacs.rb
+lib/test/unit/runner/tap.rb
 lib/test/unit/testcase.rb
 lib/test/unit/testresult.rb
 lib/test/unit/testsuite.rb
 lib/test/unit/ui/console/outputlevel.rb
 lib/test/unit/ui/console/testrunner.rb
 lib/test/unit/ui/emacs/testrunner.rb
+lib/test/unit/ui/tap/testrunner.rb
 lib/test/unit/ui/testrunner.rb
 lib/test/unit/ui/testrunnermediator.rb
 lib/test/unit/ui/testrunnerutilities.rb

data/test-unit/README.txt

@@ -7,7 +7,7 @@
 Test::Unit 2.x - Improved version of Test::Unit bundled in
 Ruby 1.8.x.
 
-Ruby 1.9.x bundles miniunit not Test::Unit. Test::Unit
+Ruby 1.9.x bundles minitest not Test::Unit. Test::Unit
 bundled in Ruby 1.8.x had not been improved but unbundled
 Test::Unit (Test::Unit 2.x) will be improved actively.
 

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

@@ -880,7 +880,7 @@ EOT
             MaybeContainer.new(value, &formatter)
           end
 
-          MAX_DIFF_TARGET_STRING_SIZE = 300
+          MAX_DIFF_TARGET_STRING_SIZE = 1000
           def diff_target_string?(string)
             if string.respond_to?(:bytesize)
               string.bytesize < MAX_DIFF_TARGET_STRING_SIZE

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

@@ -102,15 +102,23 @@ module Test
         @to_run = []
         @color_scheme = ColorScheme.default
         @runner_options = {}
+        @default_arguments = []
         @workdir = nil
-        default_config_file = "test-unit.yml"
-        load_config(default_config_file) if File.exist?(default_config_file)
+        config_file = "test-unit.yml"
+        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)
+        end
         yield(self) if block_given?
       end
 
       def process_args(args = ARGV)
+        default_arguments = @default_arguments.dup
         begin
-          options.order!(args) {|arg| @to_run << arg}
+          @default_arguments.concat(args)
+          options.order!(@default_arguments) {|arg| @to_run << arg}
         rescue OptionParser::ParseError => e
           puts e
           puts options
@@ -119,6 +127,8 @@ module Test
           @filters << proc{false} unless(@filters.empty?)
         end
         not @to_run.empty?
+      ensure
+        @default_arguments = default_arguments
       end
 
       def options
@@ -304,7 +314,11 @@ module Test
         (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
+          if key == :arguments
+            @default_arguments.concat(value.split)
+          else
+            runner_options[key.to_sym] = value
+          end
         end
         @runner_options = @runner_options.merge(runner_options)
       end
@@ -327,3 +341,4 @@ end
 
 require 'test/unit/runner/console'
 require 'test/unit/runner/emacs'
+require 'test/unit/runner/tap'

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

@@ -76,7 +76,9 @@ module Test
               sub_test_suites << sub_test_suite unless sub_test_suite.empty?
             end
           else
-            collect_file(path, sub_test_suites, already_gathered)
+            unless excluded_file?(path.basename.to_s)
+              collect_file(path, sub_test_suites, already_gathered)
+            end
           end
 
           test_suite = TestSuite.new(path.basename.to_s)

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

@@ -14,7 +14,11 @@ module Test
                             "omission" => Color.new("blue", :bold => true),
                             "notification" => Color.new("cyan", :bold => true),
                             "error" => Color.new("yellow", :bold => true) +
-                                       Color.new("black", :foreground => false))
+                                       Color.new("black", :foreground => false),
+                            "case" => Color.new("white", :bold => true) +
+                                       Color.new("blue", :foreground => false),
+                            "suite" => Color.new("white", :bold => true) +
+                                       Color.new("green", :foreground => false))
         end
 
         @@schemes = {}

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

@@ -69,18 +69,20 @@ module Test
         end
       end
 
+      NOT_PASS_THROUGH_EXCEPTIONS = []
       PASS_THROUGH_EXCEPTIONS = [NoMemoryError, SignalException, Interrupt,
                                  SystemExit]
       private
       def handle_all_exception(exception)
         case exception
+        when *NOT_PASS_THROUGH_EXCEPTIONS
         when *PASS_THROUGH_EXCEPTIONS
-          false
-        else
-          problem_occurred
-          add_error(exception)
-          true
+          return false
         end
+
+        problem_occurred
+        add_error(exception)
+        true
       end
 
       def add_error(exception)

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

@@ -0,0 +1,8 @@
+module Test
+  module Unit
+    AutoRunner.register_runner(:tap) do |auto_runner|
+      require 'test/unit/ui/tap/testrunner'
+      Test::Unit::UI::Tap::TestRunner
+    end
+  end
+end

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

@@ -1,7 +1,9 @@
 #--
 #
 # Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+# Copyright::
+#   * Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+#   * Copyright (c) 2008-2009 Kouhei Sutou <kou@clear-code.com>
 # License:: Ruby license.
 
 require 'test/unit/color-scheme'
@@ -36,6 +38,9 @@ module Test
             @progress_row_max = @options[:progress_row_max]
             @progress_row_max ||= guess_progress_row_max
             @already_outputted = false
+            @n_successes = 0
+            @indent = 0
+            @top_level = true
             @faults = []
           end
 
@@ -68,6 +73,8 @@ module Test
             @mediator.add_listener(TestRunnerMediator::FINISHED, &method(:finished))
             @mediator.add_listener(TestCase::STARTED, &method(:test_started))
             @mediator.add_listener(TestCase::FINISHED, &method(:test_finished))
+            @mediator.add_listener(TestSuite::STARTED, &method(:test_suite_started))
+            @mediator.add_listener(TestSuite::FINISHED, &method(:test_suite_finished))
           end
           
           def start_mediator
@@ -91,8 +98,6 @@ module Test
 
           def finished(elapsed_time)
             nl if output?(NORMAL) and !output?(VERBOSE)
-            nl
-            output("Finished in #{elapsed_time} seconds.")
             @faults.each_with_index do |fault, index|
               nl
               output_single("%3d) " % (index + 1))
@@ -101,25 +106,75 @@ module Test
               output(detail)
             end
             nl
+            output("Finished in #{elapsed_time} seconds.")
+            nl
             output(@result, result_color)
+            n_tests = @result.run_count
+            if n_tests.zero?
+              pass_percentage = 0
+            else
+              pass_percentage = 100.0 * (@n_successes / n_tests.to_f)
+            end
+            output("%g%% passed" % pass_percentage, result_color)
           end
 
           def format_fault(fault)
             fault.long_display
           end
-          
+
           def test_started(name)
-            output_single(name + ": ", nil, VERBOSE)
+            return unless output?(VERBOSE)
+
+            name = name.sub(/\(.+?\)\z/, '')
+            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)
+            output_single("#{indent}#{name}:#{tab_stop}", nil, VERBOSE)
+            @test_start = Time.now
           end
-          
+
           def test_finished(name)
             unless @already_outputted
+              @n_successes += 1
               output_progress(".", color("success"))
             end
-            nl(VERBOSE)
             @already_outputted = false
+
+            return unless output?(VERBOSE)
+
+            output(": (%f)" % (Time.now - @test_start), nil, VERBOSE)
           end
-          
+
+          def test_suite_started(name)
+            if @top_level
+              @top_level = false
+              return
+            end
+
+            output_single(indent, nil, VERBOSE)
+            if /\A[A-Z]/ =~ name
+              _color = color("case")
+            else
+              _color = color("suite")
+            end
+            output_single(name, _color, VERBOSE)
+            output(": ", nil, VERBOSE)
+            @indent += 2
+          end
+
+          def test_suite_finished(name)
+            @indent -= 2
+          end
+
+          def indent
+            if output?(VERBOSE)
+              " " * @indent
+            else
+              ""
+            end
+          end
+
           def nl(level=NORMAL)
             output("", nil, level)
           end

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

@@ -0,0 +1,92 @@
+#--
+#
+# Author:: Kouhei Sutou.
+# Copyright:: Copyright (c) 2009 Kouhei Sutou <kou@clear-code.com>.
+# License:: Ruby license.
+
+require 'test/unit/ui/testrunner'
+require 'test/unit/ui/testrunnermediator'
+
+module Test
+  module Unit
+    module UI
+      module Tap
+
+        # Runs a Test::Unit::TestSuite and outputs result
+        # as TAP format.
+        class TestRunner < UI::TestRunner
+          def initialize(suite, options={})
+            super
+            @output = @options[:output] || STDOUT
+            @n_tests = 0
+            @already_outputted = false
+          end
+
+          # Begins the test run.
+          def start
+            setup_mediator
+            result = start_mediator
+            def result.passed?
+              true # for prove commend :<
+            end
+            result
+          end
+
+          private
+          def setup_mediator
+            @mediator = TestRunnerMediator.new(@suite)
+            attach_to_mediator
+          end
+
+          def attach_to_mediator
+            @mediator.add_listener(TestResult::FAULT, &method(:add_fault))
+            @mediator.add_listener(TestRunnerMediator::STARTED, &method(:started))
+            @mediator.add_listener(TestRunnerMediator::FINISHED, &method(:finished))
+            @mediator.add_listener(TestCase::STARTED, &method(:test_started))
+            @mediator.add_listener(TestCase::FINISHED, &method(:test_finished))
+          end
+
+          def start_mediator
+            @mediator.run_suite
+          end
+
+          def add_fault(fault)
+            puts("not ok #{@n_tests} - #{fault.short_display}")
+            fault.long_display.each_line do |line|
+              puts("# #{line}")
+            end
+            @already_outputted = true
+          end
+
+          def started(result)
+            @result = result
+            puts("1..#{@suite.size}")
+          end
+
+          def finished(elapsed_time)
+            puts("# Finished in #{elapsed_time} seconds.")
+            @result.to_s.each_line do |line|
+              puts("# #{line}")
+            end
+          end
+
+          def test_started(name)
+            @n_tests += 1
+          end
+
+          def test_finished(name)
+            unless @already_outputted
+              puts("ok #{@n_tests} - #{name}")
+            end
+            @already_outputted = false
+          end
+
+          def puts(*args)
+            @output.puts(*args)
+            @output.flush
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -240,11 +240,7 @@ EOT
                      [:test, {:name => "test1_2"}]]],
                    @test_case1.to_s)
 
-    assert_collect([:suite, {:name => @no_load_sub_test_case5.basename.to_s},
-                    [:suite, {:name => _test_case_name("NoLoadSubTestCase5")},
-                     [:test, {:name => "test5_1"}],
-                     [:test, {:name => "test5_2"}]]],
-                   @no_load_sub_test_case5.to_s)
+    assert_collect(nil, @no_load_sub_test_case5.to_s)
   end
 
   def test_nil_pattern

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

@@ -8,6 +8,10 @@ class TestUnitColorScheme < Test::Unit::TestCase
                    "notification" => color("cyan", :bold => true),
                    "error" => color("yellow", :bold => true) +
                               color("black", :foreground => false),
+                   "case" => color("white", :bold => true) +
+                             color("blue", :foreground => false),
+                   "suite" => color("white", :bold => true) +
+                              color("green", :foreground => false),
                  },
                  Test::Unit::ColorScheme.default.to_hash)
   end

data/test/al-test-utils.rb

@@ -16,6 +16,7 @@ module AlTestUtils
   def self.included(base)
     base.class_eval do
       include ActiveLdap::GetTextSupport
+      include Utilities
       include Assertions
       include Config
       include Connection
@@ -26,6 +27,12 @@ module AlTestUtils
     end
   end
 
+  module Utilities
+    def dn(string)
+      ActiveLdap::DN.parse(string)
+    end
+  end
+
   module Assertions
     def assert_true(actual, *args)
       assert_equal(true, actual, *args)
@@ -183,12 +190,29 @@ module AlTestUtils
 
     def ou_class(prefix="")
       ou_class = Class.new(ActiveLdap::Base)
-      ou_class.ldap_mapping :dn_attribute => "ou",
+      ou_class.ldap_mapping(:dn_attribute => "ou",
                             :prefix => prefix,
-                            :classes => ["top", "organizationalUnit"]
+                            :classes => ["top", "organizationalUnit"])
       ou_class
     end
 
+    def dc_class(prefix="")
+      dc_class = Class.new(ActiveLdap::Base)
+      dc_class.ldap_mapping(:dn_attribute => "dc",
+                            :prefix => prefix,
+                            :classes => ["top", "dcObject", "organization"])
+      dc_class
+    end
+
+    def entry_class(prefix="")
+      entry_class = Class.new(ActiveLdap::Base)
+      entry_class.ldap_mapping(:prefix => prefix,
+                               :scope => :sub,
+                               :classes => ["top"])
+      entry_class.dn_attribute = nil
+      entry_class
+    end
+
     def populate_ou
       %w(Users Groups).each do |name|
         make_ou(name)
@@ -199,6 +223,10 @@ module AlTestUtils
       ActiveLdap::Populate.ensure_ou(name)
     end
 
+    def make_dc(name)
+      ActiveLdap::Populate.ensure_dc(name)
+    end
+
     def populate_user_class
       @user_class = Class.new(ActiveLdap::Base)
       @user_class_classes = ["posixAccount", "person"]