<?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
{
$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']);
}
/**
* 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()
{
'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',
"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);
}
$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()
{
/**
* Write to invalid path.
*
- * @expectedException IOException
+ * @expectedException \IOException
*/
public function testWriteInvalidBlank()
{