aboutsummaryrefslogtreecommitdiffstats
path: root/tests/regex/censor_test.php
diff options
context:
space:
mode:
authorjaviexin <javiexin@gmail.com>2017-03-09 16:12:25 +0100
committerGitHub <noreply@github.com>2017-03-09 16:12:25 +0100
commitbd12504f6cf03b36821a5cea2bf77a419496dcdb (patch)
treed30cc3506e1bbdc284dc7cca910c5dac6b927ae0 /tests/regex/censor_test.php
parent96a90d3f81c1fcce3834ee72b7d1b9f76aa9354c (diff)
parent3e9f12d12d7dbdd2cee39425e81b5fdf66fcfbc8 (diff)
downloadforums-bd12504f6cf03b36821a5cea2bf77a419496dcdb.tar
forums-bd12504f6cf03b36821a5cea2bf77a419496dcdb.tar.gz
forums-bd12504f6cf03b36821a5cea2bf77a419496dcdb.tar.bz2
forums-bd12504f6cf03b36821a5cea2bf77a419496dcdb.tar.xz
forums-bd12504f6cf03b36821a5cea2bf77a419496dcdb.zip
Merge branch '3.2.x' into ticket/15068
Diffstat (limited to 'tests/regex/censor_test.php')
-rw-r--r--tests/regex/censor_test.php16
1 files changed, 2 insertions, 14 deletions
diff --git a/tests/regex/censor_test.php b/tests/regex/censor_test.php
index 50c6778c8c..5a516b71de 100644
--- a/tests/regex/censor_test.php
+++ b/tests/regex/censor_test.php
@@ -11,8 +11,6 @@
*
*/
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-
class phpbb_regex_censor_test extends phpbb_test_case
{
public function censor_test_data()
@@ -37,18 +35,8 @@ class phpbb_regex_censor_test extends phpbb_test_case
*/
public function test_censor_unicode($pattern, $subject)
{
- $regex = get_censor_preg_expression($pattern, true);
-
- $this->assertRegExp($regex, $subject);
- }
-
- /**
- * @dataProvider censor_test_data
- */
- public function test_censor_no_unicode($pattern, $subject)
- {
- $regex = get_censor_preg_expression($pattern, false);
+ $regex = get_censor_preg_expression($pattern);
$this->assertRegExp($regex, $subject);
}
-} \ No newline at end of file
+}