Test return of the query object.

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Decorator/Cache.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Decorator/Cache.php
index 0a4b804..5f1d963 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Decorator/Cache.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Decorator/Cache.php
@@ -120,6 +120,7 @@ implements Horde_Kolab_Storage_List
      */
     public function synchronize()
     {
+        //@todo Do not fetch the folder types in case the folder list did not change.
         $this->_list_cache->store(
             $this->_list->listFolders(),
             $this->_list->listFolderTypes()
@@ -154,6 +155,6 @@ implements Horde_Kolab_Storage_List
      */
     public function getQuery($name)
     {
-        $this->_list->getQuery($name);
+        return $this->_list->getQuery($name);
     }
 }
\ No newline at end of file

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Decorator/Log.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Decorator/Log.php
index b97374b..c9476d8 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Decorator/Log.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List/Decorator/Log.php
@@ -154,6 +154,6 @@ implements Horde_Kolab_Storage_List
      */
     public function getQuery($name)
     {
-        $this->_list->getQuery($name);
+        return $this->_list->getQuery($name);
     }
 }
\ No newline at end of file

diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Decorator/CacheTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Decorator/CacheTest.php
index 0ec23c1..a85589c 100644 (file)
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Decorator/CacheTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Decorator/CacheTest.php
@@ -324,4 +324,21 @@ extends Horde_Kolab_Storage_TestCase
         $cache->storeListData($list->getConnectionId(), 'V', '2');
         $list->listFolders();
     }
+
+    public function testGetQuery()
+    {
+        $factory = new Horde_Kolab_Storage_Factory();
+        $cache = $this->getMockCache();
+        $list = new Horde_Kolab_Storage_List_Decorator_Cache(
+            $this->getMockDriverList(),
+            new Horde_Kolab_Storage_Cache_List(
+                $cache
+            )
+        );
+        $factory->createListQuery('Base', $list);
+        $this->assertInstanceOf(
+            'Horde_Kolab_Storage_Query',
+            $list->getQuery('Base')
+        );
+    }
 }

diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Decorator/LogTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Decorator/LogTest.php
index 8b21d99..3f3b620 100644 (file)
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Decorator/LogTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Decorator/LogTest.php
@@ -64,4 +64,18 @@ extends Horde_Kolab_Storage_TestCase
         $list->listFolderTypes();
         $this->assertLogContains('List for test@example.com@mock:0 contained 4 folders and annotations.');
     }
+
+    public function testGetQuery()
+    {
+        $factory = new Horde_Kolab_Storage_Factory();
+        $list = new Horde_Kolab_Storage_List_Decorator_Log(
+            $this->getNullList($factory),
+            $this->getMockLogger()
+        );
+        $factory->createListQuery('Base', $list);
+        $this->assertInstanceOf(
+            'Horde_Kolab_Storage_Query',
+            $list->getQuery('Base')
+        );
+    }
 }