Refactor unit tests to have one logical assertion per method.

- Support executing a single unit tests using __only prefix
- Hook in Email classes to main code, even if they're unused


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

tests/HTMLPurifier/ChildDef/ChameleonTest.php

@@ -6,28 +6,36 @@ require_once 'HTMLPurifier/ChildDef/Chameleon.php';
 class HTMLPurifier_ChildDef_ChameleonTest extends HTMLPurifier_ChildDefHarness
 {
     
-    function test() {
-        
+    var $isInline;
+    
+    function setUp() {
+        parent::setUp();
         $this->obj = new HTMLPurifier_ChildDef_Chameleon(
             'b | i',      // allowed only when in inline context
             'b | i | div' // allowed only when in block context
         );
-        
+        $this->context->register('IsInline', $this->isInline);
+    }
+    
+    function testInlineAlwaysAllowed() {
+        $this->isInline = true;
         $this->assertResult(
-            '<b>Allowed.</b>', true,
-            array(), array('IsInline' => true)
+            '<b>Allowed.</b>'
         );
-        
+    }
+    
+    function testBlockNotAllowedInInline() {
+        $this->isInline = true;
         $this->assertResult(
-            '<div>Not allowed.</div>', '',
-            array(), array('IsInline' => true)
+            '<div>Not allowed.</div>', ''
         );
-        
+    }
+    
+    function testBlockAllowedInNonInline() {
+        $this->isInline = false;
         $this->assertResult(
-            '<div>Allowed.</div>', true,
-            array(), array('IsInline' => false)
+            '<div>Allowed.</div>'
         );
-        
     }
     
 }

tests/HTMLPurifier/ChildDef/OptionalTest.php

@@ -6,13 +6,17 @@ require_once 'HTMLPurifier/ChildDef/Optional.php';
 class HTMLPurifier_ChildDef_OptionalTest extends HTMLPurifier_ChildDefHarness
 {
     
-    function test() {
-        
+    function setUp() {
+        parent::setUp();
         $this->obj = new HTMLPurifier_ChildDef_Optional('b | i');
-        
+    }
+    
+    function testBasicUsage() {
         $this->assertResult('<b>Bold text</b><img />', '<b>Bold text</b>');
+    }
+    
+    function testRemoveForbiddenText() {
         $this->assertResult('Not allowed text', '');
-        
     }
     
 }

tests/HTMLPurifier/ChildDef/RequiredTest.php

@@ -6,8 +6,7 @@ require_once 'HTMLPurifier/ChildDef/Required.php';
 class HTMLPurifier_ChildDef_RequiredTest extends HTMLPurifier_ChildDefHarness
 {
     
-    function testParsing() {
-        
+    function testPrepareString() {
         $def = new HTMLPurifier_ChildDef_Required('foobar | bang |gizmo');
         $this->assertIdentical($def->elements,
           array(
@@ -15,51 +14,61 @@ class HTMLPurifier_ChildDef_RequiredTest extends HTMLPurifier_ChildDefHarness
            ,'bang'   => true
            ,'gizmo'  => true
           ));
-        
+    }
+    
+    function testPrepareArray() {
         $def = new HTMLPurifier_ChildDef_Required(array('href', 'src'));
         $this->assertIdentical($def->elements,
           array(
             'href' => true
            ,'src'  => true
           ));
-        
     }
     
-    function testPCDATAForbidden() {
-        
+    function setUp() {
+        parent::setUp();
         $this->obj = new HTMLPurifier_ChildDef_Required('dt | dd');
-        
+    }
+    
+    function testEmptyInput() {
         $this->assertResult('', false);
+    }
+    
+    function testRemoveIllegalTagsAndElements() {
         $this->assertResult(
           '<dt>Term</dt>Text in an illegal location'.
              '<dd>Definition</dd><b>Illegal tag</b>',
           '<dt>Term</dt><dd>Definition</dd>');
         $this->assertResult('How do you do!', false);
-        
+    }
+    
+    function testIgnoreWhitespace() {
         // whitespace shouldn't trigger it
         $this->assertResult("\n<dd>Definition</dd>       ");
-        
+    }
+    
+    function testPreserveWhitespaceAfterRemoval() {
         $this->assertResult(
           '<dd>Definition</dd>       <b></b>       ',
           '<dd>Definition</dd>              '
         );
+    }
+    
+    function testDeleteNodeIfOnlyWhitespace() {
         $this->assertResult("\t      ", false);
-        
     }
     
     function testPCDATAAllowed() {
-        
         $this->obj = new HTMLPurifier_ChildDef_Required('#PCDATA | b');
-        
-        $this->assertResult('<b>Bold text</b><img />', '<b>Bold text</b>');
-        
-        // with child escaping on
+        $this->assertResult('Out <b>Bold text</b><img />', 'Out <b>Bold text</b>');
+    }
+    
+    function testPCDATAAllowedWithEscaping() {
+        $this->obj = new HTMLPurifier_ChildDef_Required('#PCDATA | b');
+        $this->config->set('Core', 'EscapeInvalidChildren', true);
         $this->assertResult(
-            '<b>Bold text</b><img />',
-            '<b>Bold text</b>&lt;img /&gt;',
-            array(
-              'Core.EscapeInvalidChildren' => true
-            )
+            'Out <b>Bold text</b><img />',
+            'Out <b>Bold text</b>&lt;img /&gt;'
         );
         
     }

tests/HTMLPurifier/ChildDef/StrictBlockquoteTest.php

@@ -7,48 +7,76 @@ class   HTMLPurifier_ChildDef_StrictBlockquoteTest
 extends HTMLPurifier_ChildDefHarness
 {
     
-    function test() {
-        
+    function setUp() {
+        parent::setUp();
         $this->obj = new HTMLPurifier_ChildDef_StrictBlockquote('div | p');
-        
-        // assuming default wrap is p
-        
+    }
+    
+    function testEmptyInput() {
         $this->assertResult('');
+    }
+    
+    function testPreserveValidP() {
         $this->assertResult('<p>Valid</p>');
+    }
+    
+    function testPreserveValidDiv() {
         $this->assertResult('<div>Still valid</div>');
+    }
+    
+    function testWrapTextWithP() {
         $this->assertResult('Needs wrap', '<p>Needs wrap</p>');
+    }
+    
+    function testNoWrapForWhitespaceOrValidElements() {
         $this->assertResult('<p>Do not wrap</p>    <p>Whitespace</p>');
+    }
+    
+    function testWrapTextNextToValidElements() {
         $this->assertResult(
                'Wrap'. '<p>Do not wrap</p>',
             '<p>Wrap</p><p>Do not wrap</p>'
         );
+    }
+    
+    function testWrapInlineElements() {
         $this->assertResult(
             '<p>Do not</p>'.'<b>Wrap</b>',
             '<p>Do not</p><p><b>Wrap</b></p>'
         );
+    }
+    
+    function testWrapAndRemoveInvalidTags() {
         $this->assertResult(
             '<li>Not allowed</li>Paragraph.<p>Hmm.</p>',
             '<p>Not allowedParagraph.</p><p>Hmm.</p>'
         );
+    }
+    
+    function testWrapComplicatedSring() {
         $this->assertResult(
             $var = 'He said<br />perhaps<br />we should <b>nuke</b> them.',
             "<p>$var</p>"
         );
+    }
+    
+    function testWrapAndRemoveInvalidTagsComplex() {
         $this->assertResult(
             '<foo>Bar</foo><bas /><b>People</b>Conniving.'. '<p>Fools!</p>',
               '<p>Bar'.          '<b>People</b>Conniving.</p><p>Fools!</p>'
         );
-        
-        $this->assertResult('Needs wrap', '<div>Needs wrap</div>',
-            array('HTML.BlockWrapper' => 'div'));
+    }
+    
+    function testAlternateWrapper() {
+        $this->config->set('HTML', 'BlockWrapper', 'div');
+        $this->assertResult('Needs wrap', '<div>Needs wrap</div>');
         
     }
     
     function testError() {
         $this->obj = new HTMLPurifier_ChildDef_StrictBlockquote('div | p');
-        $this->assertResult('Needs wrap', '<p>Needs wrap</p>',
-            array('HTML.BlockWrapper' => 'dav'));
-        $this->swallowErrors();
+        $this->config->set('HTML', 'BlockWrapper', 'dav');
+        $this->assertResult('Needs wrap', '<p>Needs wrap</p>');
     }
     
 }

tests/HTMLPurifier/ChildDef/TableTest.php

@@ -6,10 +6,12 @@ require_once 'HTMLPurifier/ChildDef/Table.php';
 class HTMLPurifier_ChildDef_TableTest extends HTMLPurifier_ChildDefHarness
 {
     
-    function test() {
-        
+    function setUp() {
+        parent::setUp();
         $this->obj = new HTMLPurifier_ChildDef_Table();
-        
+    }
+    
+    function test() {
         $this->assertResult('', false);
         
         // we're using empty tags to compact the tests: under real circumstances