application: introduce the Shaarli\Config namespace

[github/shaarli/Shaarli.git] / tests / ApplicationUtilsTest.php

diff --git a/tests/ApplicationUtilsTest.php b/tests/ApplicationUtilsTest.php
index 3da726399add89f352e8c52cf31550acb6009c06..ad86e21c78d8efe965ea02e940aaff8a7181b9db 100644 (file)
--- a/tests/ApplicationUtilsTest.php
+++ b/tests/ApplicationUtilsTest.php
@@ -1,9 +1,10 @@
 <?php
+use Shaarli\Config\ConfigManager;
+
 /**
  * ApplicationUtils' tests
  */
 
-require_once 'application/config/ConfigManager.php';
 require_once 'application/ApplicationUtils.php';
 
 /**
@@ -75,9 +76,12 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
      */
     public function testGetLatestGitVersionCodeInvalidUrl()
     {
+        $oldlog = ini_get('error_log');
+        ini_set('error_log', '/dev/null');
         $this->assertFalse(
             ApplicationUtils::getLatestGitVersionCode('htttp://null.io', 1)
         );
+        ini_set('error_log', $oldlog);
     }
 
     /**
@@ -277,16 +281,17 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
     public function testCheckCurrentResourcePermissions()
     {
         $conf = new ConfigManager('');
-        $conf->set('path.thumbnails_cache', 'cache');
-        $conf->set('path.config', 'data/config.php');
-        $conf->set('path.data_dir', 'data');
-        $conf->set('path.datastore', 'data/datastore.php');
-        $conf->set('path.ban_file', 'data/ipbans.php');
-        $conf->set('path.log', 'data/log.txt');
-        $conf->set('path.page_cache', 'pagecache');
-        $conf->set('path.raintpl_tmp', 'tmp');
-        $conf->set('path.raintpl_tpl', 'tpl');
-        $conf->set('path.update_check', 'data/lastupdatecheck.txt');
+        $conf->set('resource.thumbnails_cache', 'cache');
+        $conf->set('resource.config', 'data/config.php');
+        $conf->set('resource.data_dir', 'data');
+        $conf->set('resource.datastore', 'data/datastore.php');
+        $conf->set('resource.ban_file', 'data/ipbans.php');
+        $conf->set('resource.log', 'data/log.txt');
+        $conf->set('resource.page_cache', 'pagecache');
+        $conf->set('resource.raintpl_tmp', 'tmp');
+        $conf->set('resource.raintpl_tpl', 'tpl');
+        $conf->set('resource.theme', 'default');
+        $conf->set('resource.update_check', 'data/lastupdatecheck.txt');
 
         $this->assertEquals(
             array(),
@@ -300,19 +305,21 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
     public function testCheckCurrentResourcePermissionsErrors()
     {
         $conf = new ConfigManager('');
-        $conf->set('path.thumbnails_cache', 'null/cache');
-        $conf->set('path.config', 'null/data/config.php');
-        $conf->set('path.data_dir', 'null/data');
-        $conf->set('path.datastore', 'null/data/store.php');
-        $conf->set('path.ban_file', 'null/data/ipbans.php');
-        $conf->set('path.log', 'null/data/log.txt');
-        $conf->set('path.page_cache', 'null/pagecache');
-        $conf->set('path.raintpl_tmp', 'null/tmp');
-        $conf->set('path.raintpl_tpl', 'null/tpl');
-        $conf->set('path.update_check', 'null/data/lastupdatecheck.txt');
+        $conf->set('resource.thumbnails_cache', 'null/cache');
+        $conf->set('resource.config', 'null/data/config.php');
+        $conf->set('resource.data_dir', 'null/data');
+        $conf->set('resource.datastore', 'null/data/store.php');
+        $conf->set('resource.ban_file', 'null/data/ipbans.php');
+        $conf->set('resource.log', 'null/data/log.txt');
+        $conf->set('resource.page_cache', 'null/pagecache');
+        $conf->set('resource.raintpl_tmp', 'null/tmp');
+        $conf->set('resource.raintpl_tpl', 'null/tpl');
+        $conf->set('resource.raintpl_theme', 'null/tpl/default');
+        $conf->set('resource.update_check', 'null/data/lastupdatecheck.txt');
         $this->assertEquals(
             array(
                 '"null/tpl" directory is not readable',
+                '"null/tpl/default" directory is not readable',
                 '"null/cache" directory is not readable',
                 '"null/cache" directory is not writable',
                 '"null/data" directory is not readable',