mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9626] Adding tests for the URL regular expression. [ticket/9626] Add missing class prefix. [ticket/9626] A few tests for the email regular expression. [ticket/9626] More IPv6 regex tests. [ticket/9626] Adding tests for the IPv4 regular expression. [ticket/9626] Adding tests for regular expressions.
This commit is contained in:
Andreas Fischer
commit
cf1b0202da
6 changed files with 375 additions and 0 deletions
|
|
@ -22,6 +22,7 @@ require_once 'template/all_tests.php';
|
|||
#require_once 'bbcode/all_tests.php';
|
||||
require_once 'text_processing/all_tests.php';
|
||||
require_once 'dbal/all_tests.php';
|
||||
require_once 'regex/all_tests.php';
|
||||
|
||||
// exclude the test directory from code coverage reports
|
||||
PHPUnit_Util_Filter::addDirectoryToFilter('./');
|
||||
|
|
@ -44,6 +45,7 @@ class phpbb_all_tests
|
|||
# $suite->addTest(phpbb_bbcode_all_tests::suite());
|
||||
$suite->addTest(phpbb_text_processing_all_tests::suite());
|
||||
$suite->addTest(phpbb_dbal_all_tests::suite());
|
||||
$suite->addTest(phpbb_regex_all_tests::suite());
|
||||
|
||||
return $suite;
|
||||
}
|
||||
|
|
|
|||
46
tests/regex/all_tests.php
Normal file
46
tests/regex/all_tests.php
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
<?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_regex_all_tests::main');
|
||||
}
|
||||
|
||||
require_once 'test_framework/framework.php';
|
||||
require_once 'PHPUnit/TextUI/TestRunner.php';
|
||||
|
||||
require_once 'regex/email.php';
|
||||
require_once 'regex/ipv4.php';
|
||||
require_once 'regex/ipv6.php';
|
||||
require_once 'regex/url.php';
|
||||
|
||||
class phpbb_regex_all_tests
|
||||
{
|
||||
public static function main()
|
||||
{
|
||||
PHPUnit_TextUI_TestRunner::run(self::suite());
|
||||
}
|
||||
|
||||
public static function suite()
|
||||
{
|
||||
$suite = new PHPUnit_Framework_TestSuite('phpBB Regular Expressions');
|
||||
|
||||
$suite->addTestSuite('phpbb_regex_email_test');
|
||||
$suite->addTestSuite('phpbb_regex_ipv4_test');
|
||||
$suite->addTestSuite('phpbb_regex_ipv6_test');
|
||||
$suite->addTestSuite('phpbb_regex_url_test');
|
||||
|
||||
return $suite;
|
||||
}
|
||||
}
|
||||
|
||||
if (PHPUnit_MAIN_METHOD == 'phpbb_regex_all_tests::main')
|
||||
{
|
||||
phpbb_regex_all_tests::main();
|
||||
}
|
||||
78
tests/regex/email.php
Normal file
78
tests/regex/email.php
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
<?php
|
||||
/**
|
||||
*
|
||||
* @package testing
|
||||
* @copyright (c) 2010 phpBB Group
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
*
|
||||
*/
|
||||
|
||||
require_once 'test_framework/framework.php';
|
||||
require_once '../phpBB/includes/functions.php';
|
||||
|
||||
class phpbb_regex_email_test extends phpbb_test_case
|
||||
{
|
||||
protected $regex;
|
||||
|
||||
public function setUp()
|
||||
{
|
||||
$this->regex = '#^' . get_preg_expression('email') . '$#i';
|
||||
}
|
||||
|
||||
public function positive_match_data()
|
||||
{
|
||||
return array(
|
||||
array('nobody@phpbb.com'),
|
||||
array('Nobody@sub.phpbb.com'),
|
||||
array('alice.bob@foo.phpbb.com'),
|
||||
array('alice-foo@bar.phpbb.com'),
|
||||
array('alice_foo@bar.phpbb.com'),
|
||||
array('alice+tag@foo.phpbb.com'),
|
||||
array('alice&tag@foo.phpbb.com'),
|
||||
|
||||
//array('"John Doe"@example.com'),
|
||||
//array('Alice@[192.168.2.1]'), // IPv4
|
||||
//array('Bob@[2001:0db8:85a3:08d3:1319:8a2e:0370:7344]'), // IPv6
|
||||
);
|
||||
}
|
||||
|
||||
public function negative_match_data()
|
||||
{
|
||||
return array(
|
||||
array('foo.example.com'), // @ is missing
|
||||
array('.foo.example.com'), // . as first character
|
||||
array('Foo.@example.com'), // . is last in local part
|
||||
array('foo..123@example.com'), // . doubled
|
||||
array('a@b@c@example.com'), // @ doubled
|
||||
|
||||
array('()[]\;:,<>@example.com'), // invalid characters
|
||||
array('abc(def@example.com'), // invalid character (
|
||||
array('abc)def@example.com'), // invalid character )
|
||||
array('abc[def@example.com'), // invalid character [
|
||||
array('abc]def@example.com'), // invalid character ]
|
||||
array('abc\def@example.com'), // invalid character \
|
||||
array('abc;def@example.com'), // invalid character ;
|
||||
array('abc:def@example.com'), // invalid character :
|
||||
array('abc,def@example.com'), // invalid character ,
|
||||
array('abc<def@example.com'), // invalid character <
|
||||
array('abc>def@example.com'), // invalid character >
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider positive_match_data
|
||||
*/
|
||||
public function test_positive_match($email)
|
||||
{
|
||||
$this->assertEquals(1, preg_match($this->regex, $email));
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider negative_match_data
|
||||
*/
|
||||
public function test_negative_match($address)
|
||||
{
|
||||
$this->assertEquals(0, preg_match($this->regex, $email));
|
||||
}
|
||||
}
|
||||
|
||||
72
tests/regex/ipv4.php
Normal file
72
tests/regex/ipv4.php
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
<?php
|
||||
/**
|
||||
*
|
||||
* @package testing
|
||||
* @copyright (c) 2010 phpBB Group
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
*
|
||||
*/
|
||||
|
||||
require_once 'test_framework/framework.php';
|
||||
require_once '../phpBB/includes/functions.php';
|
||||
|
||||
class phpbb_regex_ipv4_test extends phpbb_test_case
|
||||
{
|
||||
protected $regex;
|
||||
|
||||
public function setUp()
|
||||
{
|
||||
$this->regex = get_preg_expression('ipv4');
|
||||
}
|
||||
|
||||
public function positive_match_data()
|
||||
{
|
||||
return array(
|
||||
array('0.0.0.0'),
|
||||
array('127.0.0.1'),
|
||||
array('192.168.0.1'),
|
||||
array('255.255.255.255'),
|
||||
);
|
||||
}
|
||||
|
||||
public function negative_match_data()
|
||||
{
|
||||
return array(
|
||||
// IPv6 addresses
|
||||
array('2001:0db8:85a3:0000:0000:8a2e:0370:1337'),
|
||||
array('2001:db8:85a3:c:d:8a2e:370:1337'),
|
||||
array('2001:db8:85a3::8a2e:370:1337'),
|
||||
array('2001:db8:0:1::192.168.0.2'),
|
||||
array('0:0:0:0:0:0:0:1'),
|
||||
array('0:0::0:0:1'),
|
||||
array('::1'),
|
||||
|
||||
// Out of scope
|
||||
array('255.255.255.256'),
|
||||
|
||||
// Other tests
|
||||
array('a.b.c.d'),
|
||||
array('11.22.33.'),
|
||||
array('11.22.33'),
|
||||
array('11.22'),
|
||||
array('11'),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider positive_match_data
|
||||
*/
|
||||
public function test_positive_match($address)
|
||||
{
|
||||
$this->assertEquals(1, preg_match($this->regex, $address));
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider negative_match_data
|
||||
*/
|
||||
public function test_negative_match($address)
|
||||
{
|
||||
$this->assertEquals(0, preg_match($this->regex, $address));
|
||||
}
|
||||
}
|
||||
|
||||
143
tests/regex/ipv6.php
Normal file
143
tests/regex/ipv6.php
Normal file
|
|
@ -0,0 +1,143 @@
|
|||
<?php
|
||||
/**
|
||||
*
|
||||
* @package testing
|
||||
* @copyright (c) 2010 phpBB Group
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
*
|
||||
*/
|
||||
|
||||
require_once 'test_framework/framework.php';
|
||||
require_once '../phpBB/includes/functions.php';
|
||||
|
||||
class phpbb_regex_ipv6_test extends phpbb_test_case
|
||||
{
|
||||
protected $regex;
|
||||
|
||||
public function setUp()
|
||||
{
|
||||
$this->regex = get_preg_expression('ipv6');
|
||||
}
|
||||
|
||||
public function positive_match_data()
|
||||
{
|
||||
return array(
|
||||
// Full length IPv6 address
|
||||
array('2001:0db8:85a3:0000:0000:8a2e:0370:1337'),
|
||||
array('0000:0000:0000:0000:0000:0000:0000:0001'),
|
||||
array('3FFE:0b00:0000:0000:0001:0000:0000:000a'),
|
||||
array('3ffe:0b00:0000:0000:0001:0000:0000:000a'),
|
||||
array('2002:0db8:0000:0000:0000:dead:1337:d00d'),
|
||||
|
||||
// No leading zeroes in the group
|
||||
array('2001:db8:85a3:0:0:8a2e:370:1337'),
|
||||
array('2001:db8:85a3:c:d:8a2e:370:1337'),
|
||||
|
||||
// Consecutive all-zero groups
|
||||
array('2001:db8:85a3::8a2e:370:1337'),
|
||||
array('1::2:3:4:5:6:7'),
|
||||
array('1::2:3:4:5:6'),
|
||||
array('1::2:3:4:5'),
|
||||
array('1::2:3:4'),
|
||||
array('1::2:3'),
|
||||
array('1::2'),
|
||||
|
||||
// Last 32bit in dotted quad notation
|
||||
array('2001:db8:0:1::192.168.0.2'),
|
||||
|
||||
// IPv4-compatible IPv6 address
|
||||
array('::13.1.68.3'),
|
||||
array('0:0:0:0:0:0:13.1.68.3'),
|
||||
|
||||
// IPv4-mapped IPv6 address
|
||||
array('::ffff:c000:280'),
|
||||
array('::ffff:c000:0280'),
|
||||
array('::ffff:192.0.2.128'),
|
||||
array('0:0:0:0:0:ffff:c000:280'),
|
||||
array('0:0:0:0:0:ffff:c000:0280'),
|
||||
array('0:0:0:0:0:ffff:192.0.2.128'),
|
||||
array('0000:0000:0000:0000:0000:ffff:c000:280'),
|
||||
array('0000:0000:0000:0000:0000:ffff:c000:0280'),
|
||||
array('0000:0000:0000:0000:0000:ffff:192.0.2.128'),
|
||||
|
||||
// No trailing zeroes
|
||||
array('fe80::'),
|
||||
array('2002::'),
|
||||
array('2001:db8::'),
|
||||
array('2001:0db8:1234::'),
|
||||
array('1:2:3:4:5:6::'),
|
||||
array('1:2:3:4:5::'),
|
||||
array('1:2:3:4::'),
|
||||
array('1:2:3::'),
|
||||
array('1:2::'),
|
||||
|
||||
// No leading zeroes
|
||||
array('::2:3:4:5:6:7:8'),
|
||||
array('::2:3:4:5:6:7'),
|
||||
array('::2:3:4:5:6'),
|
||||
array('::2:3:4:5'),
|
||||
array('::2:3:4'),
|
||||
array('::2:3'),
|
||||
array('::1'),
|
||||
array('::8'),
|
||||
array('::c'),
|
||||
array('::abcd'),
|
||||
|
||||
// All zeroes
|
||||
array('::'),
|
||||
array('0:0:0:0:0:0:0:0'),
|
||||
array('0000:0000:0000:0000:0000:0000:0000:0000'),
|
||||
|
||||
// More tests
|
||||
array('2::10'),
|
||||
array('0:0::0:0:1'),
|
||||
array('0:0:0:0:0:0:0:1'),
|
||||
array('::ffff:0:0'),
|
||||
);
|
||||
}
|
||||
|
||||
public function negative_match_data()
|
||||
{
|
||||
return array(
|
||||
// Empty address
|
||||
array(''),
|
||||
|
||||
// IPv4 address
|
||||
array('192.168.0.2'),
|
||||
|
||||
// Out of scope
|
||||
array('abcd:efgh:0000::0'),
|
||||
array('::ffff:192.168.255.256'),
|
||||
|
||||
// Double ::
|
||||
array('2001::23de::2002'),
|
||||
array('3ffe:b00::1::b'),
|
||||
array('::1111:2222:3333:4444:5555:6666::'),
|
||||
|
||||
// Too many blocks
|
||||
array('2001:0db8:85a3:08d3:1319:8a2e:0370:1337:4430'),
|
||||
|
||||
// More tests
|
||||
array('02001:0000:1234:0000:0000:C1C0:ABCD:9876'),
|
||||
array('2001:0000:1234: 0000:0000:C1C0:ABCD:9876'),
|
||||
array('::ffff:192x168.255.255'),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider positive_match_data
|
||||
*/
|
||||
public function test_positive_match($address)
|
||||
{
|
||||
$this->assertEquals(1, preg_match($this->regex, $address));
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider negative_match_data
|
||||
*/
|
||||
public function test_negative_match($address)
|
||||
{
|
||||
$this->assertEquals(0, preg_match($this->regex, $address));
|
||||
}
|
||||
}
|
||||
|
||||
34
tests/regex/url.php
Normal file
34
tests/regex/url.php
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
<?php
|
||||
/**
|
||||
*
|
||||
* @package testing
|
||||
* @copyright (c) 2010 phpBB Group
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
*
|
||||
*/
|
||||
|
||||
require_once 'test_framework/framework.php';
|
||||
require_once '../phpBB/includes/functions.php';
|
||||
|
||||
class phpbb_regex_url_test extends phpbb_test_case
|
||||
{
|
||||
public function url_test_data()
|
||||
{
|
||||
return array(
|
||||
array('http://www.phpbb.com/community/', 1),
|
||||
array('http://www.phpbb.com/path/file.ext#section', 1),
|
||||
array('ftp://ftp.phpbb.com/', 1),
|
||||
array('sip://bantu@phpbb.com', 1),
|
||||
|
||||
array('www.phpbb.com/community/', 0),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider url_test_data
|
||||
*/
|
||||
public function test_url($url, $expected)
|
||||
{
|
||||
$this->assertEquals($expected, preg_match('#^' . get_preg_expression('url') . '$#i', $url));
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue