projects
/
core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added communicatorInstance from 'hub' project.
[core.git]
/
tests
/
RequestTest.php
diff --git
a/tests/RequestTest.php
b/tests/RequestTest.php
index d41d3da1a58833f098da5b903e8870f6f4e41a47..f7c4f450ec4e6b1055bbcaa6e24358ac8510ddc9 100644
(file)
--- a/
tests/RequestTest.php
+++ b/
tests/RequestTest.php
@@
-8,19
+8,19
@@
print (basename(__FILE__).": Init...\n");
require(dirname(dirname(__FILE__)) . '/inc/config.php');
// Load all include files
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
// Load all game classes
-require($cfg->
readConfig
('base_path') . 'inc/classes.php');
+require($cfg->
getConfigEntry
('base_path') . 'inc/classes.php');
// Set default application
// 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
// 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");
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... :(
*
* 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
* @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
* @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
*/
public function testMissingRequestElement () {
// Get a request instance
- $requestInstance = Ht
tpRequest::createHttp
Request();
+ $requestInstance = Ht
mlRequest::createHtml
Request();
// Get the element
$nonExist = $requestInstance->getRequestElement('never_there');
// 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
*/
public function testFakeRequestElement () {
// Fake the request here
- $_REQUEST = array('test_key' =>
"test_value"
);
+ $_REQUEST = array('test_key' =>
'test_value'
);
// Again get an instance
// Again get an instance
- $requestInstance = Ht
tpRequest::createHttp
Request();
+ $requestInstance = Ht
mlRequest::createHtml
Request();
// Get the element
$testValue = $requestInstance->getRequestElement('test_key');
// Is it the same?
// Get the element
$testValue = $requestInstance->getRequestElement('test_key');
// Is it the same?
- if ($testValue !==
"test_value"
) {
+ if ($testValue !==
'test_value'
) {
// Something went wrong
// 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)
$requestInstance->__toString(),
$testValue,
gettype($testValue)