X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tests%2Fconfig%2FConfigJsonTest.php;h=d237bc80cdacd1a7919399f68cad57ece869a470;hb=9f32160c323e77237e4051056c1f1061586cc12e;hp=0960c729a3a7ebf0de6846e3f24ee915ba0e6cba;hpb=da10377b3c263d96a46cf9101c202554343d2cd0;p=github%2Fshaarli%2FShaarli.git

diff --git a/tests/config/ConfigJsonTest.php b/tests/config/ConfigJsonTest.php
index 0960c729..d237bc80 100644
--- a/tests/config/ConfigJsonTest.php
+++ b/tests/config/ConfigJsonTest.php
@@ -1,11 +1,10 @@
 <?php
-
-require_once 'application/config/ConfigJson.php';
+namespace Shaarli\Config;
 
 /**
  * Class ConfigJsonTest
  */
-class ConfigJsonTest extends PHPUnit_Framework_TestCase
+class ConfigJsonTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var ConfigJson
@@ -24,8 +23,8 @@ class ConfigJsonTest extends PHPUnit_Framework_TestCase
     {
         $conf = $this->configIO->read('tests/utils/config/configJson.json.php');
         $this->assertEquals('root', $conf['credentials']['login']);
-        $this->assertEquals('lala', $conf['extras']['redirector']);
-        $this->assertEquals('tests/utils/config/datastore.php', $conf['path']['datastore']);
+        $this->assertEquals('lala', $conf['redirector']['url']);
+        $this->assertEquals('tests/utils/config/datastore.php', $conf['resource']['datastore']);
         $this->assertEquals('1', $conf['plugins']['WALLABAG_VERSION']);
     }
 
@@ -40,8 +39,8 @@ class ConfigJsonTest extends PHPUnit_Framework_TestCase
     /**
      * Read a non existent config file -> empty array.
      *
-     * @expectedException Exception
-     * @expectedExceptionMessage An error occured while parsing JSON file: error code #4
+     * @expectedException \Exception
+     * @expectedExceptionMessageRegExp  /An error occurred while parsing JSON configuration file \([\w\/\.]+\): error code #4/
      */
     public function testReadInvalidJson()
     {
@@ -58,11 +57,11 @@ class ConfigJsonTest extends PHPUnit_Framework_TestCase
             'credentials' => array(
                 'login' => 'root',
             ),
-            'path' => array(
+            'resource' => array(
                 'datastore' => 'data/datastore.php',
             ),
-            'extras' => array(
-                'redirector' => 'lala',
+            'redirector' => array(
+                'url' => 'lala',
             ),
             'plugins' => array(
                 'WALLABAG_VERSION' => '1',
@@ -75,20 +74,20 @@ class ConfigJsonTest extends PHPUnit_Framework_TestCase
     "credentials": {
         "login": "root"
     },
-    "path": {
+    "resource": {
         "datastore": "data\/datastore.php"
     },
-    "extras": {
-        "redirector": "lala"
+    "redirector": {
+        "url": "lala"
     },
     "plugins": {
         "WALLABAG_VERSION": "1"
     }
 }';
         } else {
-            $expected = '{"credentials":{"login":"root"},"path":{"datastore":"data\/datastore.php"},"extras":{"redirector":"lala"},"plugins":{"WALLABAG_VERSION":"1"}}';
+            $expected = '{"credentials":{"login":"root"},"resource":{"datastore":"data\/datastore.php"},"redirector":{"url":"lala"},"plugins":{"WALLABAG_VERSION":"1"}}';
         }
-        $expected = ConfigJson::getPhpHeaders() . $expected;
+        $expected = ConfigJson::getPhpHeaders() . $expected . ConfigJson::getPhpSuffix();
         $this->assertEquals($expected, file_get_contents($dataFile));
         unlink($dataFile);
     }
@@ -102,17 +101,17 @@ class ConfigJsonTest extends PHPUnit_Framework_TestCase
         $dest = 'tests/utils/config/configOverwrite.json.php';
         copy($source, $dest);
         $conf = $this->configIO->read($dest);
-        $conf['extras']['redirector'] = 'blabla';
+        $conf['redirector']['url'] = 'blabla';
         $this->configIO->write($dest, $conf);
         $conf = $this->configIO->read($dest);
-        $this->assertEquals('blabla', $conf['extras']['redirector']);
+        $this->assertEquals('blabla', $conf['redirector']['url']);
         unlink($dest);
     }
 
     /**
      * Write to invalid path.
      *
-     * @expectedException IOException
+     * @expectedException \IOException
      */
     public function testWriteInvalidArray()
     {
@@ -123,7 +122,7 @@ class ConfigJsonTest extends PHPUnit_Framework_TestCase
     /**
      * Write to invalid path.
      *
-     * @expectedException IOException
+     * @expectedException \IOException
      */
     public function testWriteInvalidBlank()
     {