opps

[core.git] / tests / RequestTest.php

diff --git a/tests/RequestTest.php b/tests/RequestTest.php
index eae022177912016ed8e13d0f8c27aed5915f01fd..784239f14529b0f5174dd4d3af2321ae60237fe6 100644 (file)
--- a/tests/RequestTest.php
+++ b/tests/RequestTest.php
@@ -5,13 +5,13 @@ 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->getConfigEntry('base_path') . 'inc/includes.php');
+require $cfg->getConfigEntry('framework_base_path') . 'includes.php';
 
 // Load all game classes
-require($cfg->getConfigEntry('base_path') . 'inc/classes.php');
+require $cfg->getConfigEntry('framework_base_path') . 'classes.php';
 
 // Set default application
 FrameworkConfiguration::getInstance()->setConfigEntry('default_application', 'shipsimu');
@@ -20,7 +20,7 @@ FrameworkConfiguration::getInstance()->setConfigEntry('default_application', 'sh
 define('TEST_MODE', true);
 
 // Load the PHPUnit framework
-require('PHPUnit/Framework.php');
+require 'PHPUnit/Framework.php';
 
 print (basename(__FILE__).": Init completed.\n\n");
 
@@ -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 {
                }
        }
 }
-
-?>