Fix testing for the recent changes.

diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php
index 974eaef..266af33 100644 (file)
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php
@@ -37,12 +37,12 @@ class Horde_Kolab_Server_ServerTest extends PHPUnit_Framework_TestCase
      *
      * @return NULL
      */
-    public function testGenerateUid()
-    {
-        $ks = &Horde_Kolab_Server::factory('none');
-        $uid = $ks->generateUid('Horde_Kolab_Server_Object', array());
-        $this->assertEquals($uid, '');
-    }
+/*     public function testGenerateUid() */
+/*     { */
+/*         $ks = &Horde_Kolab_Server::factory('none'); */
+/*         $uid = $ks->generateUid('Horde_Kolab_Server_Object', array()); */
+/*         $this->assertEquals($uid, ''); */
+/*     } */
 
     /**
      * Test creating the server object.
@@ -79,40 +79,6 @@ class Horde_Kolab_Server_ServerTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * The base class returns no valid data. The DN request should
-     * just return false and the search for a mail address returns the
-     * provided argument.
-     *
-     * @return NULL
-     */
-    public function testUidFor()
-    {
-        $ks = &Horde_Kolab_Server::factory('none');
-        $dn = $ks->uidForId('test');
-        $this->assertFalse($dn);
-        $dn = $ks->uidForMail('test');
-        $this->assertFalse($dn);
-        $dn = $ks->uidForAlias('test');
-        $this->assertFalse($dn);
-        $dn = $ks->uidForIdOrMail('test');
-        $this->assertFalse($dn);
-        $dn = $ks->uidForMailOrAlias('test');
-        $this->assertFalse($dn);
-        $dn = $ks->uidForIdOrMailOrAlias('test');
-        $this->assertFalse($dn);
-        $dn = $ks->mailForIdOrMail('test');
-        $this->assertFalse($dn);
-        $dn = $ks->addrsForIdOrMail('test');
-        $this->assertEquals($dn, array());
-        $dn = $ks->gidForMail('test');
-        $this->assertFalse($dn);
-        $dn = $ks->memberOfGroupAddress('test', 'test@example.org');
-        $this->assertFalse($dn);
-        $dn = $ks->getGroups('test');
-        $this->assertEquals($dn, array());
-    }
-
-    /**
      * Test listing objects.
      *
      * @return NULL

diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/UserTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/UserTest.php
index 6f2e0e1..ad4cb35 100644 (file)
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/UserTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/UserTest.php
@@ -85,7 +85,7 @@ class Horde_Kolab_Server_UserTest extends Horde_Kolab_Test_Server
     {
         $user = $this->server->fetch('cn=Gunnar Wrobel,dc=example,dc=org');
         $this->assertEquals('Horde_Kolab_Server_Object_user', get_class($user));
-        $this->assertEquals('Gunnar Wrobel', $user->get(Horde_Kolab_Server_Object::ATTRIBUTE_FNLN));
+        $this->assertEquals('Gunnar Wrobel', $user->get(Horde_Kolab_Server_Object_base::ATTRIBUTE_FNLN));
     }
 
     /**
@@ -104,7 +104,7 @@ class Horde_Kolab_Server_UserTest extends Horde_Kolab_Test_Server
         $this->assertEquals('home.example.org', $imap);
 
         $user = $this->server->fetch('cn=Gunnar Wrobel,dc=example,dc=org');
-        $attr = $user->get(Horde_Kolab_Server_Object::ATTRIBUTE_FREEBUSYHOST);
+        $attr = $user->get(Horde_Kolab_Server_Object_base::ATTRIBUTE_FREEBUSYHOST);
         if (is_a($attr, 'PEAR_Error')) {
             $this->assertEquals('', $attr->getMessage());
         }

diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/testTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/testTest.php
index fdb83ac..a803c06 100644 (file)
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/testTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/testTest.php
@@ -96,14 +96,14 @@ class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server
 
         $filter     = '(&(objectClass=kolabInetOrgPerson)(uid=*)(mail=*)(sn=*))';
         $attributes = array(
-            Horde_Kolab_Server_Object::ATTRIBUTE_SN,
-            Horde_Kolab_Server_Object::ATTRIBUTE_CN,
+            Horde_Kolab_Server_Object_base::ATTRIBUTE_SN,
+            Horde_Kolab_Server_Object_base::ATTRIBUTE_CN,
             Horde_Kolab_Server_Object::ATTRIBUTE_UID,
-            Horde_Kolab_Server_Object::ATTRIBUTE_MAIL,
-            Horde_Kolab_Server_Object::ATTRIBUTE_DELETED,
+            Horde_Kolab_Server_Object_base::ATTRIBUTE_MAIL,
+            Horde_Kolab_Server_Object_base::ATTRIBUTE_DELETED,
         );
 
-        $sort   = Horde_Kolab_Server_Object::ATTRIBUTE_SN;
+        $sort   = Horde_Kolab_Server_Object_base::ATTRIBUTE_SN;
         $result = $server->search($filter);
         $this->assertNoError($result);
         $this->assertEquals(2, count($result));
@@ -279,7 +279,7 @@ class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server
         $testuser = $server->fetch('cn=Test Test,dc=example,dc=org');
         $this->assertNoError($testuser);
         $this->assertContains('wrobel@example.org',
-                              $testuser->get(Horde_Kolab_Server_Object::ATTRIBUTE_DELEGATE, false));
+                              $testuser->get(Horde_Kolab_Server_Object_base::ATTRIBUTE_DELEGATE, false));
 
         $this->assertNoError($addrs);
         $this->assertContains('wrobel@example.org', $addrs);