1
0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-08-06 06:07:26 +02:00

Set up configuration class, implement attr_id_blacklist

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@155 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2006-08-04 01:47:48 +00:00
parent 66f6cdcf3f
commit a0ee772423
9 changed files with 95 additions and 22 deletions

View File

@@ -2,6 +2,7 @@
require_once('HTMLPurifier/Strategy.php');
require_once('HTMLPurifier/Strategy/Composite.php');
require_once('HTMLPurifier/Config.php');
class HTMLPurifier_Strategy_Composite_Test
extends HTMLPurifier_Strategy_Composite
@@ -20,6 +21,7 @@ class HTMLPurifier_Strategy_CompositeTest extends UnitTestCase
function test() {
generate_mock_once('HTMLPurifier_Strategy');
generate_mock_once('HTMLPurifier_Config');
// setup a bunch of mock strategies to inject into our composite test
@@ -39,18 +41,24 @@ class HTMLPurifier_Strategy_CompositeTest extends UnitTestCase
$input_3 = 'Processed by 1 and 2';
$input_4 = 'Processed by 1, 2 and 3'; // expected output
$mock_1->expectOnce('execute', array($input_1));
$mock_1->setReturnValue('execute', $input_2, array($input_1));
$config = new HTMLPurifier_ConfigMock();
$mock_2->expectOnce('execute', array($input_2));
$mock_2->setReturnValue('execute', $input_3, array($input_2));
$params_1 = array($input_1, $config);
$params_2 = array($input_2, $config);
$params_3 = array($input_3, $config);
$mock_3->expectOnce('execute', array($input_3));
$mock_3->setReturnValue('execute', $input_4, array($input_3));
$mock_1->expectOnce('execute', $params_1);
$mock_1->setReturnValue('execute', $input_2, $params_1);
$mock_2->expectOnce('execute', $params_2);
$mock_2->setReturnValue('execute', $input_3, $params_2);
$mock_3->expectOnce('execute', $params_3);
$mock_3->setReturnValue('execute', $input_4, $params_3);
// perform test
$output = $composite->execute($input_1);
$output = $composite->execute($input_1, $config);
$this->assertIdentical($input_4, $output);
// tally the calls

View File

@@ -1,5 +1,6 @@
<?php
require_once('HTMLPurifier/Config.php');
require_once('HTMLPurifier/StrategyAbstractTest.php');
require_once('HTMLPurifier/Strategy/ValidateAttributes.php');
@@ -13,6 +14,7 @@ class HTMLPurifier_Strategy_ValidateAttributesTest extends
$inputs = array();
$expect = array();
$config = array();
$inputs[0] = '';
$expect[0] = '';
@@ -38,7 +40,13 @@ class HTMLPurifier_Strategy_ValidateAttributesTest extends
$inputs[6] = '<div id=" valid ">Trim whitespace.</div>';
$expect[6] = '<div id="valid">Trim whitespace.</div>';
$this->assertStrategyWorks($strategy, $inputs, $expect);
// test configuration id blacklist
$inputs[7] = '<div id="invalid">Invalid</div>';
$expect[7] = '<div>Invalid</div>';
$config[7] = HTMLPurifier_Config::createDefault();
$config[7]->attr_id_blacklist = array('invalid');
$this->assertStrategyWorks($strategy, $inputs, $expect, $config);
}

View File

@@ -25,10 +25,14 @@ class HTMLPurifier_StrategyAbstractTest extends UnitTestCase
$this->gen = new HTMLPurifier_Generator();
}
function assertStrategyWorks($strategy, $inputs, $expect) {
function assertStrategyWorks($strategy, $inputs, $expect, $config = array()) {
foreach ($inputs as $i => $input) {
$tokens = $this->lex->tokenizeHTML($input);
$result_tokens = $strategy->execute($tokens);
if (isset($config[$i])) {
$result_tokens = $strategy->execute($tokens, $config[$i]);
} else {
$result_tokens = $strategy->execute($tokens);
}
$result = $this->gen->generateFromTokens($result_tokens);
$this->assertEqual($expect[$i], $result, "Test $i: %s");
paintIf($result, $result != $expect[$i]);