X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tests%2Fconfig%2FConfigJsonTest.php;h=c0ba5b8f07c1c0513ae26050408b3c76f326b9ae;hb=7b18876361f2223672f3a2cac9fc0da16d12d69f;hp=07f6ab49db64953499ab5eb5125eeaf197837ffe;hpb=954dc2446caade6ccad3ffd1173ef139c1f36ad3;p=github%2Fshaarli%2FShaarli.git

diff --git a/tests/config/ConfigJsonTest.php b/tests/config/ConfigJsonTest.php
index 07f6ab49..c0ba5b8f 100644
--- a/tests/config/ConfigJsonTest.php
+++ b/tests/config/ConfigJsonTest.php
@@ -1,18 +1,17 @@
 <?php
-
-require_once 'application/config/ConfigJson.php';
+namespace Shaarli\Config;
 
 /**
  * Class ConfigJsonTest
  */
-class ConfigJsonTest extends PHPUnit_Framework_TestCase
+class ConfigJsonTest extends \Shaarli\TestCase
 {
     /**
      * @var ConfigJson
      */
     protected $configIO;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->configIO = new ConfigJson();
     }
@@ -25,7 +24,7 @@ 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['redirector']['url']);
-        $this->assertEquals('tests/utils/config/datastore.php', $conf['resource']['datastore']);
+        $this->assertEquals('sandbox/datastore.php', $conf['resource']['datastore']);
         $this->assertEquals('1', $conf['plugins']['WALLABAG_VERSION']);
     }
 
@@ -39,12 +38,12 @@ class ConfigJsonTest extends PHPUnit_Framework_TestCase
 
     /**
      * Read a non existent config file -> empty array.
-     *
-     * @expectedException Exception
-     * @expectedExceptionMessage An error occurred while parsing JSON file: error code #4
      */
     public function testReadInvalidJson()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessageRegExp('/An error occurred while parsing JSON configuration file \\([\\w\\/\\.]+\\): error code #4/');
+
         $this->configIO->read('tests/utils/config/configInvalid.json.php');
     }
 
@@ -111,22 +110,11 @@ class ConfigJsonTest extends PHPUnit_Framework_TestCase
 
     /**
      * Write to invalid path.
-     *
-     * @expectedException IOException
-     */
-    public function testWriteInvalidArray()
-    {
-        $conf = array('conf' => 'value');
-        @$this->configIO->write(array(), $conf);
-    }
-
-    /**
-     * Write to invalid path.
-     *
-     * @expectedException IOException
      */
     public function testWriteInvalidBlank()
     {
+        $this->expectException(\Shaarli\Exceptions\IOException::class);
+
         $conf = array('conf' => 'value');
         @$this->configIO->write('', $conf);
     }