fixed namespace for FiLoStacker + removed config entry which does not point to

[core.git] / tests / RegistryTest.php

diff --git a/tests/RegistryTest.php b/tests/RegistryTest.php
index e4dc50e57e4f8184ed8aef64c9b0e0b9fa55cc51..4807b416ae7b13417939e241e3aee40e3abd2266 100644 (file)
--- a/tests/RegistryTest.php
+++ b/tests/RegistryTest.php
@@ -5,33 +5,33 @@ print (basename(__FILE__).": Init...\n");
 @chdir("..");
 
 // Load config file
-require(dirname(dirname(__FILE__)) . '/inc/config.php');
+require dirname(dirname(__FILE__)) . '/framework/config.php';
 
 // Load all include files
-require($cfg->readConfig('base_path') . 'inc/includes.php');
+require $cfg->getConfigEntry('framework_base_path') . 'includes.php';
 
 // Load all game classes
-require($cfg->readConfig('base_path') . 'inc/classes.php');
+require $cfg->getConfigEntry('framework_base_path') . '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);
 
 // 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 registry
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @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
- * @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
@@ -58,7 +58,7 @@ class RegistryTest extends PHPUnit_Framework_TestCase {
                $registryInstance = Registry::getRegistry();
 
                // Create a User instance
-               $userInstance = Member::createMemberByEmail("webmaster@ship-simu.org");
+               $userInstance = Member::createMemberByEmail("webmaster@shipsimu.org");
 
                // Now store the instance in the registry
                $registryInstance->addInstance('user', $userInstance);
@@ -90,5 +90,3 @@ class RegistryTest extends PHPUnit_Framework_TestCase {
                }
        }
 }
-
-?>