projects
/
core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Now the idle loop time is configurable, please don't set it to low or to high as
[core.git]
/
tests
/
ConfigTest.php
diff --git
a/tests/ConfigTest.php
b/tests/ConfigTest.php
index 7c70e61b7987f4a426f35c0a0d7cff1584bdfda3..c08782e1a2f66e314f8cdc3b14a88877f8c5e42f 100644
(file)
--- a/
tests/ConfigTest.php
+++ b/
tests/ConfigTest.php
@@
-8,30
+8,30
@@
print (basename(__FILE__).": Init...\n");
require(dirname(dirname(__FILE__)) . '/inc/config.php');
// Load all include files
require(dirname(dirname(__FILE__)) . '/inc/config.php');
// Load all include files
-require($cfg->
readConfig
('base_path') . 'inc/includes.php');
+require($cfg->
getConfigEntry
('base_path') . 'inc/includes.php');
// Load all game classes
// Load all game classes
-require($cfg->
readConfig
('base_path') . 'inc/classes.php');
+require($cfg->
getConfigEntry
('base_path') . 'inc/classes.php');
// Set default application
// Set default application
-FrameworkConfiguration::getInstance()->setConfigEntry('default_application', 'ship
-
simu');
+FrameworkConfiguration::getInstance()->setConfigEntry('default_application', 'shipsimu');
// Set testing mode (no starter.php will be loaded!)
define('TEST_MODE', true);
// Load the PHPUnit framework
// Set testing mode (no starter.php will be loaded!)
define('TEST_MODE', true);
// Load the PHPUnit framework
-require
_once
('PHPUnit/Framework.php');
+require('PHPUnit/Framework.php');
print (basename(__FILE__).": Init completed.\n\n");
/**
* A test case for the configuration sub system
*
print (basename(__FILE__).": Init completed.\n\n");
/**
* A test case for the configuration sub system
*
- * @author Roland Haeder <webmaster@ship
-
simu.org>
+ * @author Roland Haeder <webmaster@shipsimu.org>
* @version 0.0.0
* @version 0.0.0
- * @copyright Copyright (c) 2007, 2008 Roland Haeder,
this is free software
+ * @copyright Copyright (c) 2007, 2008 Roland Haeder,
2009 Core Developer Team
* @license GNU GPL 3.0 or any newer version
* @license GNU GPL 3.0 or any newer version
- * @link http://www.ship
-
simu.org
+ * @link http://www.shipsimu.org
* @see http://www.phpunit.de
*
* This program is free software: you can redistribute it and/or modify
* @see http://www.phpunit.de
*
* This program is free software: you can redistribute it and/or modify
@@
-58,11
+58,8
@@
class ConfigTest extends PHPUnit_Framework_TestCase {
// Now try the test
$testPassed = false;
try {
// Now try the test
$testPassed = false;
try {
- // Get a configuration instance
- $cfg = FrameworkConfiguration::getInstance();
-
// Now find a configuration variable that does not exist
// Now find a configuration variable that does not exist
- $dummy =
$cfg->readConfig
('does_not_exist');
+ $dummy =
FrameworkConfiguration::getInstance()->getConfigEntry
('does_not_exist');
} catch (ConfigEntryNotFoundException $expected) {
// This exception was expected, so it is fine
$testPassed = true;
} 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 {
// Now try the test
$testPassed = false;
try {
- // Get a configuration instance
- $cfg = FrameworkConfiguration::getInstance();
-
// Try to read an empty configuration variable
// Try to read an empty configuration variable
- $dummy =
$cfg->readConfig(""
);
+ $dummy =
FrameworkConfiguration::getInstance()->getConfigEntry(''
);
} catch (ConfigEntryIsEmptyException $expected) {
// This exception was expected, so it is fine
$testPassed = true;
} 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 {
// Now try the test
$testPassed = false;
try {
- // Get a configuration instance
- $cfg = FrameworkConfiguration::getInstance();
-
// Try to read an empty configuration variable
// 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;
} catch (ConfigEntryIsEmptyException $expected) {
// This exception was expected, so it is fine
$testPassed = true;
@@
-140,18
+131,15
@@
class ConfigTest extends PHPUnit_Framework_TestCase {
*
* @return void
*/
*
* @return void
*/
- public function testWrite
ReadConfig
Entry () {
+ public function testWrite
getConfigEntry
Entry () {
// Try it here
$value = "This is a test value";
try {
// Try it here
$value = "This is a test value";
try {
- // Get a configuration instance
- $cfg = FrameworkConfiguration::getInstance();
-
// Try to read an empty configuration variable
// 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
// Read the config entry we have just written
- $readValue =
$cfg->readConfig
('test_key');
+ $readValue =
FrameworkConfiguration::getInstance()->getConfigEntry
('test_key');
// Now test the values
$this->assertEquals($value, $readValue);
// Now test the values
$this->assertEquals($value, $readValue);