Complete testing.

diff --git a/framework/Kolab_Session/lib/Horde/Kolab/Session/Decorator/Logged.php b/framework/Kolab_Session/lib/Horde/Kolab/Session/Decorator/Logged.php
index 1c81d96..0f64199 100644 (file)
--- a/framework/Kolab_Session/lib/Horde/Kolab/Session/Decorator/Logged.php
+++ b/framework/Kolab_Session/lib/Horde/Kolab/Session/Decorator/Logged.php
@@ -94,8 +94,8 @@ extends Horde_Kolab_Session_Decorator_Base
         $session_data = $this->_session->export();
         $this->_logger->info(
             sprintf(
-                "Exported session data for \"%s\" (%s). [%s]",
-                $this->_session->getMail(), serialize($session_data), new Horde_Support_Backtrace()
+                "Exported session data for \"%s\" (%s).",
+                $this->_session->getMail(), serialize($session_data)
             )
         );
         return $session_data;
@@ -113,8 +113,8 @@ extends Horde_Kolab_Session_Decorator_Base
         $this->_session->import($session_data);
         $this->_logger->info(
             sprintf(
-                "Imported session data for \"%s\" (%s). [%s]",
-                $this->_session->getMail(), serialize($session_data), new Horde_Support_Backtrace()
+                "Imported session data for \"%s\" (%s).",
+                $this->_session->getMail(), serialize($session_data)
             )
         );
     }
@@ -128,8 +128,8 @@ extends Horde_Kolab_Session_Decorator_Base
     {
         $this->_logger->warn(
             sprintf(
-                "Purged session data for \"%s\". [%s]",
-                $this->_session->getMail(), new Horde_Support_Backtrace()
+                "Purging session data for \"%s\".",
+                $this->_session->getMail()
             )
         );
         $this->_session->purge();

diff --git a/framework/Kolab_Session/test/Horde/Kolab/Session/Unit/BaseTest.php b/framework/Kolab_Session/test/Horde/Kolab/Session/Unit/BaseTest.php
index 768bede..dfa8c67 100644 (file)
--- a/framework/Kolab_Session/test/Horde/Kolab/Session/Unit/BaseTest.php
+++ b/framework/Kolab_Session/test/Horde/Kolab/Session/Unit/BaseTest.php
@@ -424,4 +424,70 @@ class Horde_Kolab_Session_Unit_BaseTest extends Horde_Kolab_Session_TestCase
         $session->connect('userid', array('password' => ''));
         $this->assertEquals('localhost', $session->getImapServer());
     }
+
+    public function testEmptyGetId()
+    {
+        $composite = $this->_getMockedComposite();
+        $session = new Horde_Kolab_Session_Base(
+            $composite, array()
+        );
+        $this->assertNull($session->getId());
+    }
+
+    public function testEmptyGetMail()
+    {
+        $composite = $this->_getMockedComposite();
+        $session = new Horde_Kolab_Session_Base(
+            $composite, array()
+        );
+        $this->assertNull($session->getMail());
+    }
+
+    public function testEmptyGetName()
+    {
+        $composite = $this->_getMockedComposite();
+        $session = new Horde_Kolab_Session_Base(
+            $composite, array()
+        );
+        $this->assertNull($session->getName());
+    }
+
+    public function testEmptyGetUid()
+    {
+        $composite = $this->_getMockedComposite();
+        $session = new Horde_Kolab_Session_Base(
+            $composite, array()
+        );
+        $this->assertNull($session->getUid());
+    }
+
+    public function testEmptyGetFreebusyServer()
+    {
+        $composite = $this->_getMockedComposite();
+        $session = new Horde_Kolab_Session_Base(
+            $composite, array()
+        );
+        $this->assertNull($session->getFreebusyServer());
+    }
+
+    public function testEmptyGetImapServer()
+    {
+        $composite = $this->_getMockedComposite();
+        $session = new Horde_Kolab_Session_Base(
+            $composite, array()
+        );
+        $this->assertNull($session->getImapServer());
+    }
+
+    public function testImportExport()
+    {
+        $data = array('test');
+        $composite = $this->_getMockedComposite();
+        $session = new Horde_Kolab_Session_Base(
+            $composite, array()
+        );
+        $session->import($data);
+        $this->assertEquals($data, $session->export());
+    }
+
 }
\ No newline at end of file

diff --git a/framework/Kolab_Session/test/Horde/Kolab/Session/Unit/Decorator/BaseTest.php b/framework/Kolab_Session/test/Horde/Kolab/Session/Unit/Decorator/BaseTest.php
index bb7c6e1..fb1184a 100644 (file)
--- a/framework/Kolab_Session/test/Horde/Kolab/Session/Unit/Decorator/BaseTest.php
+++ b/framework/Kolab_Session/test/Horde/Kolab/Session/Unit/Decorator/BaseTest.php
@@ -116,4 +116,39 @@ extends Horde_Kolab_Session_TestCase
         );
         $anonymous->getFreebusyServer();
     }
+
+    public function testImport()
+    {
+        $session = $this->getMock('Horde_Kolab_Session');
+        $session->expects($this->once())
+            ->method('import')
+            ->with(array('test'));
+        $anonymous = new Horde_Kolab_Session_Decorator_Base(
+            $session
+        );
+        $anonymous->import(array('test'));
+    }
+
+    public function testExport()
+    {
+        $session = $this->getMock('Horde_Kolab_Session');
+        $session->expects($this->once())
+            ->method('export')
+            ->will($this->returnValue(array('export')));
+        $anonymous = new Horde_Kolab_Session_Decorator_Base(
+            $session
+        );
+        $this->assertEquals(array('export'), $anonymous->export());
+    }
+
+    public function testPurge()
+    {
+        $session = $this->getMock('Horde_Kolab_Session');
+        $session->expects($this->once())
+            ->method('purge');
+        $anonymous = new Horde_Kolab_Session_Decorator_Base(
+            $session
+        );
+        $anonymous->purge();
+    }
 }
\ No newline at end of file

diff --git a/framework/Kolab_Session/test/Horde/Kolab/Session/Unit/Decorator/LoggedTest.php b/framework/Kolab_Session/test/Horde/Kolab/Session/Unit/Decorator/LoggedTest.php
index 3a00298..b6c728f 100644 (file)
--- a/framework/Kolab_Session/test/Horde/Kolab/Session/Unit/Decorator/LoggedTest.php
+++ b/framework/Kolab_Session/test/Horde/Kolab/Session/Unit/Decorator/LoggedTest.php
@@ -89,4 +89,72 @@ extends Horde_Kolab_Session_TestCase
         } catch (Horde_Kolab_Session_Exception $e) {
         }
     }
+
+    public function testExport()
+    {
+        $session = $this->getMock('Horde_Kolab_Session');
+        $session->expects($this->once())
+            ->method('export')
+            ->will($this->returnValue('test'));
+        $session->expects($this->once())
+            ->method('getMail')
+            ->will($this->returnValue('somebody@example.org'));
+        $this->logger->expects($this->once())
+            ->method('__call')
+            ->with(
+                'info',
+                array(
+                    'Exported session data for "somebody@example.org" (s:4:"test";).'
+                )
+            );
+        $logged = new Horde_Kolab_Session_Decorator_Logged(
+            $session, $this->logger
+        );
+        $logged->export();
+    }
+
+    public function testImport()
+    {
+        $session = $this->getMock('Horde_Kolab_Session');
+        $session->expects($this->once())
+            ->method('import')
+            ->with(array('test'));
+        $session->expects($this->once())
+            ->method('getMail')
+            ->will($this->returnValue('somebody@example.org'));
+        $this->logger->expects($this->once())
+            ->method('__call')
+            ->with(
+                'info',
+                array(
+                    'Imported session data for "somebody@example.org" (a:1:{i:0;s:4:"test";}).'
+                )
+            );
+        $logged = new Horde_Kolab_Session_Decorator_Logged(
+            $session, $this->logger
+        );
+        $logged->import(array('test'));
+    }
+
+    public function testPurge()
+    {
+        $session = $this->getMock('Horde_Kolab_Session');
+        $session->expects($this->once())
+            ->method('purge');
+        $session->expects($this->once())
+            ->method('getMail')
+            ->will($this->returnValue('somebody@example.org'));
+        $this->logger->expects($this->once())
+            ->method('__call')
+            ->with(
+                'warn',
+                array(
+                    'Purging session data for "somebody@example.org".'
+                )
+            );
+        $logged = new Horde_Kolab_Session_Decorator_Logged(
+            $session, $this->logger
+        );
+        $logged->purge();
+    }
 }
\ No newline at end of file