1
0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-08-06 22:26:31 +02:00
- Add tests for the atoms.
- Add Id validation for Directives

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1623 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2008-03-22 21:06:55 +00:00
parent 34ba0e408f
commit b8f00ace1a
4 changed files with 98 additions and 19 deletions

View File

@@ -0,0 +1,58 @@
<?php
class HTMLPurifier_ConfigSchema_ValidatorAtomTest extends UnitTestCase
{
protected function expectValidationException($msg) {
$this->expectException(new HTMLPurifier_ConfigSchema_Exception($msg));
}
public function makeAtom($value) {
$obj = new stdClass();
$obj->property = $value;
// Note that 'property' and 'context' are magic wildcard values
return new HTMLPurifier_ConfigSchema_ValidatorAtom('context', $obj, 'property');
}
public function testAssertIsString() {
$this->makeAtom('foo')->assertIsString();
}
public function testAssertIsStringFail() {
$this->expectValidationException("Member variable 'property' in context must be a string");
$this->makeAtom(3)->assertIsString();
}
public function testAssertNotNull() {
$this->makeAtom('foo')->assertNotNull();
}
public function testAssertNotNullFail() {
$this->expectValidationException("Member variable 'property' in context must not be null");
$this->makeAtom(null)->assertNotNull();
}
public function testAssertAlnum() {
$this->makeAtom('foo2')->assertAlnum();
}
public function testAssertAlnumFail() {
$this->expectValidationException("Member variable 'property' in context must be alphanumeric");
$this->makeAtom('%a')->assertAlnum();
}
public function testAssertAlnumFailIsString() {
$this->expectValidationException("Member variable 'property' in context must be a string");
$this->makeAtom(3)->assertAlnum();
}
public function testAssertNotEmpty() {
$this->makeAtom('foo')->assertNotEmpty();
}
public function testAssertNotEmptyFail() {
$this->expectValidationException("Member variable 'property' in context must not be empty");
$this->makeAtom('')->assertNotEmpty();
}
}

View File

@@ -18,6 +18,20 @@ class HTMLPurifier_ConfigSchema_ValidatorTest extends UnitTestCase
$obj->namespace = $namespace;
$obj->description = $description;
$this->interchange->addNamespace($obj);
return $obj;
}
protected function addDirective($namespace, $directive, $type = 'string', $description = 'Description') {
$obj = new HTMLPurifier_ConfigSchema_Interchange_Directive();
$obj->id = $this->makeId($namespace, $directive);
$obj->type = $type;
$obj->description = $description;
$this->interchange->addDirective($obj);
return $obj; // for future editing
}
protected function makeId($namespace, $directive) {
return new HTMLPurifier_ConfigSchema_Interchange_Id($namespace, $directive);
}
/**
@@ -36,12 +50,6 @@ class HTMLPurifier_ConfigSchema_ValidatorTest extends UnitTestCase
$this->validate();
}
public function testNamespaceNamespaceString() {
$this->addNamespace(3, 'Description');
$this->expectValidationException("Member variable 'namespace' in namespace '3' must be a string");
$this->validate();
}
public function testNamespaceNamespaceNotEmpty() {
$this->addNamespace('0', 'Description');
$this->expectValidationException("Member variable 'namespace' in namespace '0' must not be empty");
@@ -54,16 +62,14 @@ class HTMLPurifier_ConfigSchema_ValidatorTest extends UnitTestCase
$this->validate();
}
public function testNamespaceDescriptionString() {
$this->addNamespace('Ns', 3);
$this->expectValidationException("Member variable 'description' in namespace 'Ns' must be a string");
$this->validate();
}
public function testNamespaceDescriptionNotEmpty() {
$this->addNamespace('Ns', '');
$this->expectValidationException("Member variable 'description' in namespace 'Ns' must not be empty");
$this->validate();
}
public function testDirectiveIdNamespaceNotEmpty() {
$this->addDirective('', 'Dir');
}
}