mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2025-07-31 03:10:09 +02:00
Factor out DirectLex error testing to its own class.
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1230 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
@@ -47,6 +47,11 @@ class HTMLPurifier_Harness extends UnitTestCase
|
||||
*/
|
||||
var $config;
|
||||
|
||||
/**
|
||||
* Default context to fall back on if no context is available
|
||||
*/
|
||||
var $context;
|
||||
|
||||
function HTMLPurifier_Harness() {
|
||||
$this->lexer = new HTMLPurifier_Lexer_DirectLex();
|
||||
$this->generator = new HTMLPurifier_Generator();
|
||||
@@ -77,8 +82,12 @@ class HTMLPurifier_Harness extends UnitTestCase
|
||||
// setup context object. Note that we are operating on a copy of it!
|
||||
// When necessary, extend the test harness to allow post-tests
|
||||
// on the context object
|
||||
$context = new HTMLPurifier_Context();
|
||||
$context->loadArray($context_array);
|
||||
if (empty($this->context)) {
|
||||
$context = new HTMLPurifier_Context();
|
||||
$context->loadArray($context_array);
|
||||
} else {
|
||||
$context =& $this->context;
|
||||
}
|
||||
|
||||
if ($this->to_tokens && is_string($input)) {
|
||||
// $func may cause $input to change, so "clone" another copy
|
||||
|
@@ -129,7 +129,6 @@ class HTMLPurifier_Lexer_DirectLexTest extends UnitTestCase
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
?>
|
65
tests/HTMLPurifier/Lexer/DirectLex_ErrorsTest.php
Normal file
65
tests/HTMLPurifier/Lexer/DirectLex_ErrorsTest.php
Normal file
@@ -0,0 +1,65 @@
|
||||
<?php
|
||||
|
||||
require_once 'HTMLPurifier/Lexer/DirectLex.php';
|
||||
|
||||
class HTMLPurifier_Lexer_DirectLex_ErrorsTest extends UnitTestCase
|
||||
{
|
||||
|
||||
var $config, $context;
|
||||
var $collector;
|
||||
|
||||
function setup() {
|
||||
$this->config = HTMLPurifier_Config::create(array('Core.CollectErrors' => true));
|
||||
$this->context = new HTMLPurifier_Context();
|
||||
generate_mock_once('HTMLPurifier_ErrorCollector');
|
||||
$this->collector = new HTMLPurifier_ErrorCollectorMock($this);
|
||||
$this->context->register('ErrorCollector', $this->collector);
|
||||
}
|
||||
|
||||
function invoke($input) {
|
||||
$lexer = new HTMLPurifier_Lexer_DirectLex();
|
||||
$lexer->tokenizeHTML($input, $this->config, $this->context);
|
||||
}
|
||||
|
||||
function invokeAttr($input) {
|
||||
$lexer = new HTMLPurifier_Lexer_DirectLex();
|
||||
$lexer->parseAttributeString($input, $this->config, $this->context);
|
||||
}
|
||||
|
||||
function expectErrorCollection($severity, $msg) {
|
||||
$this->collector->expectOnce('send', array($severity, $msg));
|
||||
}
|
||||
|
||||
function testUnclosedComment() {
|
||||
$this->expectErrorCollection(E_WARNING, 'Lexer: Unclosed comment');
|
||||
$this->invoke('<!-- >');
|
||||
}
|
||||
|
||||
function testUnescapedLt() {
|
||||
$this->expectErrorCollection(E_NOTICE, 'Lexer: Unescaped lt');
|
||||
$this->invoke('< foo>');
|
||||
}
|
||||
|
||||
function testMissingGt() {
|
||||
$this->expectErrorCollection(E_WARNING, 'Lexer: Missing gt');
|
||||
$this->invoke('<a href=""');
|
||||
}
|
||||
|
||||
function testMissingAttributeKey1() {
|
||||
$this->expectErrorCollection(E_ERROR, 'Lexer: Missing attribute key');
|
||||
$this->invokeAttr('=""');
|
||||
}
|
||||
|
||||
function testMissingAttributeKey2() {
|
||||
$this->expectErrorCollection(E_ERROR, 'Lexer: Missing attribute key');
|
||||
$this->invokeAttr('foo="bar" =""');
|
||||
}
|
||||
|
||||
function testMissingEndQuote() {
|
||||
$this->expectErrorCollection(E_ERROR, 'Lexer: Missing end quote');
|
||||
$this->invokeAttr('src="foo');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
?>
|
@@ -87,6 +87,7 @@ $test_files[] = 'HTMLPurifier/Injector/PurifierLinkifyTest.php';
|
||||
$test_files[] = 'HTMLPurifier/LanguageFactoryTest.php';
|
||||
$test_files[] = 'HTMLPurifier/LanguageTest.php';
|
||||
$test_files[] = 'HTMLPurifier/Lexer/DirectLexTest.php';
|
||||
$test_files[] = 'HTMLPurifier/Lexer/DirectLex_ErrorsTest.php';
|
||||
$test_files[] = 'HTMLPurifier/LexerTest.php';
|
||||
$test_files[] = 'HTMLPurifier/PercentEncoderTest.php';
|
||||
$test_files[] = 'HTMLPurifier/Strategy/CompositeTest.php';
|
||||
|
Reference in New Issue
Block a user