Merge pull request #375 from virtualtam/utils/permissions

tools: check file/directory permissions for Shaarli resources

2 files changed, 72 insertions, 2 deletions

diff --git a/tests/ApplicationUtilsTest.php b/tests/ApplicationUtilsTest.php
new file mode 100644
index 00000000..9a99c6c6
--- /dev/null
+++ b/tests/ApplicationUtilsTest.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * ApplicationUtils' tests
+ */
+
+require_once 'application/ApplicationUtils.php';
+
+
+/**
+ * Unitary tests for Shaarli utilities
+ */
+class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Checks resource permissions for the current Shaarli installation
+     */
+    public function testCheckCurrentResourcePermissions()
+    {
+        $config = array(
+            'CACHEDIR' => 'cache',
+            'CONFIG_FILE' => 'data/config.php',
+            'DATADIR' => 'data',
+            'DATASTORE' => 'data/datastore.php',
+            'IPBANS_FILENAME' => 'data/ipbans.php',
+            'LOG_FILE' => 'data/log.txt',
+            'PAGECACHE' => 'pagecache',
+            'RAINTPL_TMP' => 'tmp',
+            'RAINTPL_TPL' => 'tpl',
+            'UPDATECHECK_FILENAME' => 'data/lastupdatecheck.txt'
+        );
+        $this->assertEquals(
+            array(),
+            ApplicationUtils::checkResourcePermissions($config)
+        );
+    }
+
+    /**
+     * Checks resource permissions for a non-existent Shaarli installation
+     */
+    public function testCheckCurrentResourcePermissionsErrors()
+    {
+        $config = array(
+            'CACHEDIR' => 'null/cache',
+            'CONFIG_FILE' => 'null/data/config.php',
+            'DATADIR' => 'null/data',
+            'DATASTORE' => 'null/data/store.php',
+            'IPBANS_FILENAME' => 'null/data/ipbans.php',
+            'LOG_FILE' => 'null/data/log.txt',
+            'PAGECACHE' => 'null/pagecache',
+            'RAINTPL_TMP' => 'null/tmp',
+            'RAINTPL_TPL' => 'null/tpl',
+            'UPDATECHECK_FILENAME' => 'null/data/lastupdatecheck.txt'
+        );
+        $this->assertEquals(
+            array(
+                '"null/tpl" directory is not readable',
+                '"null/cache" directory is not readable',
+                '"null/cache" directory is not writable',
+                '"null/data" directory is not readable',
+                '"null/data" directory is not writable',
+                '"null/pagecache" directory is not readable',
+                '"null/pagecache" directory is not writable',
+                '"null/tmp" directory is not readable',
+                '"null/tmp" directory is not writable'
+            ),
+            ApplicationUtils::checkResourcePermissions($config)
+        );
+    }
+}
diff --git a/tests/LinkDBTest.php b/tests/LinkDBTest.php
index 451f1d6f..8929713d 100644
--- a/tests/LinkDBTest.php
+++ b/tests/LinkDBTest.php
@@ -4,6 +4,7 @@
  */
 
 require_once 'application/Cache.php';
+require_once 'application/FileUtils.php';
 require_once 'application/LinkDB.php';
 require_once 'application/Utils.php';
 require_once 'tests/utils/ReferenceLinkDB.php';
@@ -87,8 +88,8 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
     /**
      * Attempt to instantiate a LinkDB whereas the datastore is not writable
      *
-     * @expectedException              PHPUnit_Framework_Error_Warning
-     * @expectedExceptionMessageRegExp /failed to open stream: No such file or directory/
+     * @expectedException              IOException
+     * @expectedExceptionMessageRegExp /Error accessing null/
      */
     public function testConstructDatastoreNotWriteable()
     {