X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2FRequestTest.php;h=784239f14529b0f5174dd4d3af2321ae60237fe6;hb=1110b025b45e1dc6f5d592eac7fbfd68c4b821be;hp=d41d3da1a58833f098da5b903e8870f6f4e41a47;hpb=0cd57c3885f00ad77fc599e53ed2f2d5e7ac267f;p=core.git

diff --git a/tests/RequestTest.php b/tests/RequestTest.php
index d41d3da1..784239f1 100644
--- a/tests/RequestTest.php
+++ b/tests/RequestTest.php
@@ -5,22 +5,22 @@ 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");
 
@@ -28,11 +28,11 @@ print (basename(__FILE__).": Init completed.\n\n");
  * A test case for faked HTTP requests. This is faked because we *set*
  * $_REQUEST here. This should be made better in PHP6... :(
  *
- * @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
@@ -57,7 +57,7 @@ class RequestTest extends PHPUnit_Framework_TestCase {
 	 */
 	public function testMissingRequestElement () {
 		// Get a request instance
-		$requestInstance = HttpRequest::createHttpRequest();
+		$requestInstance = HtmlRequest::createHtmlRequest();
 
 		// Get the element
 		$nonExist = $requestInstance->getRequestElement('never_there');
@@ -79,18 +79,18 @@ class RequestTest extends PHPUnit_Framework_TestCase {
 	 */
 	public function testFakeRequestElement () {
 		// Fake the request here
-		$_REQUEST = array('test_key' => "test_value");
+		$_REQUEST = array('test_key' => 'test_value');
 
 		// Again get an instance
-		$requestInstance = HttpRequest::createHttpRequest();
+		$requestInstance = HtmlRequest::createHtmlRequest();
 
 		// Get the element
 		$testValue = $requestInstance->getRequestElement('test_key');
 
 		// Is it the same?
-		if ($testValue !== "test_value") {
+		if ($testValue !== 'test_value') {
 			// Something went wrong
-			$this->fail(sprintf("[%s] Unexpected value %s (%s) from test key received.",
+			$this->fail(sprintf('[%s] Unexpected value %s (%s) from test key received.',
 				$requestInstance->__toString(),
 				$testValue,
 				gettype($testValue)
@@ -98,5 +98,3 @@ class RequestTest extends PHPUnit_Framework_TestCase {
 		}
 	}
 }
-
-?>