mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2025-08-06 06:07:26 +02:00
Reorganize VarParser; there may be multiple implementations.
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1602 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
@@ -1,32 +1,8 @@
|
||||
<?php
|
||||
|
||||
class HTMLPurifier_VarParserTest extends UnitTestCase
|
||||
class HTMLPurifier_VarParser_FlexibleTest extends HTMLPurifier_VarParserHarness
|
||||
{
|
||||
|
||||
protected $parser;
|
||||
|
||||
public function setup() {
|
||||
$this->parser = new HTMLPurifier_VarParser();
|
||||
}
|
||||
|
||||
function assertValid($var, $type, $ret = null) {
|
||||
$ret = ($ret === null) ? $var : $ret;
|
||||
$this->assertIdentical($this->parser->parse($var, $type), $ret);
|
||||
}
|
||||
|
||||
function assertInvalid($var, $type, $msg = null) {
|
||||
$caught = false;
|
||||
try {
|
||||
$this->parser->parse($var, $type);
|
||||
} catch (HTMLPurifier_VarParserException $e) {
|
||||
$caught = true;
|
||||
if ($msg !== null) $this->assertIdentical($e->getMessage(), $msg);
|
||||
}
|
||||
if (!$caught) {
|
||||
$this->fail('Did not catch expected error');
|
||||
}
|
||||
}
|
||||
|
||||
function testValidate() {
|
||||
|
||||
$this->assertValid('foobar', 'string');
|
31
tests/HTMLPurifier/VarParserHarness.php
Normal file
31
tests/HTMLPurifier/VarParserHarness.php
Normal file
@@ -0,0 +1,31 @@
|
||||
<?php
|
||||
|
||||
class HTMLPurifier_VarParserHarness extends UnitTestCase
|
||||
{
|
||||
|
||||
protected $parser;
|
||||
|
||||
public function setup() {
|
||||
$class = substr(get_class($this), 0, -4);
|
||||
$this->parser = new $class();
|
||||
}
|
||||
|
||||
function assertValid($var, $type, $ret = null) {
|
||||
$ret = ($ret === null) ? $var : $ret;
|
||||
$this->assertIdentical($this->parser->parse($var, $type), $ret);
|
||||
}
|
||||
|
||||
function assertInvalid($var, $type, $msg = null) {
|
||||
$caught = false;
|
||||
try {
|
||||
$this->parser->parse($var, $type);
|
||||
} catch (HTMLPurifier_VarParserException $e) {
|
||||
$caught = true;
|
||||
if ($msg !== null) $this->assertIdentical($e->getMessage(), $msg);
|
||||
}
|
||||
if (!$caught) {
|
||||
$this->fail('Did not catch expected error');
|
||||
}
|
||||
}
|
||||
|
||||
}
|
Reference in New Issue
Block a user