mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-20 07:21:30 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [task/session-tests] Renamed assertSqlResultEquals and fixed its param order
  [task/session-tests] Test additional combinations of session_begin.
  [task/session-tests] Added tests for the session class.

Conflicts:
	tests/mock/cache.php
This commit is contained in:
Nils Adermann
2011-01-23 18:44:03 +01:00
parent 1196b96462 e1e84f9bd0
commit 10169d1c3e
8 changed files with 322 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/mock/cache.php
View File

@@ -90,4 +90,9 @@ class phpbb_mock_cache implements phpbb_cache_driver_interface
public function sql_freeresult($query_id)
{
}
public function obtain_bots()
{
return isset($this->data['_bots']) ? $this->data['_bots'] : array();
}
}

56
tests/mock/session_testable.php Normal file
View File

@@ -0,0 +1,56 @@
<?php
/**
*
* @package testing
* @copyright (c) 2008 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
require_once '../phpBB/includes/functions.php';
require_once '../phpBB/includes/session.php';
class phpbb_mock_session_testable extends session
{
private $_cookies = array();
public function set_cookie($name, $data, $time)
{
$this->_cookies[$name] = array($data, $time);
}
/**
* Checks if the cookies were set correctly.
*
* @param PHPUnit_Framework_Assert test The test from which this is called
* @param array(string => mixed) cookies The cookie data to check against.
* The keys are cookie names, the values can either be null to
* check only the existance of the cookie, or an array(d, t),
* where d is the cookie data to check, or null to skip the
* check and t is the cookie time to check, or null to skip.
*/
public function check_cookies(PHPUnit_Framework_Assert $test, $cookies)
{
$test->assertEquals(array_keys($cookies), array_keys($this->_cookies), 'Incorrect cookies were set');
foreach ($cookies as $name => $cookie)
{
if (!is_null($cookie))
{
$data = $cookie[0];
$time = $cookie[1];
if (!is_null($data))
{
$test->assertEquals($data, $this->_cookies[$name][0], "Cookie $name contains incorrect data");
}
if (!is_null($time))
{
$test->assertEquals($time, $this->_cookies[$name][1], "Cookie $name expires at the wrong time");
}
}
}
}
}