From 73a97eb03d608d29ec6270c46a24f16b31c5267d Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Wed, 4 Nov 2009 10:14:22 +0100
Subject: [PATCH] Complete testing.

---
 framework/Kolab_Session/lib/Horde/Kolab/Session/Base.php |  6 +++---
 framework/Kolab_Session/package.xml                      |  4 ++--
 .../Session/{Class => Integration}/SingletonTest.php     | 16 ++++++++++++++--
 3 files changed, 19 insertions(+), 7 deletions(-)
 rename framework/Kolab_Session/test/Horde/Kolab/Session/{Class => Integration}/SingletonTest.php (72%)

diff --git a/framework/Kolab_Session/lib/Horde/Kolab/Session/Base.php b/framework/Kolab_Session/lib/Horde/Kolab/Session/Base.php
index 839c7066e..add352c6f 100644
--- a/framework/Kolab_Session/lib/Horde/Kolab/Session/Base.php
+++ b/framework/Kolab_Session/lib/Horde/Kolab/Session/Base.php
@@ -199,7 +199,7 @@ class Horde_Kolab_Session_Base implements Horde_Kolab_Session
         Horde_Kolab_Server_Object_Interface $user
     ) {
         try {
-            $this->_user_name = $user->getExternal('Fnln');
+            $this->_user_name = $user->getExternal('Firstnamelastname');
         } catch (Horde_Kolab_Server_Exception_Novalue $e) {
             $this->_user_name = $this->_user_id;
         }
@@ -216,7 +216,7 @@ class Horde_Kolab_Session_Base implements Horde_Kolab_Session
         Horde_Kolab_Server_Object_Interface $user
     ) {
         try {
-            $this->_imap_server = $user->getExternal('KolabHomeserver');
+            $this->_imap_server = $user->getExternal('Kolabhomeserver');
         } catch (Horde_Kolab_Server_Exception_Novalue $e) {
             if (isset($this->_params['imap']['server'])) {
                 $this->_imap_server = $this->_params['imap']['server'];
@@ -237,7 +237,7 @@ class Horde_Kolab_Session_Base implements Horde_Kolab_Session
         Horde_Kolab_Server_Object_Interface $user
     ) {
         try {
-            $fb_server = $user->getExternal('KolabFreebusyHost');
+            $fb_server = $user->getExternal('Kolabfreebusyhost');
         } catch (Horde_Kolab_Server_Exception_Novalue $e) {
             if (isset($this->_params['freebusy']['url'])) {
                 $this->_freebusy_server = $this->_params['freebusy']['url'];
diff --git a/framework/Kolab_Session/package.xml b/framework/Kolab_Session/package.xml
index 0eb77ba5f..2049419fc 100644
--- a/framework/Kolab_Session/package.xml
+++ b/framework/Kolab_Session/package.xml
@@ -105,7 +105,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
          <file name="LoggedTest.php" role="test" />
         </dir> <!-- /test/Horde/Kolab/Session/Class/Factory -->
         <file name="LoggedTest.php" role="test" />
-        <file name="SingletonTest.php" role="test" />
         <dir name="Storage">
          <file name="MockTest.php" role="test" />
          <file name="SessionobjectsTest.php" role="test" />
@@ -119,6 +118,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
        <dir name="Integration">
         <file name="AnonymousTest.php" role="test" />
         <file name="SessionTest.php" role="test" />
+        <file name="SingletonTest.php" role="test" />
         <file name="ValidTest.php" role="test" />
        </dir> <!-- /test/Horde/Kolab/Session/Integration -->
        <file name="phpunit.xml" role="test" />
@@ -205,7 +205,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <install name="test/Horde/Kolab/Session/Class/Factory/InjectorTest.php" as="Horde/Kolab/Session/Class/Factory/InjectorTest.php" />
    <install name="test/Horde/Kolab/Session/Class/Factory/LoggedTest.php" as="Horde/Kolab/Session/Class/Factory/LoggedTest.php" />
    <install name="test/Horde/Kolab/Session/Class/LoggedTest.php" as="Horde/Kolab/Session/Class/LoggedTest.php" />
-   <install name="test/Horde/Kolab/Session/Class/SingletonTest.php" as="Horde/Kolab/Session/Class/SingletonTest.php" />
    <install name="test/Horde/Kolab/Session/Class/Storage/MockTest.php" as="Horde/Kolab/Session/Class/Storage/MockTest.php" />
    <install name="test/Horde/Kolab/Session/Class/Storage/SessionobjectsTest.php" as="Horde/Kolab/Session/Class/Storage/SessionobjectsTest.php" />
    <install name="test/Horde/Kolab/Session/Class/StoredTest.php" as="Horde/Kolab/Session/Class/StoredTest.php" />
@@ -213,6 +212,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <install name="test/Horde/Kolab/Session/Class/Valid/LoggedTest.php" as="Horde/Kolab/Session/Class/Valid/LoggedTest.php" />
    <install name="test/Horde/Kolab/Session/Integration/AnonymousTest.php" as="Horde/Kolab/Session/Integration/AnonymousTest.php" />
    <install name="test/Horde/Kolab/Session/Integration/SessionTest.php" as="Horde/Kolab/Session/Integration/SessionTest.php" />
+   <install name="test/Horde/Kolab/Session/Integration/SingletonTest.php" as="Horde/Kolab/Session/Integration/SingletonTest.php" />
    <install name="test/Horde/Kolab/Session/Integration/ValidTest.php" as="Horde/Kolab/Session/Integration/ValidTest.php" />
    <install name="test/Horde/Kolab/Session/phpunit.xml" as="Horde/Kolab/Session/phpunit.php" />
    <install name="test/Horde/Kolab/Session/SessionTestCase.php" as="Horde/Kolab/Session/SessionTestCase.php" />
diff --git a/framework/Kolab_Session/test/Horde/Kolab/Session/Class/SingletonTest.php b/framework/Kolab_Session/test/Horde/Kolab/Session/Integration/SingletonTest.php
similarity index 72%
rename from framework/Kolab_Session/test/Horde/Kolab/Session/Class/SingletonTest.php
rename to framework/Kolab_Session/test/Horde/Kolab/Session/Integration/SingletonTest.php
index bf12f4677..ecd608da5 100644
--- a/framework/Kolab_Session/test/Horde/Kolab/Session/Class/SingletonTest.php
+++ b/framework/Kolab_Session/test/Horde/Kolab/Session/Integration/SingletonTest.php
@@ -30,14 +30,26 @@ require_once dirname(__FILE__) . '/../Autoload.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Session
  */
-class Horde_Kolab_Session_Class_SingletonTest extends Horde_Kolab_Session_SessionTestCase
+class Horde_Kolab_Session_Integration_SingletonTest extends Horde_Kolab_Session_SessionTestCase
 {
     public function setUp()
     {
         global $conf;
 
         /** Provide a minimal configuration for the server */
-        $conf['kolab']['ldap']['basedn'] = '';
+        $conf['kolab']['ldap']['basedn'] = 'dc=test';
+        $conf['kolab']['ldap']['mock']   = true;
+        $conf['kolab']['ldap']['data']   = array(
+            'dn=user,dc=test' => array(
+                'dn' => 'dn=user,dc=test',
+                'data' => array(
+                    'uid' => array('user'),
+                    'mail' => array('user@example.org'),
+                    'userPassword' => array('pass'),
+                    'objectClass' => array('top', 'kolabInetOrgPerson'),
+                )
+            )
+        );
     }
 
     public function testMethodSingletonHasResultHordekolabsession()
-- 
2.11.0