public function testRead()
{
$conf = $this->configIO->read('tests/utils/config/configJson.json.php');
- $this->assertEquals('root', $conf['login']);
- $this->assertEquals('lala', $conf['redirector']);
- $this->assertEquals('data/datastore.php', $conf['config']['DATASTORE']);
+ $this->assertEquals('root', $conf['credentials']['login']);
+ $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
+ * @expectedExceptionMessage An error occurred while parsing JSON file: error code #4
*/
public function testReadInvalidJson()
{
{
$dataFile = 'tests/utils/config/configWrite.json.php';
$data = array(
- 'login' => 'root',
- 'redirector' => 'lala',
- 'config' => array(
- 'DATASTORE' => 'data/datastore.php',
+ 'credentials' => array(
+ 'login' => 'root',
+ ),
+ 'resource' => array(
+ 'datastore' => 'data/datastore.php',
+ ),
+ 'redirector' => array(
+ 'url' => 'lala',
),
'plugins' => array(
'WALLABAG_VERSION' => '1',
// PHP 5.3 doesn't support json pretty print.
if (defined('JSON_PRETTY_PRINT')) {
$expected = '{
- "login": "root",
- "redirector": "lala",
- "config": {
- "DATASTORE": "data\/datastore.php"
+ "credentials": {
+ "login": "root"
+ },
+ "resource": {
+ "datastore": "data\/datastore.php"
+ },
+ "redirector": {
+ "url": "lala"
},
"plugins": {
"WALLABAG_VERSION": "1"
}
}';
} else {
- $expected = '{"login":"root","redirector":"lala","config":{"DATASTORE":"data\/datastore.php"},"plugins":{"WALLABAG_VERSION":"1"}}';
+ $expected = '{"credentials":{"login":"root"},"resource":{"datastore":"data\/datastore.php"},"redirector":{"url":"lala"},"plugins":{"WALLABAG_VERSION":"1"}}';
}
- $expected = ConfigJson::$PHP_HEADER . $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['redirector'] = 'blabla';
+ $conf['redirector']['url'] = 'blabla';
$this->configIO->write($dest, $conf);
$conf = $this->configIO->read($dest);
- $this->assertEquals('blabla', $conf['redirector']);
+ $this->assertEquals('blabla', $conf['redirector']['url']);
unlink($dest);
}