activeldap 1.0.9 → 1.1.0

data/test-unit/History.txt

@@ -1,3 +1,29 @@
+=== 2.0.3 / 2009-07-17
+
+* 6 major enhancements
+  * add assert_predicate.
+  * add assert_not_predicate.
+  * [#24210] assert_kind_of supports an array of classes or modules.
+    [Daniel Berger]
+  * assert_instance_of supports an array of classes or modules.
+  * add --default-priority option.
+  * [#26627] add --order option. [Daniel Berger]
+
+* 4 minor enhancements
+  * use yellow foreground + black background for error.
+  * don't show diff for long string.
+  * accept "*term-color" TERM environment as colorizable terminal.
+    (e.g. Apple's Terminal)
+  * [#26268] add a workaround for test-spec's after_all. [Angelo Lakra]
+
+* 1 bug fix
+  * [#23586] re-support ruby 1.9.1. [Diego Pettenò]
+
+* Thanks
+  * Diego Pettenò
+  * Daniel Berger
+  * Angelo Lakra
+
 === 2.0.2 / 2008-12-21
 
 * 2 major enhancements

data/test-unit/Manifest.txt

@@ -66,10 +66,10 @@ test/test-notification.rb
 test/test-omission.rb
 test/test-pending.rb
 test/test-priority.rb
+test/test-testcase.rb
 test/test_assertions.rb
 test/test_error.rb
 test/test_failure.rb
-test/test_testcase.rb
 test/test_testresult.rb
 test/test_testsuite.rb
 test/testunit-test-util.rb

data/test-unit/README.txt

@@ -49,3 +49,4 @@ This software is distributed under the same terms as ruby.
 * Erik Hollensbe: Suggestions.
 * Bill Lear: A suggestion.
 * Diego Pettenò: A bug report.
+* Angelo Lakra: A bug report.

data/test-unit/Rakefile

@@ -1,12 +1,17 @@
 # -*- ruby -*-
 
 require 'rubygems'
+gem 'rdoc'
 require 'hoe'
 require './lib/test/unit/version.rb'
 
+ENV["NODOT"] = "yes"
+
 version = Test::Unit::VERSION
 ENV["VERSION"] = version
-Hoe.new('test-unit', version) do |p|
+Hoe.spec('test-unit') do |p|
+  Hoe::Test::SUPPORTED_TEST_FRAMEWORKS[:testunit2] = "test/run-test.rb"
+  p.version = version
   p.developer('Kouhei Sutou', 'kou@cozmixng.org')
   p.developer('Ryan Davis', 'ryand-ruby@zenspider.com')
 

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

@@ -227,6 +227,12 @@ module Test
             load_config(file)
           end
 
+          o.on("--order=ORDER", TestCase::AVAILABLE_ORDERS,
+               "Run tests in a test case in ORDER order.",
+               "(#{keyword_display(TestCase::AVAILABLE_ORDERS)})") do |order|
+            TestCase.test_order = order
+          end
+
           ADDITIONAL_OPTIONS.each do |option_builder|
             option_builder.call(self, o)
           end

data/test-unit/lib/test/unit/testcase.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 <tt><kou@clear-code.com></tt>
 # License:: Ruby license.
 
 require 'test/unit/attribute'
@@ -60,14 +62,14 @@ module Test
     #   end
     #
     # Here is a call order:
-    #  * startup
-    #  * setup
-    #  * test_my_method1
-    #  * teardown
-    #  * setup
-    #  * test_my_method2
-    #  * teardown
-    #  * shutdown
+    # * startup
+    # * setup
+    # * test_my_method1
+    # * teardown
+    # * setup
+    # * test_my_method2
+    # * teardown
+    # * shutdown
     class TestCase
       include Attribute
       include Fixture
@@ -81,24 +83,29 @@ module Test
       include Assertions
       include Util::BacktraceFilter
 
-      STARTED = name + "::STARTED"
-      FINISHED = name + "::FINISHED"
+      STARTED = name + "::STARTED" # :nodoc:
+      FINISHED = name + "::FINISHED" # :nodoc:
 
-      DESCENDANTS = []
+      DESCENDANTS = [] # :nodoc:
+      AVAILABLE_ORDERS = [:alphabetic, :random, :defined] # :nodoc:
 
       class << self
-        def inherited(sub_class)
+        def inherited(sub_class) # :nodoc:
           DESCENDANTS << sub_class
         end
 
+        @@added_methods = []
+        def method_added(name) # :nodoc:
+          super
+          @@added_methods << name.to_s
+        end
+
         # Rolls up all of the test* methods in the fixture into
         # one suite, creating a new instance of the fixture for
         # each method.
         def suite
-          method_names = public_instance_methods(true).collect {|name| name.to_s}
-          tests = method_names.delete_if {|method_name| method_name !~ /^test./}
           suite = TestSuite.new(name, self)
-          tests.sort.each do |test|
+          collect_test_names.each do |test|
             catch(:invalid_test) do
               suite << new(test)
             end
@@ -137,11 +144,11 @@ module Test
         #   end
         #
         # Here is a call order:
-        #   * startup
-        #   * setup
-        #   * test_my_class1 (or test_my_class2)
-        #   * setup
-        #   * test_my_class2 (or test_my_class1)
+        # * 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.
@@ -173,16 +180,74 @@ module Test
         #   end
         #
         # Here is a call order:
-        #   * test_my_class1 (or test_my_class2)
-        #   * teardown
-        #   * test_my_class2 (or test_my_class1)
-        #   * teardown
-        #   * shutdown
+        # * 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
+
+        @@test_order = AVAILABLE_ORDERS.first
+
+        # Returns the current test order. This returns
+        # +:alphabetic+ by default.
+        def test_order
+          @@test_order
+        end
+
+        # Sets the current test order.
+        #
+        # Here are the available _order_:
+        # [:alphabetic]
+        #   Default. Tests are sorted in alphabetic order.
+        # [:random]
+        #   Tests are sorted in random order.
+        # [:defined]
+        #   Tests are sorted in defined order.
+        def test_order=(order)
+          @@test_order = order
+        end
+
+        # :stopdoc:
+        private
+        def collect_test_names
+          method_names = public_instance_methods(true).collect do |name|
+            name.to_s
+          end
+          test_names = method_names.find_all do |method_name|
+            method_name =~ /^test./
+          end
+          send("sort_test_names_in_#{test_order}_order", test_names)
+        end
+
+        def sort_test_names_in_alphabetic_order(test_names)
+          test_names.sort
+        end
+
+        def sort_test_names_in_random_order(test_names)
+          test_names.sort_by {rand(test_names.size)}
+        end
+
+        def sort_test_names_in_defined_order(test_names)
+          test_names.sort do |test1, 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
+              1
+            elsif test2_defined_order
+              -1
+            else
+              test1 <=> test2
+            end
+          end
+        end
+        # :startdoc:
       end
 
       attr_reader :method_name
@@ -225,7 +290,7 @@ module Test
           result.add_run
           yield(FINISHED, name)
         ensure
-          @_result = nil
+          # @_result = nil # For test-spec's after_all :<
         end
       end
 
@@ -255,10 +320,10 @@ module Test
       #   end
       #
       # Here is a call order:
-      #   * setup
-      #   * my_setup1
-      #   * my_setup2
-      #   * test_my_class
+      # * setup
+      # * my_setup1
+      # * my_setup2
+      # * test_my_class
       def setup
       end
 
@@ -288,13 +353,13 @@ module Test
       #   end
       #
       # Here is a call order:
-      #   * test_my_class
-      #   * my_teardown2
-      #   * my_teardown1
-      #   * teardown
+      # * test_my_class
+      # * my_teardown2
+      # * my_teardown1
+      # * teardown
       def teardown
       end
-      
+
       def default_test
         flunk("No tests were specified")
       end

data/test-unit/test/{test_testcase.rb → test-testcase.rb}

@@ -6,7 +6,7 @@ require 'test/unit'
 
 module Test
   module Unit
-    class TC_TestCase < TestCase
+    class TestTestCase < TestCase
       def test_creation
         tc = Class.new(TestCase) do
           def test_with_arguments(arg1, arg2)
@@ -468,11 +468,40 @@ module Test
         end
       end
 
+      def test_defined_order
+        keep_test_order do
+          test_case = Class.new(Test::Unit::TestCase) do
+            def test_z
+            end
+
+            def test_1
+            end
+
+            def test_a
+            end
+          end
+
+          assert_equal(["test_1", "test_a", "test_z"],
+                       test_case.suite.tests.collect {|test| test.method_name})
+
+          test_case.test_order = :defined
+          assert_equal(["test_z", "test_1", "test_a"],
+                       test_case.suite.tests.collect {|test| test.method_name})
+        end
+      end
+
       private
       def check(message, passed)
         add_assertion
         raise AssertionFailedError.new(message) unless passed
       end
+
+      def keep_test_order
+        order = TestCase.test_order
+        yield
+      ensure
+        TestCase.test_order = order
+      end
     end
   end
 end

data/test-unit/test/test_assertions.rb

@@ -428,7 +428,7 @@ EOM
 
         different_error_class = Class.new(StandardError)
         message = <<-EOM
-<\#<Class:0x[a-f\\d]+>\\("Error"\\)> exception expected but was
+<\#<Class:[xa-f\\d]+>\\("Error"\\)> exception expected but was
 Class: <RuntimeError>
 Message: <"Error">
 EOM

data/test/al-test-utils.rb

@@ -58,7 +58,9 @@ module AlTestUtils
       unless File.exist?(@config_file)
         raise "config file for testing doesn't exist: #{@config_file}"
       end
-      config = YAML.load(ERB.new(File.read(@config_file)).result)
+      erb = ERB.new(File.read(@config_file))
+      erb.filename = @config_file
+      config = YAML.load(erb.result)
       _adapter = adapter
       config.each do |key, value|
         value[:adapter] = _adapter if _adapter

data/test/test_associations.rb

@@ -4,6 +4,59 @@ class TestAssociations < Test::Unit::TestCase
   include AlTestUtils
 
   priority :must
+  def test_has_many_delete_required_attribute
+    make_temporary_group do |group|
+      make_temporary_user do |user,|
+        user.primary_group = group
+        assert_raise(ActiveLdap::RequiredAttributeMissed) do
+          group.primary_members.delete(user)
+        end
+      end
+    end
+  end
+
+  priority :normal
+  def test_to_xml
+    make_temporary_user do |user,|
+      make_temporary_group do |group1|
+        make_temporary_group do |group2|
+          user.groups = [group1, group2]
+          assert_equal(<<-EOX, user.groups.to_xml(:root => "groups"))
+<?xml version="1.0" encoding="UTF-8"?>
+<groups type="array">
+  <group>
+    <dn>#{group1.dn}</dn>
+    <cns type="array">
+      <cn>#{group1.cn}</cn>
+    </cns>
+    <gidNumber>#{group1.gid_number}</gidNumber>
+    <memberUids type="array">
+      <memberUid>#{user.cn}</memberUid>
+    </memberUids>
+    <objectClasses type="array">
+      <objectClass>posixGroup</objectClass>
+    </objectClasses>
+  </group>
+  <group>
+    <dn>#{group2.dn}</dn>
+    <cns type="array">
+      <cn>#{group2.cn}</cn>
+    </cns>
+    <gidNumber>#{group2.gid_number}</gidNumber>
+    <memberUids type="array">
+      <memberUid>#{user.cn}</memberUid>
+    </memberUids>
+    <objectClasses type="array">
+      <objectClass>posixGroup</objectClass>
+    </objectClasses>
+  </group>
+</groups>
+EOX
+        end
+      end
+    end
+  end
+
   def test_belongs_to_with_invalid_dn_attribute_value
     make_temporary_user do |user,|
       make_temporary_group do |group|
@@ -16,12 +69,28 @@ class TestAssociations < Test::Unit::TestCase
     end
   end
 
-  priority :normal
+  def test_belongs_to_foreign_key_before_1_1_0
+    ActiveSupport::Deprecation.silence do
+      @group_class.belongs_to :related_users, :many => "seeAlso",
+                              :foreign_key => "dn"
+    end
+    @group_class.set_associated_class(:related_users, @user_class)
+    make_temporary_user do |user,|
+      make_temporary_group do |group|
+        user.see_also = group.dn
+        user.save!
+
+        group = @group_class.find(group.id)
+        assert_equal([user.dn], group.related_users.collect(&:dn))
+      end
+    end
+  end
+
   def test_has_many_wrap_with_nonexistent_entry
     @user_class.has_many :references, :wrap => "seeAlso", :primary_key => "dn"
     @user_class.set_associated_class(:references, @group_class)
     @group_class.belongs_to :related_users, :many => "seeAlso",
-                            :foreign_key => "dn"
+                            :primary_key => "dn"
     @group_class.set_associated_class(:related_users, @user_class)
     make_temporary_user do |user,|
       make_temporary_group do |group1|
@@ -49,7 +118,7 @@ class TestAssociations < Test::Unit::TestCase
     @user_class.has_many :references, :wrap => "seeAlso", :primary_key => "dn"
     @user_class.set_associated_class(:references, @group_class)
     @group_class.belongs_to :related_users, :many => "seeAlso",
-                            :foreign_key => "dn"
+                            :primary_key => "dn"
     @group_class.set_associated_class(:related_users, @user_class)
     make_temporary_user do |user,|
       make_temporary_group do |group1|
@@ -87,7 +156,7 @@ class TestAssociations < Test::Unit::TestCase
     @user_class.has_many :references, :wrap => "seeAlso", :primary_key => "dn"
     @user_class.set_associated_class(:references, @group_class)
     @group_class.belongs_to :related_users, :many => "seeAlso",
-                            :foreign_key => "dn"
+                            :primary_key => "dn"
     @group_class.set_associated_class(:related_users, @user_class)
     make_temporary_group do |group|
       make_temporary_user do |user1,|
@@ -125,7 +194,7 @@ class TestAssociations < Test::Unit::TestCase
   end
 
   def test_belongs_to_many_with_dn_key
-    @user_class.belongs_to :dn_groups, :many => "memberUid", :foreign_key => "dn"
+    @user_class.belongs_to :dn_groups, :many => "memberUid", :primary_key => "dn"
     @user_class.set_associated_class(:dn_groups, @group_class)
     @group_class.has_many :dn_members, :wrap => "memberUid", :primary_key => "dn"
     @group_class.set_associated_class(:dn_members, @user_class)
@@ -292,8 +361,8 @@ class TestAssociations < Test::Unit::TestCase
       group_class.has_many :members, :class => @user_class, :wrap => "memberUid",
                            :extend => mod
       group_class.has_many :primary_members, :class => @user_class,
-                           :foreign_key => "gidNumber",
                            :primary_key => "gidNumber",
+                           :foreign_key => "gidNumber",
                            :extend => mod
     end
   end