[2.1.3]

- Buggy treatment of end tags of elements that have required attributes fixed (does not manifest on default tag-set)
- Spurious internal content reorganization error suppressed
. Error unit tests can now specify the expectation of no errors. Future iterations of the harness will be extremely strict about what errors are allowed

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1424 48356398-32a2-884e-a903-53898d9a118a

tests/HTMLPurifier/ChildDef/OptionalTest.php

@@ -19,5 +19,9 @@ class HTMLPurifier_ChildDef_OptionalTest extends HTMLPurifier_ChildDefHarness
         $this->assertResult('Not allowed text', '');
     }
     
+    function testEmpty() {
+        $this->assertResult('');
+    }
+    
 }
 

tests/HTMLPurifier/ErrorsHarness.php

@@ -3,11 +3,15 @@
 require_once 'HTMLPurifier/ErrorCollectorEMock.php';
 require_once 'HTMLPurifier/Lexer/DirectLex.php';
 
+/**
+ * @todo Make the callCount variable actually work, so we can precisely
+ *       specify what errors we want: no more, no less
+ */
 class HTMLPurifier_ErrorsHarness extends HTMLPurifier_Harness
 {
     
     var $config, $context;
-    var $collector, $generator;
+    var $collector, $generator, $callCount;
     
     function setup() {
         $this->config = HTMLPurifier_Config::create(array('Core.CollectErrors' => true));
@@ -16,6 +20,11 @@ class HTMLPurifier_ErrorsHarness extends HTMLPurifier_Harness
         $this->collector = new HTMLPurifier_ErrorCollectorEMock();
         $this->collector->prepare($this->context);
         $this->context->register('ErrorCollector', $this->collector);
+        $this->callCount = 0;
+    }
+    
+    function expectNoErrorCollection() {
+        $this->collector->expectNever('send');
     }
     
     function expectErrorCollection() {

tests/HTMLPurifier/Strategy/FixNesting_ErrorsTest.php

@@ -28,6 +28,11 @@ class HTMLPurifier_Strategy_FixNesting_ErrorsTest extends HTMLPurifier_Strategy_
         $this->invoke("<span>Valid<div>Invalid</div></span>");
     }
     
+    function testNoNodeReorganizedForEmptyNode() {
+        $this->expectNoErrorCollection();
+        $this->invoke("<span></span>");
+    }
+    
     function testNodeContentsRemoved() {
         $this->expectErrorCollection(E_ERROR, 'Strategy_FixNesting: Node contents removed');
         $this->expectContext('CurrentToken', new HTMLPurifier_Token_Start('span', array(), 1));

tests/HTMLPurifier/Strategy/RemoveForeignElementsTest.php

@@ -82,5 +82,14 @@ alert(<b>bold</b>);
         );
     }
     
+    function testRequiredAttributesTestNotPerformedOnEndTag() {
+        $this->config->set('HTML', 'DefinitionID',
+            'HTMLPurifier_Strategy_RemoveForeignElementsTest'.
+            '->testRequiredAttributesTestNotPerformedOnEndTag');
+        $def =& $this->config->getHTMLDefinition(true);
+        $def->addElement('f', 'Block', 'Optional: #PCDATA', false, array('req*' => 'Text'));
+        $this->assertResult('<f req="text">Foo</f> Bar');
+    }
+    
 }