mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 17:56:52 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
This commit also ports all ascraeus tests to the new format.

Conflicts:
	tests/all_tests.php
	tests/network/all_tests.php
	tests/request/all_tests.php
	tests/request/request_var.php
	tests/template/templates/includephp.html
This commit is contained in:
Igor Wiedler
2011-01-07 01:39:18 +01:00
parent da4617b14b 5b752a2fed
commit 14a84cf89c
47 changed files with 128 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tests/network/all_tests.php
View File

@@ -1,44 +0,0 @@
<?php
/**
*
* @package testing
* @copyright (c) 2010 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
if (!defined('PHPUnit_MAIN_METHOD'))
{
define('PHPUnit_MAIN_METHOD', 'phpbb_network_all_tests::main');
}
require_once 'test_framework/framework.php';
require_once 'PHPUnit/TextUI/TestRunner.php';
require_once 'network/checkdnsrr.php';
require_once 'network/inet_ntop_pton.php';
require_once 'network/ip_normalise.php';
class phpbb_network_all_tests
{
public static function main()
{
PHPUnit_TextUI_TestRunner::run(self::suite());
}
public static function suite()
{
$suite = new PHPUnit_Framework_TestSuite('phpBB Network Functions');
$suite->addTestSuite('phpbb_network_checkdnsrr_test');
$suite->addTestSuite('phpbb_network_inet_ntop_pton_test');
$suite->addTestSuite('phpbb_network_ip_normalise_test');
return $suite;
}
}
if (PHPUnit_MAIN_METHOD == 'phpbb_network_all_tests::main')
{
phpbb_network_all_tests::main();
}

3
tests/network/checkdnsrr.php
View File

@@ -7,8 +7,7 @@
*
*/
require_once 'test_framework/framework.php';
require_once '../phpBB/includes/functions.php';
require_once __DIR__ . '/../../phpBB/includes/functions.php';
class phpbb_network_checkdnsrr_test extends phpbb_test_case
{

3
tests/network/inet_ntop_pton.php
View File

@@ -7,8 +7,7 @@
*
*/
require_once 'test_framework/framework.php';
require_once '../phpBB/includes/functions.php';
require_once __DIR__ . '/../../phpBB/includes/functions.php';
class phpbb_network_inet_ntop_pton_test extends phpbb_test_case
{

3
tests/network/ip_normalise.php
View File

@@ -7,8 +7,7 @@
*
*/
require_once 'test_framework/framework.php';
require_once '../phpBB/includes/functions.php';
require_once __DIR__ . '/../../phpBB/includes/functions.php';
class phpbb_network_ip_normalise_test extends phpbb_test_case
{