Changed (still ugly code) the way of determining external IP

[core.git] / tests / ConfigTest.php

diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
index adce7b2040d6f8208cca993e2c4d9d22e142970e..30d45ff5f1d67ecb890d1635854bd2bd8d693f7d 100644 (file)
--- a/tests/ConfigTest.php
+++ b/tests/ConfigTest.php
@@ -8,10 +8,10 @@ print (basename(__FILE__).": Init...\n");
 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
-require($cfg->readConfig('base_path') . 'inc/classes.php');
+require($cfg->getConfigEntry('base_path') . 'inc/classes.php');
 
 // Set default application
 FrameworkConfiguration::getInstance()->setConfigEntry('default_application', 'ship-simu');
@@ -20,7 +20,7 @@ FrameworkConfiguration::getInstance()->setConfigEntry('default_application', 'sh
 define('TEST_MODE', true);
 
 // Load the PHPUnit framework
-require_once('PHPUnit/Framework.php');
+require('PHPUnit/Framework.php');
 
 print (basename(__FILE__).": Init completed.\n\n");
 
@@ -59,7 +59,7 @@ class ConfigTest extends PHPUnit_Framework_TestCase {
                $testPassed = false;
                try {
                        // Now find a configuration variable that does not exist
-                       $dummy = FrameworkConfiguration::getInstance()->readConfig('does_not_exist');
+                       $dummy = FrameworkConfiguration::getInstance()->getConfigEntry('does_not_exist');
                } catch (ConfigEntryNotFoundException $expected) {
                        // This exception was expected, so it is fine
                        $testPassed = true;
@@ -85,7 +85,7 @@ class ConfigTest extends PHPUnit_Framework_TestCase {
                $testPassed = false;
                try {
                        // Try to read an empty configuration variable
-                       $dummy = FrameworkConfiguration::getInstance()->readConfig('');
+                       $dummy = FrameworkConfiguration::getInstance()->getConfigEntry('');
                } catch (ConfigEntryIsEmptyException $expected) {
                        // This exception was expected, so it is fine
                        $testPassed = true;
@@ -131,7 +131,7 @@ class ConfigTest extends PHPUnit_Framework_TestCase {
         *
         * @return      void
         */
-       public function testWriteReadConfigEntry () {
+       public function testWritegetConfigEntryEntry () {
                // Try it here
                $value = "This is a test value";
                try {
@@ -139,7 +139,7 @@ class ConfigTest extends PHPUnit_Framework_TestCase {
                        FrameworkConfiguration::getInstance()->setConfigEntry('test_key', "{$value}");
 
                        // Read the config entry we have just written
-                       $readValue = FrameworkConfiguration::getInstance()->readConfig('test_key');
+                       $readValue = FrameworkConfiguration::getInstance()->getConfigEntry('test_key');
 
                        // Now test the values
                        $this->assertEquals($value, $readValue);