*/
public function setUp()
{
- ConfigManager::$CONFIG_FILE = self::$configFile;
- $this->conf = ConfigManager::reset();
+ $this->conf = new ConfigManager(self::$configFile);
}
/**
'updateMethodDummy3',
'updateMethodException',
);
- $updater = new DummyUpdater($updates, array(), true);
+ $updater = new DummyUpdater($updates, array(), $this->conf, true);
$this->assertEquals(array(), $updater->update());
- $updater = new DummyUpdater(array(), array(), false);
+ $updater = new DummyUpdater(array(), array(), $this->conf, false);
$this->assertEquals(array(), $updater->update());
}
'updateMethodDummy2',
'updateMethodDummy3',
);
- $updater = new DummyUpdater($updates, array(), true);
+ $updater = new DummyUpdater($updates, array(), $this->conf, true);
$this->assertEquals($expectedUpdates, $updater->update());
}
);
$expectedUpdate = array('updateMethodDummy2');
- $updater = new DummyUpdater($updates, array(), true);
+ $updater = new DummyUpdater($updates, array(), $this->conf, true);
$this->assertEquals($expectedUpdate, $updater->update());
}
'updateMethodDummy3',
);
- $updater = new DummyUpdater($updates, array(), true);
+ $updater = new DummyUpdater($updates, array(), $this->conf, true);
$updater->update();
}
*/
public function testUpdateMergeDeprecatedConfig()
{
- ConfigManager::$CONFIG_FILE = 'tests/utils/config/configPhp';
- $this->conf = $this->conf->reset();
+ $this->conf->setConfigFile('tests/utils/config/configPhp');
+ $this->conf->reset();
$optionsFile = 'tests/Updater/options.php';
$options = '<?php
file_put_contents($optionsFile, $options);
// tmp config file.
- ConfigManager::$CONFIG_FILE = 'tests/Updater/config';
+ $this->conf->setConfigFile('tests/Updater/config');
// merge configs
- $updater = new Updater(array(), array(), true);
+ $updater = new Updater(array(), array(), $this->conf, true);
// This writes a new config file in tests/Updater/config.php
$updater->updateMethodMergeDeprecatedConfigFile();
$this->assertTrue($this->conf->get('general.default_private_links'));
$this->assertFalse(is_file($optionsFile));
// Delete the generated file.
- unlink($this->conf->getConfigFile());
+ unlink($this->conf->getConfigFileExt());
}
/**
*/
public function testMergeDeprecatedConfigNoFile()
{
- $updater = new Updater(array(), array(), true);
+ $updater = new Updater(array(), array(), $this->conf, true);
$updater->updateMethodMergeDeprecatedConfigFile();
$this->assertEquals('root', $this->conf->get('credentials.login'));
$refDB->write(self::$testDatastore);
$linkDB = new LinkDB(self::$testDatastore, true, false);
$this->assertEmpty($linkDB->filterSearch(array('searchtags' => 'exclude')));
- $updater = new Updater(array(), $linkDB, true);
+ $updater = new Updater(array(), $linkDB, $this->conf, true);
$updater->updateMethodRenameDashTags();
$this->assertNotEmpty($linkDB->filterSearch(array('searchtags' => 'exclude')));
}
public function testConfigToJson()
{
$configFile = 'tests/utils/config/configPhp';
- ConfigManager::$CONFIG_FILE = $configFile;
- $conf = ConfigManager::reset();
+ $this->conf->setConfigFile($configFile);
+ $this->conf->reset();
// The ConfigIO is initialized with ConfigPhp.
- $this->assertTrue($conf->getConfigIO() instanceof ConfigPhp);
+ $this->assertTrue($this->conf->getConfigIO() instanceof ConfigPhp);
- $updater = new Updater(array(), array(), false);
+ $updater = new Updater(array(), array(), $this->conf, false);
$done = $updater->updateMethodConfigToJson();
$this->assertTrue($done);
// The ConfigIO has been updated to ConfigJson.
- $this->assertTrue($conf->getConfigIO() instanceof ConfigJson);
- $this->assertTrue(file_exists($conf->getConfigFile()));
+ $this->assertTrue($this->conf->getConfigIO() instanceof ConfigJson);
+ $this->assertTrue(file_exists($this->conf->getConfigFileExt()));
// Check JSON config data.
- $conf->reload();
- $this->assertEquals('root', $conf->get('credentials.login'));
- $this->assertEquals('lala', $conf->get('extras.redirector'));
- $this->assertEquals('data/datastore.php', $conf->get('path.datastore'));
- $this->assertEquals('1', $conf->get('plugins.WALLABAG_VERSION'));
+ $this->conf->reload();
+ $this->assertEquals('root', $this->conf->get('credentials.login'));
+ $this->assertEquals('lala', $this->conf->get('extras.redirector'));
+ $this->assertEquals('data/datastore.php', $this->conf->get('path.datastore'));
+ $this->assertEquals('1', $this->conf->get('plugins.WALLABAG_VERSION'));
rename($configFile . '.save.php', $configFile . '.php');
- unlink($conf->getConfigFile());
+ unlink($this->conf->getConfigFileExt());
}
/**
*/
public function testConfigToJsonNothingToDo()
{
- $filetime = filemtime($this->conf->getConfigFile());
- $updater = new Updater(array(), array(), false);
+ $filetime = filemtime($this->conf->getConfigFileExt());
+ $updater = new Updater(array(), array(), $this->conf, false);
$done = $updater->updateMethodConfigToJson();
$this->assertTrue($done);
- $expected = filemtime($this->conf->getConfigFile());
+ $expected = filemtime($this->conf->getConfigFileExt());
$this->assertEquals($expected, $filetime);
}
}