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

---
 .../Kolab_Server/lib/Horde/Kolab/Server/Test.php   |  6 ++-
 .../lib/Horde/Kolab/Server/Test/Search.php         | 57 ++++++++++++++++++++++
 framework/Kolab_Server/package.xml                 |  8 ++-
 3 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 framework/Kolab_Server/lib/Horde/Kolab/Server/Test/Search.php

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Test.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Test.php
index 8f907b844..8406258db 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Test.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Test.php
@@ -348,7 +348,8 @@ class Horde_Kolab_Server_Test extends Horde_Kolab_Server_Ldap
         }
         $result = $this->doSearch($filter, $attributes);
         if (empty($result)) {
-            return null;
+            $search = new Horde_Kolab_Server_Test_Search(null);
+            return $search;
         }
         if ($base) {
             $subtree = array();
@@ -359,7 +360,8 @@ class Horde_Kolab_Server_Test extends Horde_Kolab_Server_Ldap
             }
             $result = $subtree;
         }
-        return $this->getEntries($result);
+        $search = new Horde_Kolab_Server_Test_Search($this->getEntries($result));
+        return $search;
     }
 
     /**
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Test/Search.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Test/Search.php
new file mode 100644
index 000000000..d5af8733d
--- /dev/null
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Test/Search.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * A class for simulating a Kolab user database search result.
+ *
+ * PHP version 5
+ *
+ * @category Kolab
+ * @package  Kolab_Server
+ * @author   Gunnar Wrobel <wrobel@pardus.de>
+ * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
+ * @link     http://pear.horde.org/index.php?package=Kolab_Server
+ */
+
+/**
+ * A class for simulating a Kolab user database search result.
+ *
+ * Copyright 2009 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
+ *
+ * @category Kolab
+ * @package  Kolab_Server
+ * @author   Gunnar Wrobel <wrobel@pardus.de>
+ * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
+ * @link     http://pear.horde.org/index.php?package=Kolab_Server
+ */
+class Horde_Kolab_Server_Test_Search
+{
+
+    /**
+     * The result data.
+     *
+     * @var array
+     */
+    protected $data;
+
+    /**
+     * Construct a new instance of this class.
+     *
+     * @param array $the search result.
+     */
+    public function __construct($data = array())
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Return the result.
+     *
+     * @return array The result dataset.
+     */
+    public function as_struct()
+    {
+        return $this->data;
+    }
+}
diff --git a/framework/Kolab_Server/package.xml b/framework/Kolab_Server/package.xml
index cfb2ba4ca..1cff6b7aa 100644
--- a/framework/Kolab_Server/package.xml
+++ b/framework/Kolab_Server/package.xml
@@ -53,7 +53,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
        <file name="Ldap.php" role="php" />
        <file name="MissingObjectException.php" role="php" />
        <file name="Object.php" role="php" />
-       <file name="Test.php" role="php" />
        <dir name="Object">
         <file name="address.php" role="php" />
         <file name="administrator.php" role="php" />
@@ -67,6 +66,10 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file name="sharedfolder.php" role="php" />
         <file name="user.php" role="php" />
        </dir> <!-- /lib/Horde/Kolab/Server/Object -->
+       <file name="Test.php" role="php" />
+       <dir name="Test">
+        <file name="Search.php" role="php" />
+       </dir> <!-- /lib/Horde/Kolab/Server/Test -->
       </dir> <!-- /lib/Horde/Kolab/Server -->
       <dir name="Test">
        <file name="Server.php" role="php" />
@@ -135,7 +138,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <install name="lib/Horde/Kolab/Server/File.php" as="Horde/Kolab/Server/File.php" />
    <install name="lib/Horde/Kolab/Server/Ldap.php" as="Horde/Kolab/Server/Ldap.php" />
    <install name="lib/Horde/Kolab/Server/MissingObjectException.php" as="Horde/Kolab/Server/MissingObjectException.php" />
-   <install name="lib/Horde/Kolab/Server/Test.php" as="Horde/Kolab/Server/Test.php" />
    <install name="lib/Horde/Kolab/Server/Object.php" as="Horde/Kolab/Server/Object.php" />
    <install name="lib/Horde/Kolab/Server/Object/address.php" as="Horde/Kolab/Server/Object/address.php" />
    <install name="lib/Horde/Kolab/Server/Object/administrator.php" as="Horde/Kolab/Server/Object/administrator.php" />
@@ -148,6 +150,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <install name="lib/Horde/Kolab/Server/Object/server.php" as="Horde/Kolab/Server/Object/server.php" />
    <install name="lib/Horde/Kolab/Server/Object/sharedfolder.php" as="Horde/Kolab/Server/Object/sharedfolder.php" />
    <install name="lib/Horde/Kolab/Server/Object/user.php" as="Horde/Kolab/Server/Object/user.php" />
+   <install name="lib/Horde/Kolab/Server/Test.php" as="Horde/Kolab/Server/Test.php" />
+   <install name="lib/Horde/Kolab/Server/Test/Search.php" as="Horde/Kolab/Server/Test/Search.php" />
    <install name="test/Horde/Kolab/Server/AddingObjectsTest.php" as="Horde/Kolab/Server/AddingObjectsTest.php" />
    <install name="test/Horde/Kolab/Server/AdminTest.php" as="Horde/Kolab/Server/AdminTest.php" />
    <install name="test/Horde/Kolab/Server/AllTests.php" as="Horde/Kolab/Server/AllTests.php" />
-- 
2.11.0