Horde-style test configuration.

horde · Jan 26, 2015 · d8c64ff · d8c64ff
1 parent 622129b
commit d8c64ff
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/framework/ManageSieve/test/Horde/ManageSieve/SieveTest.php b/framework/ManageSieve/test/Horde/ManageSieve/SieveTest.php
@@ -33,6 +33,13 @@ class SieveTest extends Horde_Test_Case
      */
     protected $fixture;
 
+    /**
+     * Server configuration.
+     *
+     * @var array
+     */
+    protected $config;
+
     /**
      * The tested scripts.
      *
@@ -42,10 +49,12 @@ class SieveTest extends Horde_Test_Case
 
     protected function setUp()
     {
-        if (!file_exists(dirname(__FILE__) . '/conf.php')) {
-            $this->markTestSkipped('Test configuration incomplete. Copy conf.php.dist to conf.php.');
+        $this->config = self::getConfig('MANAGESIEVE_TEST_CONFIG');
+        if (!$this->config || empty($this->config['managesieve'])) {
+            $this->markTestSkipped('No ManageSieve configuration');
+            return;
         }
-        require_once dirname(__FILE__) . '/conf.php';
+        $this->config = $this->config['managesieve'];
 
         // Create a new instance of Horde\ManageSieve.
         $this->fixture = new ManageSieve();
@@ -64,8 +73,8 @@ protected function tearDown()
 
     protected function login()
     {
-        $this->fixture->connect(HOST, PORT);
-        $this->fixture->login(USERNAME, PASSWORD, null, '', false);
+        $this->fixture->connect($this->config['host'], $this->config['port']);
+        $this->fixture->login($this->config['username'], $this->config['password'], null, '', false);
     }
 
     protected function logout()
@@ -92,19 +101,19 @@ protected function clear()
 
     public function testConnect()
     {
-        $this->fixture->connect(HOST, PORT);
+        $this->fixture->connect($this->config['host'], $this->config['port']);
     }
 
     public function testLogin()
     {
-        $this->fixture->connect(HOST, PORT);
-        $this->fixture->login(USERNAME, PASSWORD, null, '', false);
+        $this->fixture->connect($this->config['host'], $this->config['port']);
+        $this->fixture->login($this->config['username'], $this->config['password'], null, '', false);
     }
 
     public function testDisconnect()
     {
-        $this->fixture->connect(HOST, PORT);
-        $this->fixture->login(USERNAME, PASSWORD, null, '', false);
+        $this->fixture->connect($this->config['host'], $this->config['port']);
+        $this->fixture->login($this->config['username'], $this->config['password'], null, '', false);
         $this->fixture->disconnect();
     }
 

diff --git a/framework/ManageSieve/test/Horde/ManageSieve/conf.php.dist b/framework/ManageSieve/test/Horde/ManageSieve/conf.php.dist
@@ -1,5 +1,5 @@
 <?php
-define('HOST', 'localhost');
-define('PORT', 4190);
-define('USERNAME', 'user');
-define('PASSWORD', 'pass');
+$conf['managesieve']['host'] = 'localhost';
+$conf['managesieve']['port'] = 4190;
+$conf['managesieve']['username'] = 'user';
+$conf['managesieve']['password'] = 'pass';