Add unit testing of the base Autoconfig object

horde · May 17, 2014 · 81cd5a7 · 81cd5a7
1 parent af1d1f4
commit 81cd5a7
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/framework/Mail_Autoconfig/package.xml b/framework/Mail_Autoconfig/package.xml
@@ -70,6 +70,7 @@
        <file name="AllTests.php" role="test" />
        <file name="AutoconfigTest.php" role="test" />
        <file name="bootstrap.php" role="test" />
+       <file name="conf.php.dist" role="test" />
        <file name="phpunit.xml" role="test" />
       </dir> <!-- /test/Horde/Mail/Autoconfig -->
      </dir> <!-- /test/Horde/Mail -->
@@ -149,6 +150,7 @@
    <install as="Horde/Mail/Autoconfig/AllTests.php" name="test/Horde/Mail/Autoconfig/AllTests.php" />
    <install as="Horde/Mail/Autoconfig/AutoconfigTest.php" name="test/Horde/Mail/Autoconfig/AutoconfigTest.php" />
    <install as="Horde/Mail/Autoconfig/bootstrap.php" name="test/Horde/Mail/Autoconfig/bootstrap.php" />
+   <install as="Horde/Mail/Autoconfig/conf.php.dist" name="test/Horde/Mail/Autoconfig/conf.php.dist" />
    <install as="Horde/Mail/Autoconfig/phpunit.xml" name="test/Horde/Mail/Autoconfig/phpunit.xml" />
    <install as="Horde/Mail/Autoconfig/Driver/conf.php.dist" name="test/Horde/Mail/Autoconfig/Driver/conf.php.dist" />
    <install as="Horde/Mail/Autoconfig/Driver/GuessTest.php" name="test/Horde/Mail/Autoconfig/Driver/GuessTest.php" />

diff --git a/framework/Mail_Autoconfig/test/Horde/Mail/Autoconfig/AutoconfigTest.php b/framework/Mail_Autoconfig/test/Horde/Mail/Autoconfig/AutoconfigTest.php
@@ -23,12 +23,46 @@
  * @package    Mail_Autoconfig
  * @subpackage UnitTests
  */
-class Horde_Mail_Autoconfig_AutoconfigTest extends PHPUnit_Framework_TestCase
+class Horde_Mail_Autoconfig_AutoconfigTest extends Horde_Test_Case
 {
+    private $aconfig;
+
+    public function setUp()
+    {
+        $this->aconfig = new Horde_Mail_Autoconfig();
+    }
+
     public function testGetDrivers()
     {
-        $drivers = Horde_Mail_Autoconfig::getDrivers();
+        $drivers = $this->aconfig->getDrivers();
         $this->assertNotEmpty($drivers);
     }
 
+    /**
+     * @dataProvider provider
+     */
+    public function testGetMsaConfigWithoutAuth($email)
+    {
+        $this->assertNotFalse($this->aconfig->getMsaConfig($email));
+    }
+
+    /**
+     * @dataProvider provider
+     */
+    public function testGetMailConfigWithoutAuth($email)
+    {
+        $this->assertNotFalse($this->aconfig->getMailConfig($email));
+    }
+
+    public function provider()
+    {
+        $config = self::getConfig('MAILAUTOCONFIG_TEST_CONFIG');
+        if (!is_null($config) &&
+            !empty($config['mail_autoconfig']['nonauth_emails'])) {
+            return $config['mail_autoconfig']['nonauth_emails'];
+        }
+
+        return array();
+    }
+
 }