From a7cf966d9a872a498cd570a90bd379218f4a8e93 Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel
Date: Thu, 9 Apr 2009 07:45:17 +0200 Subject: [PATCH] Allow connections to real LDAP servers. --- .../Kolab_Server/lib/Horde/Kolab/Test/Server.php | 44 +++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php b/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php index 84daef094..0033eb8fe 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php @@ -289,11 +289,53 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase /** Ensure we don't use a connection from older tests */ $server->clean(); - /** Clean the server data */ return $server; } /** + * Prepare a connection to a real LDAP server. + * + * @return Horde_Kolab_Server The LDAP server connection. + */ + public function &prepareLdapKolabServer($params) + { + global $conf; + + /** Prepare a Kolab test server */ + $conf['kolab']['server']['driver'] = 'ldap'; + + $server = Horde_Kolab_Server::singleton($params); + + return $server; + } + + /** + * Provide different server types. + * + * @return array The different server types. + */ + public function &provideServers() + { + $servers = array(); + /** + * We always use the test server + */ + $servers[] = $this->prepareEmptyKolabServer(); + + $base = getenv('HORDE_BASE'); + if (!empty($base)) { + $config = $base . '/config/kolab.php'; + if (file_exists($config)) { + @include $config; + if (!empty($conf['kolab']['server']['params'])) { + $servers[] = $this->prepareLdapKolabServer($conf['kolab']['server']['params']); + } + } + } + return array($servers); + } + + /** * Prepare the currently configured Kolab server. * * @return Horde_Kolab_Server The current server. -- 2.11.0