activeldap 1.0.0 → 1.0.1

data/test/al-test-utils.rb

@@ -1,5 +1,4 @@
 require 'test/unit'
-require 'test-unit-ext'
 
 require 'erb'
 require 'yaml'
@@ -290,9 +289,10 @@ module AlTestUtils
       yield(uid)
     ensure
       if @user_class.exists?(uid)
-        user = @user_class.find(uid)
-        user.remove_connection
-        @user_class.delete(user.dn)
+        @user_class.search(:value => uid) do |dn, attribute|
+          @user_class.remove_connection(dn)
+          @user_class.delete(dn)
+        end
       end
     end
 

data/test/command.rb

@@ -32,7 +32,7 @@ module Command
     if args.any? {|x| x.nil?}
       raise ArgumentError, "args has nil: #{args.inspect}"
     end
-    return java_run(cmd, *args, &block) unless Kernel.respond_to?(:fork)
+    return java_run(cmd, *args, &block) if Object.respond_to?(:java)
     in_r, in_w = IO.pipe
     out_r, out_w = IO.pipe
     pid = exit_status = nil

data/test/run-test.rb

@@ -1,18 +1,19 @@
 #!/usr/bin/env ruby
 
+$VERBOSE = true
+
 $KCODE = 'u'
 
 require 'yaml'
-require "test/unit"
 
 base_dir = File.expand_path(File.dirname(__FILE__))
 top_dir = File.expand_path(File.join(base_dir, ".."))
 $LOAD_PATH.unshift(File.join(top_dir, "lib"))
 $LOAD_PATH.unshift(File.join(top_dir, "test"))
 
-$LOAD_PATH.unshift(File.join(top_dir, "test-unit-ext", "lib"))
-require 'test-unit-ext'
-Test::Unit::TestSuite.priority_mode = true
+$LOAD_PATH.unshift(File.join(top_dir, "test-unit", "lib"))
+require "test/unit"
+ARGV.unshift("--priority-mode")
 
 test_file = "test/test_*.rb"
 Dir.glob(test_file) do |file|

data/test/test_associations.rb

@@ -4,20 +4,117 @@ class TestAssociations < Test::Unit::TestCase
   include AlTestUtils
 
   priority :must
+  def test_has_many_wrap_with_dn_value
+    @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"
+    @group_class.set_associated_class(:related_users, @user_class)
+    make_temporary_user do |user,|
+      make_temporary_group do |group1|
+        make_temporary_group do |group2|
+          make_temporary_group do |group3|
+            entries = [user, group1, group2, group3]
+
+            user.references << group1
+            user, group1, group2, group3 = reload_entries(*entries)
+            assert_references([[group1]], [user])
+            assert_related_users([user], group1)
+            assert_related_users([], group2)
+            assert_related_users([], group3)
+
+            user.references = [group2, group3]
+            user, group1, group2, group3 = reload_entries(*entries)
+            assert_references([[group2, group3]], [user])
+            assert_related_users([], group1)
+            assert_related_users([user], group2)
+            assert_related_users([user], group3)
+
+            user.references.delete(group2)
+            user, group1, group2, group3 = reload_entries(*entries)
+            assert_references([[group3]], [user])
+            assert_related_users([], group1)
+            assert_related_users([], group2)
+            assert_related_users([user], group3)
+          end
+        end
+      end
+    end
+  end
 
   priority :normal
+  def test_belongs_to_many_with_dn_value
+    @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"
+    @group_class.set_associated_class(:related_users, @user_class)
+    make_temporary_group do |group|
+      make_temporary_user do |user1,|
+        make_temporary_user do |user2,|
+          make_temporary_user do |user3,|
+            entries = [group, user1, user2, user3]
+
+            group.related_users = [user1, user2]
+            group, user1, user2, user3 = reload_entries(*entries)
+            assert_references([[group], [group], []],
+                              [user1, user2, user3])
+            assert_related_users([user1, user2], group)
+
+            group.related_users << user3
+            group, user1, user2, user3 = reload_entries(*entries)
+            assert_references([[group], [group], [group]],
+                              [user1, user2, user3])
+            assert_related_users([user1, user2, user3], group)
+
+            group.related_users.delete(user1)
+            group, user1, user2, user3 = reload_entries(*entries)
+            assert_references([[], [group], [group]],
+                              [user1, user2, user3])
+            assert_related_users([user2, user3], group)
+
+            group.related_users = []
+            group, user1, user2, user3 = reload_entries(*entries)
+            assert_references([[], [], []],
+                              [user1, user2, user3])
+            assert_related_users([], group)
+          end
+        end
+      end
+    end
+  end
+
   def test_belongs_to_many_with_dn_key
-    @user_class.belongs_to :groups, :many => "memberUid", :foreign_key => "dn"
-    @user_class.set_associated_class(:groups, @group_class)
-    @group_class.has_many :members, :wrap => "memberUid", :primary_key => "dn"
-    @group_class.set_associated_class(:members, @user_class)
+    @user_class.belongs_to :dn_groups, :many => "memberUid", :foreign_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)
     make_temporary_group do |group|
       make_temporary_user do |user1,|
         make_temporary_user do |user2,|
-          group.members = [user1, user2]
-          assert(group.save)
-          assert_equal([group.cn], user1.groups.collect(&:cn))
-          assert_equal([group.cn], user2.groups.collect(&:cn))
+          make_temporary_user do |user3,|
+            entries = [group, user1, user2, user3]
+
+            user1.dn_groups << group
+            group, user1, user2, user3 = reload_entries(*entries)
+            assert_dn_groups([[group], [], []], [user1, user2, user3])
+            assert_dn_members([user1], group)
+
+            user2.dn_groups = [group]
+            group, user1, user2, user3 = reload_entries(*entries)
+            assert_dn_groups([[group], [group], []], [user1, user2, user3])
+            assert_dn_members([user1, user2], group)
+
+            user1.dn_groups = []
+            group, user1, user2, user3 = reload_entries(*entries)
+            assert_dn_groups([[], [group], []], [user1, user2, user3])
+            assert_dn_members([user2], group)
+
+            user2.dn_groups.delete(group)
+            group, user1, user2, user3 = reload_entries(*entries)
+            assert_dn_groups([[], [], []], [user1, user2, user3])
+            assert_dn_members([], group)
+          end
         end
       end
     end
@@ -44,7 +141,6 @@ class TestAssociations < Test::Unit::TestCase
     end
   end
 
-  priority :normal
   def test_belongs_to_before_save
     make_temporary_group do |group1|
       make_temporary_group do |group2|
@@ -350,4 +446,42 @@ class TestAssociations < Test::Unit::TestCase
       end
     end
   end
+
+  private
+  def reload_entries(*entries)
+    entries.collect do |entry|
+      entry.class.find(entry[entry.dn_attribute])
+    end
+  end
+
+  def assert_groups_relation(expected_groups_values, entries, relation_name)
+    expected_groups_values = expected_groups_values.collect do |groups|
+      groups.collect(&:cn).sort
+    end
+    actual_groups_values = entries.collect do |entry|
+      entry.send(relation_name).collect(&:cn).sort
+    end
+    assert_equal(expected_groups_values, actual_groups_values)
+  end
+
+  def assert_users_relation(expected_users, group, relation_name)
+    assert_equal(expected_users.collect(&:cn).sort,
+                 group.send(relation_name).collect(&:cn).sort)
+  end
+
+  def assert_references(expected_groups_values, users)
+    assert_groups_relation(expected_groups_values, users, :references)
+  end
+
+  def assert_related_users(expected_users, group)
+    assert_users_relation(expected_users, group, :related_users)
+  end
+
+  def assert_dn_groups(expected_groups_values, users)
+    assert_groups_relation(expected_groups_values, users, :dn_groups)
+  end
+
+  def assert_dn_members(expected_users, group)
+    assert_users_relation(expected_users, group, :dn_members)
+  end
 end

data/test/test_base.rb

@@ -6,6 +6,17 @@ class TestBase < Test::Unit::TestCase
   include AlTestUtils
 
   priority :must
+  def test_to_ldif
+    make_temporary_group do |group,|
+      assert_to_ldif(group)
+
+      group.gidNumber += 1
+      group.description = ["Description", {"en" => "Description(en)"}]
+      assert_to_ldif(group)
+    end
+  end
+
+  priority :normal
   def test_save_with_changes
     make_temporary_user do |user, password|
       user.cn += "!!!"
@@ -19,7 +30,6 @@ class TestBase < Test::Unit::TestCase
     end
   end
 
-  priority :normal
   def test_normalize_dn_attribute
     make_ou("Ous")
     ou_class = Class.new(ActiveLdap::Base)
@@ -595,6 +605,12 @@ EOX
     end
   end
 
+  def test_attribute_present_with_unknown_attribute
+    make_temporary_user do |user, password|
+      assert(!user.attribute_present?(:unknown_attribute))
+    end
+  end
+
   def test_update_all
     make_temporary_user do |user, password|
       make_temporary_user do |user2, password|
@@ -656,4 +672,12 @@ EOX
     yield
     modify_called
   end
+
+  def assert_to_ldif(entry)
+    records = ActiveLdap::LDIF.parse(entry.to_ldif).records
+    parsed_entries = records.collect do |record|
+      entry.class.send(:instantiate, [record.dn, record.attributes])
+    end
+    assert_equal([entry], parsed_entries)
+  end
 end

data/test/test_dn.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'al-test-utils'
 
 class TestDN < Test::Unit::TestCase

data/test/test_find.rb

@@ -4,6 +4,14 @@ class TestFind < Test::Unit::TestCase
   include AlTestUtils
 
   priority :must
+  def test_find_with_dn
+    make_temporary_user do |user,|
+      assert_equal(user.dn, @user_class.find(user.dn).dn)
+      assert_equal(user.dn, @user_class.find(ActiveLdap::DN.parse(user.dn)).dn)
+    end
+  end
+
+  priority :normal
   def test_find_with_special_value_prefix
     # \2C == ','
     make_ou("a\\2Cb,ou=Users")
@@ -31,7 +39,6 @@ class TestFind < Test::Unit::TestCase
     end
   end
 
-  priority :normal
   def test_find_with_sort_by_in_ldap_mapping
     @user_class.ldap_mapping(:dn_attribute => @user_class.dn_attribute,
                              :prefix => @user_class.prefix,

data/test/test_ldif.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'al-test-utils'
 
 class TestLDIF < Test::Unit::TestCase
@@ -560,6 +562,55 @@ replace: postaladdress
 -
 delete: description
 -
+EOL
+
+    assert_ldif_to_s(<<-EOL, ldif_source)
+version: 1
+dn: cn=Fiona Jensen,ou=Marketing,dc=airius,dc=com
+changetype: add
+cn: Fiona Jensen
+objectclass: organizationalPerson
+objectclass: person
+objectclass: top
+sn: Jensen
+telephonenumber: +1 408 555 1212
+uid: fiona
+
+dn: cn=Robert Jensen,ou=Marketing,dc=airius,dc=com
+changetype: delete
+
+dn: cn=Paul Jensen,ou=Product Development,dc=airius,dc=com
+changetype: modrdn
+newrdn: cn=Paula Jensen
+deleteoldrdn: 1
+
+dn: ou=PD Accountants,ou=Product Development,dc=airius,dc=com
+changetype: modrdn
+newrdn: ou=Product Development Accountants
+deleteoldrdn: 0
+newsuperior: ou=Accounting,dc=airius,dc=com
+
+dn: cn=Paula Jensen,ou=Product Development,dc=airius,dc=com
+changetype: modify
+add: postaladdress
+postaladdress: 123 Anystreet $ Sunnyvale, CA $ 94086
+-
+delete: description
+-
+replace: telephonenumber
+telephonenumber: +1 408 555 1234
+telephonenumber: +1 408 555 5678
+-
+delete: facsimiletelephonenumber
+facsimiletelephonenumber: +1 408 555 9876
+-
+
+dn: cn=Ingrid Jensen,ou=Product Support,dc=airius,dc=com
+changetype: modify
+replace: postaladdress
+-
+delete: description
+-
 EOL
 
     change_attributes_add = {
@@ -665,120 +716,6 @@ EOL
                  actual)
   end
 
-  def test_multi_change_type_records
-    ldif_source = <<-EOL
-version: 1
-# Add a new entry
-dn: cn=Fiona Jensen, ou=Marketing, dc=airius, dc=com
-changetype: add
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-cn: Fiona Jensen
-sn: Jensen
-uid: fiona
-telephonenumber: +1 408 555 1212
-
-# Delete an existing entry
-dn: cn=Robert Jensen, ou=Marketing, dc=airius, dc=com
-changetype: delete
-
-# Modify an entry's relative distinguished name
-dn: cn=Paul Jensen, ou=Product Development, dc=airius, dc=com
-changetype: modrdn
-newrdn: cn=Paula Jensen
-deleteoldrdn: 1
-
-# Rename an entry and move all of its children to a new location in
-# the directory tree (only implemented by LDAPv3 servers).
-dn: ou=PD Accountants, ou=Product Development, dc=airius, dc=com
-changetype: modrdn
-newrdn: ou=Product Development Accountants
-deleteoldrdn: 0
-newsuperior: ou=Accounting, dc=airius, dc=com
-
-# Modify an entry: add an additional value to the postaladdress
-# attribute, completely delete the description attribute, replace
-# the telephonenumber attribute with two values, and delete a specific
-# value from the facsimiletelephonenumber attribute
-dn: cn=Paula Jensen, ou=Product Development, dc=airius, dc=com
-changetype: modify
-add: postaladdress
-postaladdress: 123 Anystreet $ Sunnyvale, CA $ 94086
--
-delete: description
--
-replace: telephonenumber
-telephonenumber: +1 408 555 1234
-telephonenumber: +1 408 555 5678
--
-delete: facsimiletelephonenumber
-facsimiletelephonenumber: +1 408 555 9876
--
-
-# Modify an entry: replace the postaladdress attribute with an empty
-# set of values (which will cause the attribute to be removed), and
-# delete the entire description attribute. Note that the first will
-# always succeed, while the second will only succeed if at least
-# one value for the description attribute is present.
-dn: cn=Ingrid Jensen, ou=Product Support, dc=airius, dc=com
-changetype: modify
-replace: postaladdress
--
-delete: description
--
-EOL
-
-    assert_ldif_to_s(<<-EOL, ldif_source)
-version: 1
-dn: cn=Fiona Jensen,ou=Marketing,dc=airius,dc=com
-changetype: add
-cn: Fiona Jensen
-objectclass: organizationalPerson
-objectclass: person
-objectclass: top
-sn: Jensen
-telephonenumber: +1 408 555 1212
-uid: fiona
-
-dn: cn=Robert Jensen,ou=Marketing,dc=airius,dc=com
-changetype: delete
-
-dn: cn=Paul Jensen,ou=Product Development,dc=airius,dc=com
-changetype: modrdn
-newrdn: cn=Paula Jensen
-deleteoldrdn: 1
-
-dn: ou=PD Accountants,ou=Product Development,dc=airius,dc=com
-changetype: modrdn
-newrdn: ou=Product Development Accountants
-deleteoldrdn: 0
-newsuperior: ou=Accounting,dc=airius,dc=com
-
-dn: cn=Paula Jensen,ou=Product Development,dc=airius,dc=com
-changetype: modify
-add: postaladdress
-postaladdress: 123 Anystreet $ Sunnyvale, CA $ 94086
--
-delete: description
--
-replace: telephonenumber
-telephonenumber: +1 408 555 1234
-telephonenumber: +1 408 555 5678
--
-delete: facsimiletelephonenumber
-facsimiletelephonenumber: +1 408 555 9876
--
-
-dn: cn=Ingrid Jensen,ou=Product Support,dc=airius,dc=com
-changetype: modify
-replace: postaladdress
--
-delete: description
--
-EOL
-  end
-
   def test_modify_record
     ldif_source = <<-EOL
 version: 1