X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=tests%2FConfigTest.php;h=bdf7d4b0a4ee88679fd8ef96c7ef65f955d993cc;hp=1014d10adb143571f68e1c6728826307aefb6123;hb=efcf0ff41ed87f064714652c13fa2f0195d9a133;hpb=49f84a522f0ccac3b70728cd41011a0be0eed8cf diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php index 1014d10a..bdf7d4b0 100644 --- a/tests/ConfigTest.php +++ b/tests/ConfigTest.php @@ -58,11 +58,8 @@ class ConfigTest extends PHPUnit_Framework_TestCase { // Now try the test $testPassed = false; try { - // Get a configuration instance - $cfg = FrameworkConfiguration::getInstance(); - // Now find a configuration variable that does not exist - $dummy = $cfg->readConfig('does_not_exist'); + $dummy = FrameworkConfiguration::getInstance()->readConfig('does_not_exist'); } catch (ConfigEntryNotFoundException $expected) { // This exception was expected, so it is fine $testPassed = true; @@ -87,11 +84,8 @@ class ConfigTest extends PHPUnit_Framework_TestCase { // Now try the test $testPassed = false; try { - // Get a configuration instance - $cfg = FrameworkConfiguration::getInstance(); - // Try to read an empty configuration variable - $dummy = $cfg->readConfig(''); + $dummy = FrameworkConfiguration::getInstance()->readConfig(''); } catch (ConfigEntryIsEmptyException $expected) { // This exception was expected, so it is fine $testPassed = true; @@ -116,11 +110,8 @@ class ConfigTest extends PHPUnit_Framework_TestCase { // Now try the test $testPassed = false; try { - // Get a configuration instance - $cfg = FrameworkConfiguration::getInstance(); - // Try to read an empty configuration variable - $cfg->setConfigEntry('', 'will_never_be_set'); + FrameworkConfiguration::getInstance()->setConfigEntry('', 'will_never_be_set'); } catch (ConfigEntryIsEmptyException $expected) { // This exception was expected, so it is fine $testPassed = true; @@ -144,14 +135,11 @@ class ConfigTest extends PHPUnit_Framework_TestCase { // Try it here $value = "This is a test value"; try { - // Get a configuration instance - $cfg = FrameworkConfiguration::getInstance(); - // Try to read an empty configuration variable - $cfg->setConfigEntry('test_key', "{$value}"); + FrameworkConfiguration::getInstance()->setConfigEntry('test_key', "{$value}"); // Read the config entry we have just written - $readValue = $cfg->readConfig('test_key'); + $readValue = FrameworkConfiguration::getInstance()->readConfig('test_key'); // Now test the values $this->assertEquals($value, $readValue);