Update queries can now also be unlimited (limited in rows)

[core.git] / tests / ConfigTest.php

diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
index 6e14186f51b356cdfbcd0d6a17f4a8342b440d72..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");
 
@@ -29,7 +29,7 @@ print (basename(__FILE__).": Init completed.\n\n");
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007 - 2009 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
  * @link               http://www.ship-simu.org
  * @see                        http://www.phpunit.de
@@ -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()->getConfigEntry('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()->getConfigEntry('');
                } 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;
@@ -140,18 +131,15 @@ class ConfigTest extends PHPUnit_Framework_TestCase {
         *
         * @return      void
         */
-       public function testWriteReadConfigEntry () {
+       public function testWritegetConfigEntryEntry () {
                // 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()->getConfigEntry('test_key');
 
                        // Now test the values
                        $this->assertEquals($value, $readValue);