mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2025-07-31 03:10:09 +02:00
Generalize IDAccumulator into AttrContext. Modify tests and classes accordingly. Also, this allows us to make the validate() parameters uniform among all AttrDef subclasses.
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@212 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
@@ -9,7 +9,8 @@ class HTMLPurifier_AttrDef_IDTest extends HTMLPurifier_AttrDefHarness
|
||||
|
||||
function test() {
|
||||
|
||||
$this->id_accumulator = new HTMLPurifier_IDAccumulator();
|
||||
$this->context = new HTMLPurifier_AttrContext();
|
||||
$this->context->id_accumulator = new HTMLPurifier_IDAccumulator();
|
||||
$this->def = new HTMLPurifier_AttrDef_ID();
|
||||
|
||||
// valid ID names
|
||||
|
@@ -4,14 +4,15 @@ class HTMLPurifier_AttrDefHarness extends UnitTestCase
|
||||
{
|
||||
|
||||
var $def;
|
||||
var $id_accumulator;
|
||||
var $context;
|
||||
var $config;
|
||||
|
||||
// cannot be used for accumulator
|
||||
function assertDef($string, $expect = true) {
|
||||
// $expect can be a string or bool
|
||||
if (!$this->config) $this->config = HTMLPurifier_Config::createDefault();
|
||||
$result = $this->def->validate($string, $this->config, $this->id_accumulator);
|
||||
if (!$this->context) $this->context = new HTMLPurifier_AttrContext();
|
||||
$result = $this->def->validate($string, $this->config, $this->context);
|
||||
if ($expect === true) {
|
||||
$this->assertIdentical($string, $result);
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user