From ce78f3c6cdb74c1f0a0457871a11582da7c83751 Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Wed, 22 Apr 2009 23:06:15 +0200
Subject: [PATCH] Adapt testing to recent changes.

---
 .../Kolab_Server/test/Horde/Kolab/Server/GroupTest.php  |  2 --
 .../Kolab_Server/test/Horde/Kolab/Server/TestTest.php   | 17 +++++++----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/GroupTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/GroupTest.php
index 7154f7f5c..6cbc3d096 100644
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/GroupTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/GroupTest.php
@@ -118,7 +118,6 @@ class Horde_Kolab_Server_GroupTest extends Horde_Kolab_Test_Server
         $result = $this->ldap->search('(&(!(cn=domains))(objectClass=kolabGroupOfNames))',
                                       array(),
                                       $this->ldap->getBaseUid());
-        $result = $result->as_struct();
         $this->assertEquals(0, count($result));
 
         $this->_addValidGroups();
@@ -127,7 +126,6 @@ class Horde_Kolab_Server_GroupTest extends Horde_Kolab_Test_Server
         $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_Kolabgroupofnames');
diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/TestTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/TestTest.php
index 091c1a55e..29e78a886 100644
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/TestTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/TestTest.php
@@ -48,7 +48,6 @@ class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server
             '(' . Horde_Kolab_Server_Object::ATTRIBUTE_OC
             . '=' . Horde_Kolab_Server_Object::OBJECTCLASS_TOP . ')',
             array(Horde_Kolab_Server_Object::ATTRIBUTE_OC));
-        $result = $result->as_struct();
         $this->assertEquals(13, count($result));
       
         $result = $server->search(
@@ -56,7 +55,6 @@ class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server
             . '=' . Horde_Kolab_Server_Object::OBJECTCLASS_TOP . ')',
             array(Horde_Kolab_Server_Object::ATTRIBUTE_OC),
             'cn=internal,dc=example,dc=org');
-        $result = $result->as_struct();
         $this->assertNoError($result);
         $this->assertEquals(4, count($result));
     }
@@ -112,7 +110,6 @@ class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server
 
         $sort   = Horde_Kolab_Server_Object_Kolabinetorgperson::ATTRIBUTE_SN;
         $result = $server->search($filter);
-        $result = $result->as_struct();
         $this->assertNoError($result);
         $this->assertEquals(2, count($result));
 
@@ -545,7 +542,7 @@ class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server
                     'dn' => 'cn=d',
                 ),
             ),
-            $a->as_struct()
+            $a
         );
 
         $a = $db->search('(c=3)');
@@ -559,7 +556,7 @@ class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server
                     'dn' => 'cn=c',
                 ),
             ),
-            $a->as_struct()
+            $a
         );
 
         $a = $db->search('(c=3)', array('attributes' => array('a')));
@@ -571,7 +568,7 @@ class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server
                     'dn' => 'cn=c',
                 ),
             ),
-            $a->as_struct()
+            $a
         );
 
         $a = $db->search('(&(a=1)(b=2))', array('attributes' => array('a', 'b')));
@@ -589,7 +586,7 @@ class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server
                     'dn' => 'cn=c',
                 ),
             ),
-            $a->as_struct()
+            $a
         );
 
         $a = $db->search('(&(b=2))', array('attributes' => array('b')));
@@ -609,7 +606,7 @@ class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server
                     'dn' => 'cn=d',
                 ),
             ),
-            $a->as_struct()
+            $a
         );
 
         $a = $db->search('(!(b=2))', array('attributes' => array('a', 'b')));
@@ -622,7 +619,7 @@ class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server
                     'dn' => 'cn=a',
                 ),
             ),
-            $a->as_struct()
+            $a
         );
 
         $a = $db->search('(&(!(x=2))(b=1))', array('attributes' => array('b')));
@@ -634,7 +631,7 @@ class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server
                     'dn' => 'cn=a',
                 ),
             ),
-            $a->as_struct()
+            $a
         );
     }
 
-- 
2.11.0