From b98f2de75327c9240f828e24e46c961cbde1c80c Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Mon, 30 Mar 2009 06:27:55 +0000
Subject: [PATCH] Adapt testing to the new return value of the search
 operation.

---
 .../test/Horde/Kolab/Server/GroupTest.php             | 19 +++++++++++--------
 .../Kolab_Server/test/Horde/Kolab/Server/TestTest.php |  3 +++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/GroupTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/GroupTest.php
index 284d5a01b..988d36673 100644
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/GroupTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/GroupTest.php
@@ -113,18 +113,21 @@ class Horde_Kolab_Server_GroupTest extends Horde_Kolab_Test_Server
     public function testListingGroups()
     {
         $this->assertEquals(0, count($GLOBALS['KOLAB_SERVER_TEST_DATA']));
-        $this->assertEquals(0,
-                            count($this->ldap->search('(&(!(cn=domains))(objectClass=kolabGroupOfNames))',
-                                                      array(),
-                                                      $this->ldap->getBaseUid())));
+
+        $result = $this->ldap->search('(&(!(cn=domains))(objectClass=kolabGroupOfNames))',
+                                      array(),
+                                      $this->ldap->getBaseUid());
+        $result = $result->as_struct();
+        $this->assertEquals(0, count($result));
 
         $this->_addValidGroups();
 
         $this->assertEquals(3, count($GLOBALS['KOLAB_SERVER_TEST_DATA']));
-        $this->assertEquals(3,
-                            count($this->ldap->search('(&(!(cn=domains))(objectClass=kolabGroupOfNames))',
-                                                      array(),
-                                                      $this->ldap->getBaseUid())));
+        $result = $this->ldap->search('(&(!(cn=domains))(objectClass=kolabGroupOfNames))',
+                                      array(),
+                                      $this->ldap->getBaseUid());
+        $result = $result->as_struct();
+        $this->assertEquals(3, count($result));
 
         $list = $this->ldap->listObjects('Horde_Kolab_Server_Object_group');
         $this->assertNoError($list);
diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/TestTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/TestTest.php
index f28321f98..e200f3e25 100644
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/TestTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/TestTest.php
@@ -45,11 +45,13 @@ class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server
         $server = &$this->prepareBasicServer($type);
 
         $result = $server->search('(objectClass=top)', array('objectClass'));
+        $result = $result->as_struct();
         $this->assertEquals(13, count($result));
       
         $result = $server->search('(objectClass=top)',
                                   array('objectClass'),
                                   'cn=internal,dc=example,dc=org');
+        $result = $result->as_struct();
         $this->assertNoError($result);
         $this->assertEquals(4, count($result));
     }
@@ -105,6 +107,7 @@ class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server
 
         $sort   = Horde_Kolab_Server_Object_base::ATTRIBUTE_SN;
         $result = $server->search($filter);
+        $result = $result->as_struct();
         $this->assertNoError($result);
         $this->assertEquals(2, count($result));
 
-- 
2.11.0