Renamed more stuff (will break app_die(), so it needs fixing).

[core.git] / tests / ConfigTest.php

diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
index 888bbdf8daaa086f933e0dac10d5c596b539f141..c08782e1a2f66e314f8cdc3b14a88877f8c5e42f 100644 (file)
--- a/tests/ConfigTest.php
+++ b/tests/ConfigTest.php
@@ -8,13 +8,13 @@ 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');
+FrameworkConfiguration::getInstance()->setConfigEntry('default_application', 'shipsimu');
 
 // Set testing mode (no starter.php will be loaded!)
 define('TEST_MODE', true);
@@ -27,11 +27,11 @@ 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
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
  * @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
@@ -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);