This should fix it ... ;-)

[core.git] / tests / RequestTest.php

diff --git a/tests/RequestTest.php b/tests/RequestTest.php
index 6312351ae147afe6d132d7a17fdeb05270169d79..f7c4f450ec4e6b1055bbcaa6e24358ac8510ddc9 100644 (file)
--- a/tests/RequestTest.php
+++ b/tests/RequestTest.php
@@ -14,7 +14,7 @@ require($cfg->getConfigEntry('base_path') . 'inc/includes.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);
@@ -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)