Move Utils_ConfigTest to SimpleSAML\Test\Utils\ConfigTest.

1 files changed, 10 insertions, 4 deletions

diff --git a/tests/lib/SimpleSAML/Utils/ConfigTest.php b/tests/lib/SimpleSAML/Utils/ConfigTest.php
index 2fdc080..f3f090b 100644
--- a/tests/lib/SimpleSAML/Utils/ConfigTest.php
+++ b/tests/lib/SimpleSAML/Utils/ConfigTest.php
@@ -1,9 +1,13 @@
 <?php

 

+namespace SimpleSAML\Test\Utils;

+

+use SimpleSAML\Utils\Config;

+

 /**

  * Tests for SimpleSAML\Utils\Config

  */

-class Utils_ConfigTest extends PHPUnit_Framework_TestCase

+class ConfigTest extends \PHPUnit_Framework_TestCase

 {

 

     /**

@@ -13,22 +17,24 @@ class Utils_ConfigTest extends PHPUnit_Framework_TestCase
     {

         // clear env var

         putenv('SIMPLESAMLPHP_CONFIG_DIR');

-        $configDir = \SimpleSAML\Utils\Config::getConfigDir();

+        $configDir = Config::getConfigDir();

 

         $this->assertEquals($configDir, dirname(dirname(dirname(dirname(__DIR__)))) . '/config');

     }

 

+

     /**

      * Test valid dir specified by env var overrides default config dir

      */

     public function testEnvVariableConfigDir()

     {

         putenv('SIMPLESAMLPHP_CONFIG_DIR=' . __DIR__);

-        $configDir = \SimpleSAML\Utils\Config::getConfigDir();

+        $configDir = Config::getConfigDir();

 

         $this->assertEquals($configDir, __DIR__);

     }

 

+

     /**

      * Test invalid dir specified by env var results in a thrown exception

      */

@@ -44,6 +50,6 @@ class Utils_ConfigTest extends PHPUnit_Framework_TestCase
             'Given: "' . $invalidDir . '"'

         );

 

-        \SimpleSAML\Utils\Config::getConfigDir();

+        Config::getConfigDir();

     }

 }