Return the folder in the cache decorator.

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Decorator/Cache.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Decorator/Cache.php
index c3155eb..bb1a0d8 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Decorator/Cache.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Decorator/Cache.php
@@ -99,7 +99,7 @@ implements Horde_Kolab_Storage
      */
     public function getFolder($folder)
     {
-        return $this->_storage->getFolder();
+        return $this->_storage->getFolder($folder);
     }
 
     /**

diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Decorator/CacheTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Decorator/CacheTest.php
index 2210be2..1059256 100644 (file)
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Decorator/CacheTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Decorator/CacheTest.php
@@ -51,4 +51,20 @@ extends Horde_Kolab_Storage_TestCase
             $storage->getList()
         );
     }
+
+    public function testFolder()
+    {
+        $factory = new Horde_Kolab_Storage_Factory();
+        $base = $this->getMock('Horde_Kolab_Storage');
+        $base->expects($this->once())
+            ->method('getFolder')
+            ->with('test')
+            ->will($this->returnValue('FOLDER'));
+        $storage = new Horde_Kolab_Storage_Decorator_Cache(
+            $base,
+            new Horde_Kolab_Storage_Cache(null),
+            $factory
+        );
+        $this->assertEquals('FOLDER', $storage->getFolder('test'));
+    }
 }