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/AttrTransform/BdoDirTest.php

@@ -11,18 +11,19 @@ class HTMLPurifier_AttrTransform_BdoDirTest extends HTMLPurifier_AttrTransformHa
         $this->obj = new HTMLPurifier_AttrTransform_BdoDir();
     }
     
-    function test() {
-        
+    function testAddDefaultDir() {
         $this->assertResult( array(), array('dir' => 'ltr') );
-        
-        // leave existing dir alone
+    }
+    
+    function testPreserveExistingDir() {
         $this->assertResult( array('dir' => 'rtl') );
-        
-        // use a different default
+    }
+    
+    function testAlternateDefault() {
+        $this->config->set('Attr', 'DefaultTextDir', 'rtl');
         $this->assertResult(
             array(),
-            array('dir' => 'rtl'),
-            array('Attr.DefaultTextDir' => 'rtl')
+            array('dir' => 'rtl')
         );
         
     }

tests/HTMLPurifier/AttrTransform/BgColorTest.php

@@ -3,6 +3,10 @@
 require_once 'HTMLPurifier/AttrTransform/BgColor.php';
 require_once 'HTMLPurifier/AttrTransformHarness.php';
 
+// we currently rely on the CSS validator to fix any problems.
+// This means that this transform, strictly speaking, supports
+// a superset of the functionality.
+
 class HTMLPurifier_AttrTransform_BgColorTest extends HTMLPurifier_AttrTransformHarness
 {
     
@@ -11,31 +15,31 @@ class HTMLPurifier_AttrTransform_BgColorTest extends HTMLPurifier_AttrTransformH
         $this->obj = new HTMLPurifier_AttrTransform_BgColor();
     }
     
-    function test() {
-        
+    function testEmptyInput() {
         $this->assertResult( array() );
-        
-        // we currently rely on the CSS validator to fix any problems.
-        // This means that this transform, strictly speaking, supports
-        // a superset of the functionality.
-        
+    }
+    
+    function testBasicTransform() {
         $this->assertResult(
             array('bgcolor' => '#000000'),
             array('style' => 'background-color:#000000;')
         );
-        
+    }
+    
+    function testPrependNewCSS() {
         $this->assertResult(
             array('bgcolor' => '#000000', 'style' => 'font-weight:bold'),
             array('style' => 'background-color:#000000;font-weight:bold')
         );
-        
+    }
+    
+    function testLenientTreatmentOfInvalidInput() {
         // this may change when we natively support the datatype and
         // validate its contents before forwarding it on
         $this->assertResult(
             array('bgcolor' => '#F00'),
             array('style' => 'background-color:#F00;')
         );
-        
     }
     
 }

tests/HTMLPurifier/AttrTransform/BoolToCSSTest.php

@@ -11,27 +11,29 @@ class HTMLPurifier_AttrTransform_BoolToCSSTest extends HTMLPurifier_AttrTransfor
         $this->obj = new HTMLPurifier_AttrTransform_BoolToCSS('foo', 'bar:3in;');
     }
     
-    function test() {
-        
+    function testEmptyInput() {
         $this->assertResult( array() );
-        
+    }
+    
+    function testBasicTransform() {
         $this->assertResult(
             array('foo' => 'foo'),
             array('style' => 'bar:3in;')
         );
-        
-        // boolean attribute just has to be set: we don't care about
-        // anything else
+    }
+    
+    function testIgnoreValueOfBooleanAttribute() {
         $this->assertResult(
             array('foo' => 'no'),
             array('style' => 'bar:3in;')
         );
-        
+    }
+    
+    function testPrependCSS() {
         $this->assertResult(
             array('foo' => 'foo', 'style' => 'background-color:#F00;'),
             array('style' => 'bar:3in;background-color:#F00;')
         );
-        
     }
     
 }

tests/HTMLPurifier/AttrTransform/BorderTest.php

@@ -12,27 +12,29 @@ class HTMLPurifier_AttrTransform_BorderTest extends HTMLPurifier_AttrTransformHa
         $this->obj = new HTMLPurifier_AttrTransform_Border();
     }
     
-    function test() {
-        
+    function testEmptyInput() {
         $this->assertResult( array() );
-        
+    }
+    
+    function testBasicTransform() {
         $this->assertResult(
             array('border' => '1'),
             array('style' => 'border:1px solid;')
         );
-        
-        // once again, no validation done here, we expect CSS validator
-        // to catch it
+    }
+    
+    function testLenientTreatmentOfInvalidInput() {
         $this->assertResult(
             array('border' => '10%'),
             array('style' => 'border:10%px solid;')
         );
-        
+    }
+    
+    function testPrependNewCSS() {
         $this->assertResult(
             array('border' => '23', 'style' => 'font-weight:bold;'),
             array('style' => 'border:23px solid;font-weight:bold;')
         );
-        
     }
     
 }

tests/HTMLPurifier/AttrTransform/EnumToCSSTest.php

@@ -6,38 +6,44 @@ require_once 'HTMLPurifier/AttrTransformHarness.php';
 class HTMLPurifier_AttrTransform_EnumToCSSTest extends HTMLPurifier_AttrTransformHarness
 {
     
-    function testRegular() {
-        
+    function setUp() {
+        parent::setUp();
         $this->obj = new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
             'left'  => 'text-align:left;',
             'right' => 'text-align:right;'
         ));
-        
-        // leave empty arrays alone
+    }
+    
+    function testEmptyInput() {
         $this->assertResult( array() );
-        
-        // leave arrays without interesting stuff alone
+    }
+    
+    function testPreserveArraysWithoutInterestingAttributes() {
         $this->assertResult( array('style' => 'font-weight:bold;') );
-        
-        // test each of the conversions
-        
+    }
+    
+    function testConvertAlignLeft() {
         $this->assertResult(
             array('align' => 'left'),
             array('style' => 'text-align:left;')
         );
-        
+    }
+    
+    function testConvertAlignRight() {
         $this->assertResult(
             array('align' => 'right'),
             array('style' => 'text-align:right;')
         );
-        
-        // drop garbage value
+    }
+    
+    function testRemoveInvalidAlign() {
         $this->assertResult(
             array('align' => 'invalid'),
             array()
         );
-        
-        // test CSS munging
+    }
+    
+    function testPrependNewCSS() {
         $this->assertResult(
             array('align' => 'left', 'style' => 'font-weight:bold;'),
             array('style' => 'text-align:left;font-weight:bold;')
@@ -46,31 +52,23 @@ class HTMLPurifier_AttrTransform_EnumToCSSTest extends HTMLPurifier_AttrTransfor
     }
     
     function testCaseInsensitive() {
-        
         $this->obj = new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
             'right' => 'text-align:right;'
         ));
-        
-        // test case insensitivity
         $this->assertResult(
             array('align' => 'RIGHT'),
             array('style' => 'text-align:right;')
         );
-        
     }
     
     function testCaseSensitive() {
-        
         $this->obj = new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
             'right' => 'text-align:right;'
         ), true);
-        
-        // test case insensitivity
         $this->assertResult(
             array('align' => 'RIGHT'),
             array()
         );
-        
     }
     
 }

tests/HTMLPurifier/AttrTransform/ImgRequiredTest.php

@@ -11,39 +11,37 @@ class HTMLPurifier_AttrTransform_ImgRequiredTest extends HTMLPurifier_AttrTransf
         $this->obj = new HTMLPurifier_AttrTransform_ImgRequired();
     }
     
-    function test() {
-        
+    function testAddMissingAttr() {
+        $this->config->set('Core', 'RemoveInvalidImg', false);
         $this->assertResult(
             array(),
-            array('src' => '', 'alt' => 'Invalid image'),
-            array(
-                'Core.RemoveInvalidImg' => false
-            )
+            array('src' => '', 'alt' => 'Invalid image')
         );
-        
+    }
+    
+    function testAlternateDefaults() {
+        $this->config->set('Attr', 'DefaultInvalidImage', 'blank.png');
+        $this->config->set('Attr', 'DefaultInvalidImageAlt', 'Pawned!');
+        $this->config->set('Core', 'RemoveInvalidImg', false);
         $this->assertResult(
             array(),
-            array('src' => 'blank.png', 'alt' => 'Pawned!'),
-            array(
-                'Attr.DefaultInvalidImage' => 'blank.png',
-                'Attr.DefaultInvalidImageAlt' => 'Pawned!',
-                'Core.RemoveInvalidImg' => false
-            )
+            array('src' => 'blank.png', 'alt' => 'Pawned!')
         );
-        
+    }
+    
+    function testGenerateAlt() {
         $this->assertResult(
             array('src' => '/path/to/foobar.png'),
             array('src' => '/path/to/foobar.png', 'alt' => 'foobar.png')
         );
-        
+    }
+    
+    function testAddDefaultSrc() {
+        $this->config->set('Core', 'RemoveInvalidImg', false);
         $this->assertResult(
             array('alt' => 'intrigue'),
-            array('alt' => 'intrigue', 'src' => ''),
-            array(
-                'Core.RemoveInvalidImg' => false
-            )
+            array('alt' => 'intrigue', 'src' => '')
         );
-        
     }
     
 }

tests/HTMLPurifier/AttrTransform/ImgSpaceTest.php

@@ -9,33 +9,35 @@ class HTMLPurifier_AttrTransform_ImgSpaceTest extends HTMLPurifier_AttrTransform
     
     function setUp() {
         parent::setUp();
+        $this->obj = new HTMLPurifier_AttrTransform_ImgSpace('vspace');
     }
     
-    function testVertical() {
-        
-        $this->obj = new HTMLPurifier_AttrTransform_ImgSpace('vspace');
-        
+    function testEmptyInput() {
         $this->assertResult( array() );
-        
+    }
+    
+    function testVerticalBasicUsage() {
         $this->assertResult(
             array('vspace' => '1'),
             array('style' => 'margin-top:1px;margin-bottom:1px;')
         );
-        
-        // no validation done here, we expect CSS validator to catch it
+    }
+    
+    function testLenientHandlingOfInvalidInput() {
         $this->assertResult(
             array('vspace' => '10%'),
             array('style' => 'margin-top:10%px;margin-bottom:10%px;')
         );
-        
+    }
+    
+    function testPrependNewCSS() {
         $this->assertResult(
             array('vspace' => '23', 'style' => 'font-weight:bold;'),
             array('style' => 'margin-top:23px;margin-bottom:23px;font-weight:bold;')
         );
-        
     }
     
-    function testHorizontal() {
+    function testHorizontalBasicUsage() {
         $this->obj = new HTMLPurifier_AttrTransform_ImgSpace('hspace');
         $this->assertResult(
             array('hspace' => '1'),
@@ -43,7 +45,7 @@ class HTMLPurifier_AttrTransform_ImgSpaceTest extends HTMLPurifier_AttrTransform
         );
     }
     
-    function testInvalid() {
+    function testInvalidConstructionParameter() {
         $this->expectError('ispace is not valid space attribute');
         $this->obj = new HTMLPurifier_AttrTransform_ImgSpace('ispace');
         $this->assertResult(

tests/HTMLPurifier/AttrTransform/LangTest.php

@@ -13,35 +13,36 @@ class HTMLPurifier_AttrTransform_LangTest
         $this->obj = new HTMLPurifier_AttrTransform_Lang();
     }
     
-    function test() {
-        
-        // leave non-lang'ed elements alone
-        $this->assertResult(array(), true);
-        
-        // copy lang to xml:lang
+    function testEmptyInput() {
+        $this->assertResult(array());
+    }
+    
+    function testCopyLangToXMLLang() {
         $this->assertResult(
             array('lang' => 'en'),
             array('lang' => 'en', 'xml:lang' => 'en')
         );
-        
-        // preserve attributes
+    }
+    
+    function testPreserveAttributes() {
         $this->assertResult(
             array('src' => 'vert.png', 'lang' => 'fr'),
             array('src' => 'vert.png', 'lang' => 'fr', 'xml:lang' => 'fr')
         );
-        
-        // copy xml:lang to lang
+    }
+    
+    function testCopyXMLLangToLang() {
         $this->assertResult(
             array('xml:lang' => 'en'),
             array('xml:lang' => 'en', 'lang' => 'en')
         );
-        
-        // both set, override lang with xml:lang
+    }
+    
+    function testXMLLangOverridesLang() {
         $this->assertResult(
             array('lang' => 'fr', 'xml:lang' => 'de'),
             array('lang' => 'de', 'xml:lang' => 'de')
         );
-        
     }
     
 }

tests/HTMLPurifier/AttrTransform/LengthTest.php

@@ -11,21 +11,32 @@ class HTMLPurifier_AttrTransform_LengthTest extends HTMLPurifier_AttrTransformHa
         $this->obj = new HTMLPurifier_AttrTransform_Length('width');
     }
     
-    function test() {
+    function testEmptyInput() {
         $this->assertResult( array() );
+    }
+    
+    function testTransformPixel() {
         $this->assertResult(
             array('width' => '10'),
             array('style' => 'width:10px;')
         );
+    }
+    
+    function testTransformPercentage() {
         $this->assertResult(
             array('width' => '10%'),
             array('style' => 'width:10%;')
         );
+    }
+    
+    function testPrependNewCSS() {
         $this->assertResult(
             array('width' => '10%', 'style' => 'font-weight:bold'),
             array('style' => 'width:10%;font-weight:bold')
         );
-        // this behavior might change
+    }
+    
+    function testLenientTreatmentOfInvalidInput() {
         $this->assertResult(
             array('width' => 'asdf'),
             array('style' => 'width:asdf;')

tests/HTMLPurifier/AttrTransform/NameTest.php

@@ -11,12 +11,18 @@ class HTMLPurifier_AttrTransform_NameTest extends HTMLPurifier_AttrTransformHarn
         $this->obj = new HTMLPurifier_AttrTransform_Name();
     }
     
-    function test() {
+    function testEmpty() {
         $this->assertResult( array() );
+    }
+    
+    function testTransformNameToID() {
         $this->assertResult(
             array('name' => 'free'),
             array('id' => 'free')
         );
+    }
+    
+    function testExistingIDOverridesName() {
         $this->assertResult(
             array('name' => 'tryit', 'id' => 'tobad'),
             array('id' => 'tobad')