From 2622c2bd29462db67d4f73b89d1cdc176261cc90 Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Thu, 9 Apr 2009 11:24:23 +0200
Subject: [PATCH] Corrected support for real world LDAP server testing.

---
 .../Kolab_Server/lib/Horde/Kolab/Test/Server.php   | 10 +++----
 .../test/Horde/Kolab/Server/PersonTest.php         | 34 +++++++++++++++++-----
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php b/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php
index 0033eb8fe..a9e6a1489 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php
@@ -304,9 +304,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase
         /** Prepare a Kolab test server */
         $conf['kolab']['server']['driver'] = 'ldap';
 
-        $server = Horde_Kolab_Server::singleton($params);
-
-        return $server;
+        return Horde_Kolab_Server::singleton($params);
     }
 
     /**
@@ -320,7 +318,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase
         /**
          * We always use the test server
          */
-        $servers[] = $this->prepareEmptyKolabServer();
+        $servers[] = array($this->prepareEmptyKolabServer());
 
         $base = getenv('HORDE_BASE');
         if (!empty($base)) {
@@ -328,11 +326,11 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase
             if (file_exists($config)) {
                 @include $config; 
                 if (!empty($conf['kolab']['server']['params'])) {
-                    $servers[] = $this->prepareLdapKolabServer($conf['kolab']['server']['params']);
+                    $servers[] = array($this->prepareLdapKolabServer($conf['kolab']['server']['params']));
                 }
             }
         }
-        return array($servers);
+        return $servers;
     }
 
     /**
diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/PersonTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/PersonTest.php
index ead2c25bc..1647add13 100644
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/PersonTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/PersonTest.php
@@ -41,15 +41,15 @@ class Horde_Kolab_Server_PersonTest extends Horde_Kolab_Test_Server
         /* Default dummy person */
         array(
             'type' => 'Horde_Kolab_Server_Object_Person',
-            Horde_Kolab_Server_Object_Person::ATTRIBUTE_CN           => '123',
-            Horde_Kolab_Server_Object_Person::ATTRIBUTE_SN           => '123',
-            Horde_Kolab_Server_Object_Person::ATTRIBUTE_USERPASSWORD => '123',
+            Horde_Kolab_Server_Object_Person::ATTRIBUTE_CN           => 'Kolab_Server_PersonTest_123',
+            Horde_Kolab_Server_Object_Person::ATTRIBUTE_SN           => 'Kolab_Server_PersonTest_123',
+            Horde_Kolab_Server_Object_Person::ATTRIBUTE_USERPASSWORD => 'Kolab_Server_PersonTest_123',
         ),
         /* Invalid person (no sn) */
         array(
             'type' => 'Horde_Kolab_Server_Object_Person',
-            Horde_Kolab_Server_Object_Person::ATTRIBUTE_CN           => '123',
-            Horde_Kolab_Server_Object_Person::ATTRIBUTE_USERPASSWORD => '123',
+            Horde_Kolab_Server_Object_Person::ATTRIBUTE_CN           => 'Kolab_Server_PersonTest_123',
+            Horde_Kolab_Server_Object_Person::ATTRIBUTE_USERPASSWORD => 'Kolab_Server_PersonTest_123',
         ),
     );
 
@@ -60,12 +60,12 @@ class Horde_Kolab_Server_PersonTest extends Horde_Kolab_Test_Server
      */
     public function testGenerateId()
     {
-        $this->assertEquals('cn=123',
+        $this->assertEquals(Horde_Kolab_Server_Object_Person::ATTRIBUTE_CN . '=' . $this->objects[0][Horde_Kolab_Server_Object_Person::ATTRIBUTE_CN],
                             Horde_Kolab_Server_Object_Person::generateId($this->objects[0]));
     }
 
     /**
-     * Test adding invalid user.
+     * Test adding an invalid person.
      *
      * @dataProvider provideServers
      * @expectedException Horde_Kolab_Server_Exception
@@ -74,7 +74,25 @@ class Horde_Kolab_Server_PersonTest extends Horde_Kolab_Test_Server
      */
     public function testAddInvalidPerson($server)
     {
-        $result = $server->add($this->objects[2]);
+        $result = $server->add($this->objects[1]);
     }
 
+    /**
+     * Test adding a person.
+     *
+     * @dataProvider provideServers
+     *
+     * @return NULL
+     */
+    public function testAddPerson($server)
+    {
+        $result = $server->add($this->objects[0]);
+        $this->assertNoError($result);
+        $cn_result = $server->uidForCn($this->objects[0][Horde_Kolab_Server_Object_Person::ATTRIBUTE_CN]);
+        $this->assertContains(Horde_Kolab_Server_Object_Person::ATTRIBUTE_CN . '=' . $this->objects[0][Horde_Kolab_Server_Object_Person::ATTRIBUTE_CN],
+                              $cn_result);
+        $this->assertNoError($result);
+        $cn_result = $server->uidForCn($this->objects[0][Horde_Kolab_Server_Object_Person::ATTRIBUTE_CN]);
+        $this->assertFalse($server->uidForCn($this->objects[0][Horde_Kolab_Server_Object_Person::ATTRIBUTE_CN]));
+    }
 }
-- 
2.11.0